From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755362AbbLGJgO (ORCPT ); Mon, 7 Dec 2015 04:36:14 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38786 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753801AbbLGJgM (ORCPT ); Mon, 7 Dec 2015 04:36:12 -0500 Message-ID: <56655307.2010305@linaro.org> Date: Mon, 07 Dec 2015 17:36:07 +0800 From: Hanjun Guo User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: fu.wei@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linaro-acpi@lists.linaro.org, jon.zhixiong.zhang@gmail.com, tomasz.nowicki@linaro.org, tn@semihalf.com, rjw@rjwysocki.net, lenb@kernel.org, jarkko.nikula@linux.intel.com CC: graeme.gregory@linaro.org, al.stone@linaro.org, jcm@redhat.com, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, msalter@redhat.com, Marc.Zyngier@arm.com, grant.likely@linaro.org, rrichter@cavium.com, lorenzo.pieralisi@arm.com, rruigrok@codeaurora.org, harba@qti.qualcomm.com Subject: Re: [PATCH v3] acpi, apei, arm64: APEI initial support for aarch64. References: <1449162903-11203-1-git-send-email-fu.wei@linaro.org> In-Reply-To: <1449162903-11203-1-git-send-email-fu.wei@linaro.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Fu Wei, On 12/04/2015 01:15 AM, fu.wei@linaro.org wrote: > From: Tomasz Nowicki > > 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". The version updates is not belong here, if you need to add it, please place it under "---" below. > > Signed-off-by: Tomasz Nowicki > Tested-by: Jonathan (Zhixiong) Zhang > Signed-off-by: Fu Wei > --- ...just here. > 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 > # include > +# include > #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); > +} Maybe just a static inline function in arch/arm64/include/asm/acpi.h will be good? > #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 How about put it together into a function, and introduce a stub function when no __i386__ and __x86_64__ case? Thanks Hanjun