From patchwork Tue Jun 26 17:01:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10489751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC6DC6023A for ; Tue, 26 Jun 2018 17:11:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1E7F287BE for ; Tue, 26 Jun 2018 17:11:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF4D42879E; Tue, 26 Jun 2018 17:11:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 24CDF287C3 for ; Tue, 26 Jun 2018 17:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hTXhUj52obV9XI/E1rOym4Xublfj04f7nzbUsuwErAk=; b=oTPEKJr6k3xwB5P7+OR9lZgH2h cggmVqOOit0o5K8gArmsvPF0g9S80pYpEtW9g8wuazo9RsUYskkV8mXckO+Onl6jUVg7k43tgQSdj 0AHGYtcKUg8nMi+Jspl0xlgF8suQcC1wjEL4UuX3An4ev69z9Omc5XyKTXCwLJkn92TjewfpA7I/N oXyhGAeJch0QFTfHEwoKxx39zNRlofpjvsCmZRaSKPFhciCMdynLChAXrOvsv4Wa3zacTGAAim7qY h2DSX4U4NLvtODqpyjYiDWgEygaa6wpU5ob2DCHO8u84w9gytf1RDOlji1swM1/mN8AhMK48QXDm6 7I/W0xPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXrV1-0006xl-Lg; Tue, 26 Jun 2018 17:11:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXrUy-0006tr-KG for linux-arm-kernel@bombadil.infradead.org; Tue, 26 Jun 2018 17:11:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=fIWESuBaCaoVBtLNmgE3uGQxNyo30cEMk8LJu9P+3Jc=; b=VFmpqZvXM4mCK1DC2RQFhhL18 WQyBocuCLKUAMd4mkJXAgdjpKjnmOQTaq19NyWz1exX16///6AlQt4zjApFRfA2qgO30s9MeupTPO GkzzcSKsQvhjffyoSTf74hwqgGPROmxDwFQyga0WU3o1gSgUKGNnNoaZ0N8nWSh7P7PNMdw/Fe9ch eOjW1ttbW4CHqrQOSVk5lBMu/Ickgyrl4F8QtOhtigxFADSUfjplsdVAxpLLi9KsDEtFHRWEv2KCw K6r/Wck697BISTKvbEQ/tCmmmSOJzqXX2b9K/RYgpAIdHtxLwO1KU8CtBDwUZMVZXaeSZw9dZj7gQ d8T8uDaKA==; Received: from foss.arm.com ([217.140.101.70]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXrN5-0007ut-Lv for linux-arm-kernel@lists.infradead.org; Tue, 26 Jun 2018 17:03:21 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F163F1713; Tue, 26 Jun 2018 10:03:04 -0700 (PDT) Received: from melchizedek.cambridge.arm.com (melchizedek.cambridge.arm.com [10.1.206.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE3E83F318; Tue, 26 Jun 2018 10:03:00 -0700 (PDT) From: James Morse To: linux-acpi@vger.kernel.org Subject: [PATCH v5 18/20] ACPI / APEI: Add support for the SDEI GHES Notification type Date: Tue, 26 Jun 2018 18:01:14 +0100 Message-Id: <20180626170116.25825-19-james.morse@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180626170116.25825-1-james.morse@arm.com> References: <20180626170116.25825-1-james.morse@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180626_180316_032281_151817D0 X-CRM114-Status: GOOD ( 21.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jonathan.zhang@cavium.com, Rafael Wysocki , Tony Luck , Punit Agrawal , Xie XiuQi , Marc Zyngier , Catalin Marinas , Tyler Baicar , Will Deacon , Christoffer Dall , Dongjiu Geng , linux-mm@kvack.org, Borislav Petkov , James Morse , Naoya Horiguchi , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Len Brown MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP If the GHES notification type is SDEI, register the provided event using the SDEI-GHES helper. SDEI may be one of two types of event, normal and critical. Critical events can interrupt normal events, so these must have separate fixmap slots and locks in case both event types are in use. Signed-off-by: James Morse --- Changes since v4: * We now have two callbacks and separate locks and fixmap entries for normal/critical calls. * Use the new Kconfig selector for ESTATUS_QUEUE arch/arm64/include/asm/fixmap.h | 2 +- drivers/acpi/apei/Kconfig | 5 ++ drivers/acpi/apei/ghes.c | 92 ++++++++++++++++++++++++++++++++- drivers/firmware/Kconfig | 1 + drivers/firmware/arm_sdei.c | 4 +- include/linux/arm_sdei.h | 3 ++ 6 files changed, 102 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index e2b423a5feaf..e875b97032ce 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -58,7 +58,7 @@ enum fixed_addresses { #ifdef CONFIG_ACPI_APEI_SEA FIX_APEI_GHES_SEA, #endif -#ifdef CONFIG_ARM_SDE_INTERFACE +#ifdef CONFIG_ACPI_APEI_SDEI FIX_APEI_GHES_SDEI_NORMAL, FIX_APEI_GHES_SDEI_CRITICAL, #endif diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig index 2b191e09b647..a8d09065e6a9 100644 --- a/drivers/acpi/apei/Kconfig +++ b/drivers/acpi/apei/Kconfig @@ -61,6 +61,11 @@ config ACPI_APEI_SEA option allows the OS to look for such hardware error record, and take appropriate action. +config ACPI_APEI_SDEI + bool + depends on ACPI_APEI_GHES && ARM_SDE_INTERFACE + select ACPI_APEI_GHES_ESTATUS_QUEUE + config ACPI_APEI_MEMORY_FAILURE bool "APEI memory error recovering support" depends on ACPI_APEI && MEMORY_FAILURE diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 15d472048aa8..b7b335450a6b 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -25,6 +25,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -763,8 +764,8 @@ static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx) return rc; } -static int ghes_estatus_queue_notified(struct list_head *rcu_list, - int fixmap_idx) +static int __maybe_unused +ghes_estatus_queue_notified(struct list_head *rcu_list, int fixmap_idx) { int ret = -ENOENT; struct ghes *ghes; @@ -1069,6 +1070,75 @@ static inline void ghes_nmi_add(struct ghes *ghes) { } static inline void ghes_nmi_remove(struct ghes *ghes) { } #endif /* CONFIG_HAVE_ACPI_APEI_NMI */ +#ifdef CONFIG_ACPI_APEI_SDEI +static int __ghes_sdei_callback(struct ghes *ghes, int fixmap_idx) +{ + if (!_in_nmi_notify_one(ghes, fixmap_idx)) { + irq_work_queue(&ghes_proc_irq_work); + + return 0; + } + + return -ENOENT; +} + +static DEFINE_RAW_SPINLOCK(ghes_notify_lock_sdei_normal); +static DEFINE_RAW_SPINLOCK(ghes_notify_lock_sdei_critical); + +static int ghes_sdei_normal_callback(u32 event_num, struct pt_regs *regs, + void *arg) +{ + int err = -ENOENT; + struct ghes *ghes = arg; + + raw_spin_lock(&ghes_notify_lock_sdei_normal); + err = __ghes_sdei_callback(ghes, FIX_APEI_GHES_SDEI_NORMAL); + raw_spin_unlock(&ghes_notify_lock_sdei_normal); + + return err; +} + +static int ghes_sdei_critical_callback(u32 event_num, struct pt_regs *regs, + void *arg) +{ + int err = -ENOENT; + struct ghes *ghes = arg; + + raw_spin_lock(&ghes_notify_lock_sdei_critical); + err = __ghes_sdei_callback(ghes, FIX_APEI_GHES_SDEI_CRITICAL); + raw_spin_unlock(&ghes_notify_lock_sdei_critical); + + return err; +} + +static int apei_sdei_register_ghes(struct ghes *ghes) +{ + int err; + + ghes_estatus_queue_grow_pool(ghes); + + err = sdei_register_ghes(ghes, ghes_sdei_normal_callback, + ghes_sdei_critical_callback); + if (err) + ghes_estatus_queue_shrink_pool(ghes); + + return err; +} + +static int apei_sdei_unregister_ghes(struct ghes *ghes) +{ + int err = sdei_unregister_ghes(ghes); + + if (!err) + ghes_estatus_queue_shrink_pool(ghes); + + return err; +} +#else +static int apei_sdei_register_ghes(struct ghes *ghes) { return -EINVAL; } +static int apei_sdei_unregister_ghes(struct ghes *ghes) { return -EINVAL; } +#endif /* CONFIG_ACPI_APEI_SDEI */ + static int ghes_probe(struct platform_device *ghes_dev) { struct acpi_hest_generic *generic; @@ -1103,6 +1173,13 @@ static int ghes_probe(struct platform_device *ghes_dev) goto err; } break; + case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED: + if (!IS_ENABLED(CONFIG_ACPI_APEI_SDEI)) { + pr_warn(GHES_PFX "Generic hardware error source: %d notified via SDE Interface is not supported!\n", + generic->header.source_id); + goto err; + } + break; case ACPI_HEST_NOTIFY_LOCAL: pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n", generic->header.source_id); @@ -1166,6 +1243,11 @@ static int ghes_probe(struct platform_device *ghes_dev) case ACPI_HEST_NOTIFY_NMI: ghes_nmi_add(ghes); break; + case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED: + rc = apei_sdei_register_ghes(ghes); + if (rc) + goto err; + break; default: BUG(); } @@ -1189,6 +1271,7 @@ static int ghes_probe(struct platform_device *ghes_dev) static int ghes_remove(struct platform_device *ghes_dev) { + int rc; struct ghes *ghes; struct acpi_hest_generic *generic; @@ -1221,6 +1304,11 @@ static int ghes_remove(struct platform_device *ghes_dev) case ACPI_HEST_NOTIFY_NMI: ghes_nmi_remove(ghes); break; + case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED: + rc = apei_sdei_unregister_ghes(ghes); + if (rc) + return rc; + break; default: BUG(); break; diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 6e83880046d7..69c52c0591da 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -85,6 +85,7 @@ config ARM_SCPI_POWER_DOMAIN config ARM_SDE_INTERFACE bool "ARM Software Delegated Exception Interface (SDEI)" depends on ARM64 + select ACPI_APEI_SDEI if ACPI_APEI_GHES help The Software Delegated Exception Interface (SDEI) is an ARM standard for registering callbacks from the platform firmware diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index c1b6591f2183..97fd8d22bf15 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -890,7 +890,7 @@ static void sdei_smccc_hvc(unsigned long function_id, arm_smccc_hvc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res); } -#ifdef CONFIG_ACPI_APEI_GHES +#ifdef CONFIG_ACPI_APEI_SDEI int sdei_register_ghes(struct ghes *ghes, sdei_event_callback *normal_cb, sdei_event_callback *critical_cb) { @@ -951,7 +951,7 @@ int sdei_unregister_ghes(struct ghes *ghes) return err; } -#endif /* CONFIG_ACPI_APEI_GHES */ +#endif /* CONFIG_ACPI_APEI_SDEI */ static int sdei_get_conduit(struct platform_device *pdev) { diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h index 393899192906..3305ea7f9dc7 100644 --- a/include/linux/arm_sdei.h +++ b/include/linux/arm_sdei.h @@ -12,7 +12,10 @@ enum sdei_conduit_types { }; #include + +#ifdef CONFIG_ARM_SDE_INTERFACE #include +#endif /* Arch code should override this to set the entry point from firmware... */ #ifndef sdei_arch_get_entry_point