From patchwork Thu Mar 22 18:14:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 10302141 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 0FBE2600F6 for ; Thu, 22 Mar 2018 18:34:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3FF32885B for ; Thu, 22 Mar 2018 18:34:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E594F288DC; Thu, 22 Mar 2018 18:34:16 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 68E3B2885B for ; Thu, 22 Mar 2018 18:34:16 +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=wbvE7JYbqsbtCeIJFArbdtlQLFVi4AtPRT5+fZ9iNac=; b=N0qxbd8b6SVO2ce22c9mhOdsDU f17RkG2rXwdWnocltMw4tpNYUwJ1BnT/P/1WZnCfhZ7UYR2JRaWFRplJUz51e7JI70GiPgO8K8ggx fO9JrOjhHBioymy9g7tmhelqU4udWqqxyTaO+5G0p672v+oqBs4Jj+0ApX52MPx4LldKsimacvoTs N78vyUVRjlnQ6oEFVoVDrPQ3oRCUZbfB/wL9rnsaz7bfeuN7egOcIqF/xy5730t6S/ZhHu40843pV 3LgW+ZXZ2/iqikqG6tE6LxVcICMzJONBY60qhevyZXobfTn4YVOaOzPlm47tTuCkLVfNqgzoyRnoJ HwHHuvkA==; 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 1ez52O-0004r1-1K; Thu, 22 Mar 2018 18:34:08 +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 1ez521-0004YN-6T for linux-arm-kernel@bombadil.infradead.org; Thu, 22 Mar 2018 18:33:45 +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=pAFmkTuBtnZrQ8qpvpibly16vXHz/ciXLY62maCI3G8=; b=Qi+TqAMYvbr3iNkHGoHtXZ2IP 51Qvo/6NYQ1cgGWVaPP9U+LdKmHOJXS2fuo5yiECtFsOEUg/0Dcnta0QJolqlJI+/rWeaHhIGQedm AyheFqJVwxoJc5lp4GR9T7JD/pMjbocPBlrk0rXffXlNGngZZ8MX7ECioB54d2INMMdtPl9b65tNM 5rEkpVY2EeIHOkBpMMFaBHVAkqO90YkA42B44V4RGAqEOgnesq9W3E4YV7Oswq6BAGtteuyvvx3BN MHjJOKRtkM8ytDCS4/4n/whuUhyCGJN1qBuoBbx2VtFkqPUV3sX9FWEi+mZBjIdBLj4iJ49YBv4Yv mn7f5WKfw==; Received: from foss.arm.com ([217.140.101.70]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ez4n9-0003aa-6B for linux-arm-kernel@lists.infradead.org; Thu, 22 Mar 2018 18:18:25 +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 3321C174E; Thu, 22 Mar 2018 11:18:12 -0700 (PDT) Received: from melchizedek.cambridge.arm.com (melchizedek.cambridge.arm.com [10.1.207.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 43EA13F487; Thu, 22 Mar 2018 11:18:09 -0700 (PDT) From: James Morse To: linux-acpi@vger.kernel.org Subject: [PATCH v2 09/11] ACPI / APEI: Add support for the SDEI GHES Notification type Date: Thu, 22 Mar 2018 18:14:43 +0000 Message-Id: <20180322181445.23298-10-james.morse@arm.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180322181445.23298-1-james.morse@arm.com> References: <20180322181445.23298-1-james.morse@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180322_181823_529596_C449155A X-CRM114-Status: GOOD ( 17.42 ) 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: Rafael Wysocki , Tony Luck , Christoffer Dall , Punit Agrawal , Xie XiuQi , Marc Zyngier , Catalin Marinas , Tyler Baicar , Will Deacon , 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 number and point the callback at ghes_sdei_callback(). Signed-off-by: James Morse Reviewed-by: Punit Agrawal --- drivers/acpi/apei/ghes.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++-- include/linux/arm_sdei.h | 3 +++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index f48bc9061e3a..22f6ea5b9ad5 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 @@ -59,7 +60,7 @@ #define GHES_PFX "GHES: " -#if defined(CONFIG_HAVE_ACPI_APEI_NMI) || defined(CONFIG_ACPI_APEI_SEA) +#if defined(CONFIG_HAVE_ACPI_APEI_NMI) || defined(CONFIG_ACPI_APEI_SEA) || defined(CONFIG_ARM_SDE_INTERFACE) #define WANT_NMI_ESTATUS_QUEUE 1 #endif @@ -751,7 +752,7 @@ static int _in_nmi_notify_one(struct ghes *ghes) return 0; } -static int ghes_estatus_queue_notified(struct list_head *rcu_list) +static int __maybe_unused ghes_estatus_queue_notified(struct list_head *rcu_list) { int ret = -ENOENT; struct ghes *ghes; @@ -1045,6 +1046,49 @@ static inline void ghes_nmi_add(struct ghes *ghes) { } static inline void ghes_nmi_remove(struct ghes *ghes) { } #endif /* CONFIG_HAVE_ACPI_APEI_NMI */ +static int ghes_sdei_callback(u32 event_num, struct pt_regs *regs, void *arg) +{ + struct ghes *ghes = arg; + + if (!_in_nmi_notify_one(ghes)) { + if (IS_ENABLED(CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG)) + irq_work_queue(&ghes_proc_irq_work); + + return 0; + } + + return -ENOENT; +} + +static int apei_sdei_register_ghes(struct ghes *ghes) +{ + int err = -EINVAL; + + if (IS_ENABLED(CONFIG_ARM_SDE_INTERFACE)) { + ghes_estatus_queue_grow_pool(ghes); + + err = sdei_register_ghes(ghes, ghes_sdei_callback); + if (err) + ghes_estatus_queue_shrink_pool(ghes); + } + + return err; +} + +static int apei_sdei_unregister_ghes(struct ghes *ghes) +{ + int err = -EINVAL; + + if (IS_ENABLED(CONFIG_ARM_SDE_INTERFACE)) { + err = sdei_unregister_ghes(ghes); + + if (!err) + ghes_estatus_queue_shrink_pool(ghes); + } + + return err; +} + static int ghes_probe(struct platform_device *ghes_dev) { struct acpi_hest_generic *generic; @@ -1079,6 +1123,13 @@ static int ghes_probe(struct platform_device *ghes_dev) goto err; } break; + case ACPI_HEST_NOTIFY_SOFTWARE_DELEGATED: + if (!IS_ENABLED(CONFIG_ARM_SDE_INTERFACE)) { + 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); @@ -1146,6 +1197,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_edac_unreg; + break; default: BUG(); } @@ -1167,6 +1223,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; @@ -1199,6 +1256,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/include/linux/arm_sdei.h b/include/linux/arm_sdei.h index 5fdf799be026..f49063ca206d 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