Linaro-acpi December 2015

linaro-acpi@lists.linaro.org

26 participants
15 discussions

[PATCH v5] acpi, apei, arm64: APEI initial support for aarch64.

by fu.wei＠linaro.org

From: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> This commit provides APEI arch-specific bits for aarch64 Meanwhile, add a new subfunction "hest_ia_init" for "acpi_disable_cmcff" which is used by IA-32 Architecture Corrected Machine Check (CMC), and add "HAVE_ACPI_APEI_HEST_IA32" to make sure only x86 use "hest_ia_init". Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> Tested-by: Jonathan (Zhixiong) Zhang <zjzhang(a)codeaurora.org> Signed-off-by: Fu Wei <fu.wei(a)linaro.org> Acked-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- Changelog: v5: Add "HAVE_ACPI_APEI_HEST_IA32" instead of "#if defined(__i386__) || defined(__x86_64__)". v4: Rebase to latest kernel version(4.4-rc4). Move arch_apei_flush_tlb_one into header file as a inline function Add a new subfunction "hest_ia_init" for "acpi_disable_cmcff". v3: https://lkml.org/lkml/2015/12/3/521 Remove "acpi_disable_cmcff" from arm64 code, and wrap it in hest.c by "#if defined(__i386__) || defined(__x86_64__)" v2: https://lkml.org/lkml/2015/12/2/432 Rebase to latest kernel version(4.4-rc3). Move arch_apei_flush_tlb_one() to arch/arm64/kernel/acpi.c v1: https://lkml.org/lkml/2015/8/14/199 Move arch_apei_flush_tlb_one() to arch/arm64/include/asm/apci.h. Delete arch/arm64/kernel/apei.c. Add "#ifdef CONFIG_ACPI_APEI" for "acpi_disable_cmcff". arch/arm64/Kconfig | 1 + arch/arm64/include/asm/acpi.h | 7 ++++++- arch/x86/Kconfig | 1 + drivers/acpi/apei/Kconfig | 3 +++ drivers/acpi/apei/hest.c | 19 ++++++++++++++++--- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 871f217..58c8992 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -3,6 +3,7 @@ config ARM64 select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI + select HAVE_ACPI_APEI if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_GCOV_PROFILE_ALL diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index caafd63..da657a9 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -17,6 +17,7 @@ #include <asm/cputype.h> #include <asm/smp_plat.h> +#include <asm/tlbflush.h> /* Macros for consistency checks of the GICC subtable of MADT */ #define ACPI_MADT_GICC_LENGTH \ @@ -94,6 +95,10 @@ static inline const char *acpi_get_enable_method(int cpu) #ifdef CONFIG_ACPI_APEI pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); -#endif +static inline void arch_apei_flush_tlb_one(unsigned long addr) +{ + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); +} +#endif /* CONFIG_ACPI_APEI */ #endif /*_ASM_ACPI_H*/ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index db3622f..1f9107b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -74,6 +74,7 @@ config X86 select GENERIC_TIME_VSYSCALL select HAVE_ACPI_APEI if ACPI select HAVE_ACPI_APEI_NMI if ACPI + select HAVE_ACPI_APEI_HEST_IA32 if ACPI select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_AOUT if X86_32 select HAVE_ARCH_AUDITSYSCALL diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig index b0140c8..a60bb00 100644 --- a/drivers/acpi/apei/Kconfig +++ b/drivers/acpi/apei/Kconfig @@ -4,6 +4,9 @@ config HAVE_ACPI_APEI config HAVE_ACPI_APEI_NMI bool +config HAVE_ACPI_APEI_HEST_IA32 + bool + config ACPI_APEI bool "ACPI Platform Error Interface (APEI)" select MISC_FILESYSTEMS diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 20b3fcf..c708c95 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -117,15 +117,27 @@ int apei_hest_parse(apei_hest_func_t func, void *data) } EXPORT_SYMBOL_GPL(apei_hest_parse); +#ifdef CONFIG_HAVE_ACPI_APEI_HEST_IA32 /* * Check if firmware advertises firmware first mode. We need FF bit to be set * along with a set of MC banks which work in FF mode. */ static int __init hest_parse_cmc(struct acpi_hest_header *hest_hdr, void *data) { - return arch_apei_enable_cmcff(hest_hdr, data); + if (!acpi_disable_cmcff) + return !arch_apei_enable_cmcff(hest_hdr, data); + + return 0; } +static inline int __init hest_ia_init(void) +{ + return apei_hest_parse(hest_parse_cmc, NULL); +} +#else +static inline int __init hest_ia_init(void) { return 0; } +#endif + struct ghes_arr { struct platform_device **ghes_devs; unsigned int count; @@ -232,8 +244,9 @@ void __init acpi_hest_init(void) goto err; } - if (!acpi_disable_cmcff) - apei_hest_parse(hest_parse_cmc, NULL); + rc = hest_ia_init(); + if (rc) + goto err; if (!ghes_disable) { rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count); -- 2.5.0

