From patchwork Wed Aug 31 07:40:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia He X-Patchwork-Id: 12960480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C2C8ECAAD1 for ; Wed, 31 Aug 2022 07:42:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbiHaHmI (ORCPT ); Wed, 31 Aug 2022 03:42:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230240AbiHaHl3 (ORCPT ); Wed, 31 Aug 2022 03:41:29 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E0AF1BD1EC; Wed, 31 Aug 2022 00:41:13 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CD93C1042; Wed, 31 Aug 2022 00:41:18 -0700 (PDT) Received: from entos-ampere-02.shanghai.arm.com (entos-ampere-02.shanghai.arm.com [10.169.212.212]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 984403F766; Wed, 31 Aug 2022 00:41:34 -0700 (PDT) From: Jia He To: Len Brown , James Morse , Tony Luck , Borislav Petkov , Mauro Carvalho Chehab , Robert Richter , Robert Moore , Qiuxu Zhuo , Yazen Ghannam , Jan Luebbe , Khuong Dinh , Kani Toshi Cc: Ard Biesheuvel , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, devel@acpica.org, "Rafael J . Wysocki" , Shuai Xue , Jarkko Sakkinen , linux-efi@vger.kernel.org, nd@arm.com, Jia He Subject: [PATCH v4 3/8] EDAC:ghes: Move ghes_edac.force_load to ghes module parameter Date: Wed, 31 Aug 2022 07:40:22 +0000 Message-Id: <20220831074027.13849-4-justin.he@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220831074027.13849-1-justin.he@arm.com> References: <20220831074027.13849-1-justin.he@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org ghes_edac_init() is too late to set this module flag ghes_edac.force_load. Also, other edac drivers should not be able to control this flag. Move this flag to the module parameter in ghes instead. Suggested-by: Toshi Kani Signed-off-by: Jia He --- drivers/acpi/apei/ghes.c | 11 +++++++++++ drivers/edac/ghes_edac.c | 10 +++------- include/acpi/apei.h | 2 ++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 8cb65f757d06..6bc9c78f916b 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -109,6 +109,14 @@ static inline bool is_hest_type_generic_v2(struct ghes *ghes) bool ghes_disable; module_param_named(disable, ghes_disable, bool, 0); +/* + * "ghes.edac_force_load" forcibly loads ghes_edac and skips the platform + * check. + */ +bool ghes_edac_force_load; +module_param_named(edac_force_load, ghes_edac_force_load, bool, 0); +EXPORT_SYMBOL(ghes_edac_force_load); + /* * All error sources notified with HED (Hardware Error Device) share a * single notifier callback, so they need to be linked and checked one @@ -1483,6 +1491,9 @@ void __init acpi_ghes_init(void) return; } + if (!IS_ENABLED(CONFIG_X86)) + ghes_edac_force_load = true; + ghes_nmi_init_cxt(); rc = platform_driver_register(&ghes_platform_driver); diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 7b8d56a769f6..f716d5d8f1df 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -54,10 +54,6 @@ static DEFINE_MUTEX(ghes_reg_mutex); */ static DEFINE_SPINLOCK(ghes_lock); -/* "ghes_edac.force_load=1" skips the platform check */ -static bool __read_mostly force_load; -module_param(force_load, bool, 0); - static bool system_scanned; /* Memory Device - Type 17 of SMBIOS spec */ @@ -408,10 +404,10 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) if (IS_ENABLED(CONFIG_X86)) { /* Check if safe to enable on this system */ idx = acpi_match_platform_list(plat_list); - if (!force_load && idx < 0) + if (!ghes_edac_force_load && idx < 0) return -ENODEV; } else { - force_load = true; + ghes_edac_force_load = true; idx = 0; } @@ -535,7 +531,7 @@ void ghes_edac_unregister(struct ghes *ghes) struct mem_ctl_info *mci; unsigned long flags; - if (!force_load) + if (!ghes_edac_force_load) return; mutex_lock(&ghes_reg_mutex); diff --git a/include/acpi/apei.h b/include/acpi/apei.h index dc60f7db5524..356bdf4bb66e 100644 --- a/include/acpi/apei.h +++ b/include/acpi/apei.h @@ -27,9 +27,11 @@ extern int hest_disable; extern int erst_disable; #ifdef CONFIG_ACPI_APEI_GHES extern bool ghes_disable; +extern bool ghes_edac_force_load; void __init acpi_ghes_init(void); #else #define ghes_disable 1 +#define ghes_edac_force_load 0 static inline void acpi_ghes_init(void) { } #endif