From patchwork Fri Aug 14 12:35:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 52434 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 218ED22B12 for ; Fri, 14 Aug 2015 12:38:03 +0000 (UTC) Received: by labia3 with SMTP id ia3sf27614837lab.1 for ; Fri, 14 Aug 2015 05:38:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=oJwr6Giey+ncwRVmd5pbkLvY05LUuCYxnglDF2vFffA=; b=VVnjJxs1mdTfkkcCs8V7wTIP1PYSLOrZAT09TlpYoG8+hOwb4DqaZyJHBfaf0Flx7Z w9H7x1eZcalaU1cgK9xS9o4SuTYOpqu3K2W4KhmBDqLkiW6V/dGQ0l7ea/nuMo38LHsO g1OUhVwn+9AP9vJkQZR5dhdmLfXsgZ3Noq755kIwALqM0TVwiy+AcgRyr1sygrajhIM4 Ljc5lMbBjdXkUbXtlTRNS28O9SQu/LA9es0pJCM0t7EPsnddiMHdSWmSU5fiFXKrntwZ kHLg8MAljDwTtexySWa6Q9z7K4BkeoIUE/HB33p8mps5VbLmQISDGmgC2ujHH2LCZ2ku RDkQ== X-Gm-Message-State: ALoCoQmfceNdex+5+kMLbWeWguz3kacLISXXjee827vgwNkbqr0DaqhSIJd7/j3o0zrmxWfC0ZJB X-Received: by 10.112.172.70 with SMTP id ba6mr5652933lbc.1.1439555882133; Fri, 14 Aug 2015 05:38:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.226 with SMTP id e2ls353092lah.14.gmail; Fri, 14 Aug 2015 05:38:01 -0700 (PDT) X-Received: by 10.152.37.67 with SMTP id w3mr44046830laj.123.1439555881958; Fri, 14 Aug 2015 05:38:01 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id l3si5859531lbq.158.2015.08.14.05.38.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 05:38:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbcbn3 with SMTP id bn3so44381501lbc.2 for ; Fri, 14 Aug 2015 05:38:01 -0700 (PDT) X-Received: by 10.112.176.228 with SMTP id cl4mr44118960lbc.106.1439555881825; Fri, 14 Aug 2015 05:38:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1587681lba; Fri, 14 Aug 2015 05:38:00 -0700 (PDT) X-Received: by 10.66.171.9 with SMTP id aq9mr52888272pac.117.1439555880562; Fri, 14 Aug 2015 05:38:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yq3si8778714pbb.250.2015.08.14.05.37.59; Fri, 14 Aug 2015 05:38:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755032AbbHNMh5 (ORCPT + 28 others); Fri, 14 Aug 2015 08:37:57 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:35504 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbbHNMh4 (ORCPT ); Fri, 14 Aug 2015 08:37:56 -0400 Received: by pdrg1 with SMTP id g1so30998393pdr.2 for ; Fri, 14 Aug 2015 05:37:55 -0700 (PDT) X-Received: by 10.70.134.198 with SMTP id pm6mr88640665pdb.17.1439555875506; Fri, 14 Aug 2015 05:37:55 -0700 (PDT) Received: from localhost.localdomain (li400-65.members.linode.com. [106.187.50.65]) by smtp.googlemail.com with ESMTPSA id fp3sm5970225pdb.24.2015.08.14.05.37.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Aug 2015 05:37:54 -0700 (PDT) From: fu.wei@linaro.org To: linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, zjzhang@codeaurora.org, matt.fleming@intel.com Cc: tekkamanninja@gmail.com, graeme.gregory@linaro.org, al.stone@linaro.org, hanjun.guo@linaro.org, jcm@redhat.com, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, bp@alien8.de, Tomasz Nowicki , Fu Wei Subject: [PATCH] acpi, apei, arm64: APEI initial support for aarch64. Date: Fri, 14 Aug 2015 20:35:53 +0800 Message-Id: <1439555753-11974-1-git-send-email-fu.wei@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <=fu.wei@linaro.org> References: <=fu.wei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: fu.wei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Tomasz Nowicki This commit provides APEI arch-specific bits for aarch64 Changelog: Fu Wei: 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 Signed-off-by: Fu Wei --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/acpi.h | 11 +++++++++++ arch/arm64/kernel/acpi.c | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 318175f..6144c9d 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 a17b623..ced6e25 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -22,6 +22,7 @@ #ifdef CONFIG_ACPI_APEI #include #include +#include #endif /* Macros for consistency checks of the GICC subtable of MADT */ @@ -52,6 +53,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) { @@ -89,6 +93,13 @@ static inline bool acpi_has_cpu_in_madt(void) static inline void arch_fix_phys_package_id(int num, u32 slot) { } void __init acpi_init_cpus(void); +#ifdef CONFIG_ACPI_APEI +static inline void arch_apei_flush_tlb_one(unsigned long addr) +{ + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); +} +#endif + #else static inline void acpi_init_cpus(void) { } #endif /* CONFIG_ACPI */ diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 19de753..bd1be9a 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -36,6 +36,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;