8 years, 4 months

[PATCH 00/11] ARM64 PCI hostbridge init based on ACPI

by Hanjun Guo

This patch set is introducing ARM64 PCI hostbridge init based on ACPI, which based on Jiang Liu's patch set "Consolidate ACPI PCI root common code into ACPI core": https://lkml.org/lkml/2015/5/14/98 This patch set including three parts: - the first part is PATCH 1, which should be merged into Jiang Liu's patch set to fix the compile error on ARM64 when ACPI enabled. - the senconed part is the refactoring of mmconfig to let that mechanism can be used for ARM64 too, it's Tomasz's work but he is moving to other work and pretty busy for now, so I will take care of those patches, Tomasz will show up when some comments need to be addressed :) In this version of mmconfig refactor patches, I removed the rename of mmconfig -> ecam patch, because mmconfig is in multi places, and need much more effort to convert them all to ecam, Bjorn, if you don't like it, I can add them back. - The third part is about the ARM64 PCI hostbridge init based on ACPI, first I fixed a compile error for XEN PCI on ARM64 when PCI_MMCONFIG=y, and then introduce PCI init based on Jiang Liu and Tomasz's patch set. patch for ARM64 ACPI PCI still reserve the bus sysdata to get the domain number, because Yijing's patch set is still under review, will be removed when Yijing's patch set hits upstream. This patch set was tested by Suravee on Seattle board with legacy interrupt (not MSI), and it works, also tested on qemu by Graeme. You can get the code from: git://git.linaro.org/leg/acpi/acpi.git, devel branch Comments are welcomed. Thanks Hanjun Hanjun Guo (3): ARM64 / PCI: introduce struct pci_controller for ACPI XEN / PCI: Remove the dependence on arch x86 when PCI_MMCONFIG=y ARM64 / PCI / ACPI: support for ACPI based PCI hostbridge init Tomasz Nowicki (8): x86, pci: Clean up comment about buggy MMIO config space access for AMD Fam10h CPUs. x86, pci: Abstract PCI config accessors and use AMD Fam10h workaround exclusively. x86, pci: Reorder logic of pci_mmconfig_insert() function x86, pci, acpi: Move arch-agnostic MMCONFIG (aka ECAM) and ACPI code out of arch/x86/ directory pci, acpi, mcfg: Provide generic implementation of MCFG code initialization. x86, pci: mmconfig_{32,64}.c code refactoring - remove code duplication. x86, pci, ecam: mmconfig_64.c becomes default implementation for ECAM driver. pci, acpi, mcfg: Share ACPI PCI config space accessors. arch/arm64/Kconfig | 7 + arch/arm64/include/asm/pci.h | 10 ++ arch/arm64/kernel/pci.c | 245 ++++++++++++++++++++++++++-- arch/x86/Kconfig | 4 + arch/x86/include/asm/pci_x86.h | 34 +--- arch/x86/pci/Makefile | 4 +- arch/x86/pci/acpi.c | 1 + arch/x86/pci/mmconfig-shared.c | 301 +++++++++++----------------------- arch/x86/pci/mmconfig_32.c | 35 +--- arch/x86/pci/mmconfig_64.c | 153 ------------------ arch/x86/pci/numachip.c | 25 +-- drivers/acpi/Makefile | 1 + drivers/acpi/mcfg.c | 103 ++++++++++++ drivers/pci/Kconfig | 10 ++ drivers/pci/Makefile | 5 + drivers/pci/ecam.c | 358 +++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.c | 26 +-- drivers/xen/pci.c | 7 +- include/linux/acpi.h | 2 + include/linux/ecam.h | 56 +++++++ 20 files changed, 923 insertions(+), 464 deletions(-) delete mode 100644 arch/x86/pci/mmconfig_64.c create mode 100644 drivers/acpi/mcfg.c create mode 100644 drivers/pci/ecam.c create mode 100644 include/linux/ecam.h -- 1.9.1

