From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Morse Subject: [PATCH v3 10/12] ACPI / APEI: Add support for the SDEI GHES Notification type Date: Fri, 27 Apr 2018 16:35:08 +0100 Message-ID: <20180427153510.5799-11-james.morse@arm.com> References: <20180427153510.5799-1-james.morse@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180427153510.5799-1-james.morse@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: linux-acpi@vger.kernel.org Cc: jonathan.zhang@cavium.com, Rafael Wysocki , Tony Luck , Christoffer Dall , Punit Agrawal , Marc Zyngier , Catalin Marinas , Tyler Baicar , Will Deacon , Dongjiu Geng , linux-mm@kvack.org, Borislav Petkov , Naoya Horiguchi , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Len Brown List-Id: linux-acpi@vger.kernel.org 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 3ddccd170240..f348e6540960 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 @@ -58,7 +59,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 @@ -747,7 +748,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; @@ -1041,6 +1042,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; @@ -1075,6 +1119,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); @@ -1142,6 +1193,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(); } @@ -1163,6 +1219,7 @@ err: static int ghes_remove(struct platform_device *ghes_dev) { + int rc; struct ghes *ghes; struct acpi_hest_generic *generic; @@ -1195,6 +1252,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 -- 2.16.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id 9D65F6B0011 for ; Fri, 27 Apr 2018 11:38:58 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id k136-v6so1253589oih.4 for ; Fri, 27 Apr 2018 08:38:58 -0700 (PDT) Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id g18-v6si567075ote.449.2018.04.27.08.38.57 for ; Fri, 27 Apr 2018 08:38:57 -0700 (PDT) From: James Morse Subject: [PATCH v3 10/12] ACPI / APEI: Add support for the SDEI GHES Notification type Date: Fri, 27 Apr 2018 16:35:08 +0100 Message-Id: <20180427153510.5799-11-james.morse@arm.com> In-Reply-To: <20180427153510.5799-1-james.morse@arm.com> References: <20180427153510.5799-1-james.morse@arm.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-acpi@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, Borislav Petkov , Marc Zyngier , Christoffer Dall , Will Deacon , Catalin Marinas , Naoya Horiguchi , Rafael Wysocki , Len Brown , Tony Luck , Tyler Baicar , Dongjiu Geng , Xie XiuQi , Punit Agrawal , jonathan.zhang@cavium.com, James Morse 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 3ddccd170240..f348e6540960 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 @@ -58,7 +59,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 @@ -747,7 +748,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; @@ -1041,6 +1042,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; @@ -1075,6 +1119,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); @@ -1142,6 +1193,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(); } @@ -1163,6 +1219,7 @@ err: static int ghes_remove(struct platform_device *ghes_dev) { + int rc; struct ghes *ghes; struct acpi_hest_generic *generic; @@ -1195,6 +1252,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 -- 2.16.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: james.morse@arm.com (James Morse) Date: Fri, 27 Apr 2018 16:35:08 +0100 Subject: [PATCH v3 10/12] ACPI / APEI: Add support for the SDEI GHES Notification type In-Reply-To: <20180427153510.5799-1-james.morse@arm.com> References: <20180427153510.5799-1-james.morse@arm.com> Message-ID: <20180427153510.5799-11-james.morse@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 3ddccd170240..f348e6540960 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 @@ -58,7 +59,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 @@ -747,7 +748,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; @@ -1041,6 +1042,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; @@ -1075,6 +1119,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); @@ -1142,6 +1193,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(); } @@ -1163,6 +1219,7 @@ err: static int ghes_remove(struct platform_device *ghes_dev) { + int rc; struct ghes *ghes; struct acpi_hest_generic *generic; @@ -1195,6 +1252,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 -- 2.16.2