8 years, 4 months

[PATCH v3] acpi, apei, arm64: APEI initial support for aarch64.

by fu.wei＠linaro.org

From: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> This commit provides APEI arch-specific bits for aarch64 The reason for wrapping "acpi_disable_cmcff" by "#if defined(__i386__) || defined(__x86_64__)" in hest.c is: according to ACPI spec CMC(Corrected Machine Check) is only for IA-32 Architecture. Changelog: v3: Remove "acpi_disable_cmcff" from arm64 code, and wrap it in hest.c by "#if defined(__i386__) || defined(__x86_64__)" v2: https://lkml.org/lkml/2015/12/2/432 Rebase to latest kernel version(4.4-rc3). Move arch_apei_flush_tlb_one() to arch/arm64/kernel/acpi.c v1: https://lkml.org/lkml/2015/8/14/199 Move arch_apei_flush_tlb_one() to arch/arm64/include/asm/apci.h. Delete arch/arm64/kernel/apei.c. Add "#ifdef CONFIG_ACPI_APEI" for "acpi_disable_cmcff". Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> Tested-by: Jonathan (Zhixiong) Zhang <zjzhang(a)codeaurora.org> Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/acpi.h | 1 + arch/arm64/kernel/acpi.c | 6 ++++++ drivers/acpi/apei/hest.c | 2 ++ 4 files changed, 10 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 871f217..58c8992 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -3,6 +3,7 @@ config ARM64 select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI + select HAVE_ACPI_APEI if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_GCOV_PROFILE_ALL diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index caafd63..7207f8e 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -94,6 +94,7 @@ static inline const char *acpi_get_enable_method(int cpu) #ifdef CONFIG_ACPI_APEI pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); +void arch_apei_flush_tlb_one(unsigned long addr); #endif #endif /*_ASM_ACPI_H*/ diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index d1ce8e2..7a742e7 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -32,6 +32,7 @@ #ifdef CONFIG_ACPI_APEI # include <linux/efi.h> # include <asm/pgtable.h> +# include <asm/tlbflush.h> #endif int acpi_noirq = 1; /* skip ACPI IRQ initialization */ @@ -233,4 +234,9 @@ pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) return __pgprot(PROT_NORMAL_NC); return __pgprot(PROT_DEVICE_nGnRnE); } + +void arch_apei_flush_tlb_one(unsigned long addr) +{ + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); +} #endif diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 20b3fcf..4ead747 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -232,8 +232,10 @@ void __init acpi_hest_init(void) goto err; } +#if defined(__i386__) || defined(__x86_64__) if (!acpi_disable_cmcff) apei_hest_parse(hest_parse_cmc, NULL); +#endif if (!ghes_disable) { rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count); -- 2.5.0

8 years, 4 months

[PATCH] acpi, apei, hest: Move HEST table initialization where it belongs.

by fu.wei＠linaro.org

From: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> Since HEST (hardware error sources table) can describe more than PCI specific errors, it needs to be moved out of acpi_pci_root_init. Changelog: v1: This patch - the first upstream patch to linux mailing lists. Fu Wei: (1)Rebase to v4.4-rc4; (2)Remove "#include <acpi/apei.h>" from drivers/acpi/pci_root.c] Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- drivers/acpi/pci_root.c | 2 -- drivers/acpi/scan.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..a35dd23 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -33,7 +33,6 @@ #include <linux/acpi.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" @@ -865,7 +864,6 @@ out_release_info: void __init acpi_pci_root_init(void) { - acpi_hest_init(); if (acpi_pci_disabled) return; diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 78d5f02..a52e776 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -13,6 +13,8 @@ #include <linux/nls.h> #include <linux/dma-mapping.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ + #include <asm/pgtable.h> #include "internal.h" @@ -1912,6 +1914,7 @@ int __init acpi_scan_init(void) { int result; + acpi_hest_init(); acpi_pci_root_init(); acpi_pci_link_init(); acpi_processor_init(); -- 2.5.0

8 years, 4 months

[PATCH v2] acpi, apei, arm64: APEI initial support for aarch64.

by fu.wei＠linaro.org

From: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> This commit provides APEI arch-specific bits for aarch64 Changelog: v2: Rebase to latest kernel version(4.4-rc3). Move arch_apei_flush_tlb_one() to arch/arm64/kernel/acpi.c v1: https://lkml.org/lkml/2015/8/14/199 Move arch_apei_flush_tlb_one() to arch/arm64/include/asm/apci.h. Delete arch/arm64/kernel/apei.c. Add "#ifdef CONFIG_ACPI_APEI" for "acpi_disable_cmcff". Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> Tested-by: Jonathan (Zhixiong) Zhang <zjzhang(a)codeaurora.org> Signed-off-by: Fu Wei <fu.wei(a)linaro.org> --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/acpi.h | 4 ++++ arch/arm64/kernel/acpi.c | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 871f217..58c8992 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -3,6 +3,7 @@ config ARM64 select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI + select HAVE_ACPI_APEI if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_GCOV_PROFILE_ALL diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index caafd63..0d70c74 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -46,6 +46,9 @@ typedef u64 phys_cpuid_t; extern int acpi_disabled; extern int acpi_noirq; extern int acpi_pci_disabled; +#ifdef CONFIG_ACPI_APEI +extern int acpi_disable_cmcff; +#endif static inline void disable_acpi(void) { @@ -94,6 +97,7 @@ static inline const char *acpi_get_enable_method(int cpu) #ifdef CONFIG_ACPI_APEI pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); +void arch_apei_flush_tlb_one(unsigned long addr); #endif #endif /*_ASM_ACPI_H*/ diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index d1ce8e2..811fea2 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -32,6 +32,7 @@ #ifdef CONFIG_ACPI_APEI # include <linux/efi.h> # include <asm/pgtable.h> +# include <asm/tlbflush.h> #endif int acpi_noirq = 1; /* skip ACPI IRQ initialization */ @@ -41,6 +42,10 @@ EXPORT_SYMBOL(acpi_disabled); int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ EXPORT_SYMBOL(acpi_pci_disabled); +#ifdef CONFIG_ACPI_APEI +int acpi_disable_cmcff; +#endif + static bool param_acpi_off __initdata; static bool param_acpi_force __initdata; @@ -233,4 +238,9 @@ pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) return __pgprot(PROT_NORMAL_NC); return __pgprot(PROT_DEVICE_nGnRnE); } + +void arch_apei_flush_tlb_one(unsigned long addr) +{ + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); +} #endif -- 2.5.0

8 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi December 2015