From patchwork Tue Jan 31 04:03:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin He X-Patchwork-Id: 649430 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 E224BC636D6 for ; Tue, 31 Jan 2023 04:04:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229934AbjAaEEJ (ORCPT ); Mon, 30 Jan 2023 23:04:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230267AbjAaEEI (ORCPT ); Mon, 30 Jan 2023 23:04:08 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C5F44113CB; Mon, 30 Jan 2023 20:04:07 -0800 (PST) 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 9D0AC1713; Mon, 30 Jan 2023 20:04:49 -0800 (PST) Received: from entos-ampere-02.shanghai.arm.com (entos-ampere-02.shanghai.arm.com [10.169.214.132]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 648883F64C; Mon, 30 Jan 2023 20:04:05 -0800 (PST) From: Jia He To: Ard Biesheuvel Cc: Huacai Chen , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandru Elisei , Jia He Subject: [PATCH 1/2] efi: libstub: Fix the retriving of supported rutime services Date: Tue, 31 Jan 2023 04:03:54 +0000 Message-Id: <20230131040355.3116-2-justin.he@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230131040355.3116-1-justin.he@arm.com> References: <20230131040355.3116-1-justin.he@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org If retrieving UEFI configuration table is failed, the supported runtime services mask should be regarded as 0 instead of EFI_RT_SUPPORTED_ALL. Otherwise efi_novamap might be incorrectly assigned to "false" on the Ampere Emag server. Signed-off-by: Jia He --- drivers/firmware/efi/libstub/efi-stub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi/libstub/efi-stub.c index 2955c1ac6a36..f24b5436729c 100644 --- a/drivers/firmware/efi/libstub/efi-stub.c +++ b/drivers/firmware/efi/libstub/efi-stub.c @@ -111,6 +111,8 @@ static u32 get_supported_rt_services(void) rt_prop_table = get_efi_config_table(EFI_RT_PROPERTIES_TABLE_GUID); if (rt_prop_table) supported &= rt_prop_table->runtime_services_supported; + else + supported = 0; return supported; } From patchwork Tue Jan 31 04:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin He X-Patchwork-Id: 649037 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 199D5C636D3 for ; Tue, 31 Jan 2023 04:04:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230267AbjAaEEM (ORCPT ); Mon, 30 Jan 2023 23:04:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbjAaEEL (ORCPT ); Mon, 30 Jan 2023 23:04:11 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 830573801E; Mon, 30 Jan 2023 20:04:10 -0800 (PST) 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 503882F4; Mon, 30 Jan 2023 20:04:52 -0800 (PST) Received: from entos-ampere-02.shanghai.arm.com (entos-ampere-02.shanghai.arm.com [10.169.214.132]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 206E83F64C; Mon, 30 Jan 2023 20:04:07 -0800 (PST) From: Jia He To: Ard Biesheuvel Cc: Huacai Chen , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandru Elisei , Jia He Subject: [PATCH 2/2] efi: Introduce efi_get_supported_rt_services() to get the runtime services mask Date: Tue, 31 Jan 2023 04:03:55 +0000 Message-Id: <20230131040355.3116-3-justin.he@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230131040355.3116-1-justin.he@arm.com> References: <20230131040355.3116-1-justin.he@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Previously, efi.runtime_supported_mask will always be the initial value EFI_RT_SUPPORTED_ALL and can't be retrieved in efi_config_parse_tables() if rt_prop is EFI_INVALID_TABLE_ADDR. Thus this can cause the wrong return value of efi_rt_services_supported(EFI_RT_SUPPORTED_SET_VARIABLE) on the Ampere Emag server. Besides, abstract the runtime services retrieving into a new exported helper efi_get_supported_rt_services() to set or clear the runtime service bit of efi.flags. Signed-off-by: Jia He --- drivers/firmware/efi/arm-runtime.c | 5 ++++- drivers/firmware/efi/efi.c | 28 +++++++++++++++++++--------- include/linux/efi.h | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 83f5bb57fa4c..ce93133f9abc 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -146,7 +146,10 @@ static int __init arm_enable_runtime_services(void) /* Set up runtime services function pointers */ efi_native_runtime_setup(); - set_bit(EFI_RUNTIME_SERVICES, &efi.flags); + if (efi_get_supported_rt_services()) + set_bit(EFI_RUNTIME_SERVICES, &efi.flags); + else + clear_bit(EFI_RUNTIME_SERVICES, &efi.flags); return 0; } diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index a2b0cbc8741c..96475cb8088e 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -595,6 +595,24 @@ static __init int match_config_table(const efi_guid_t *guid, return 0; } +unsigned int __init efi_get_supported_rt_services(void) +{ + unsigned int runtime_supported_mask = EFI_RT_SUPPORTED_ALL; + + if (rt_prop != EFI_INVALID_TABLE_ADDR) { + efi_rt_properties_table_t *tbl; + + tbl = early_memremap(rt_prop, sizeof(*tbl)); + if (tbl) { + runtime_supported_mask &= tbl->runtime_services_supported; + early_memunmap(tbl, sizeof(*tbl)); + } + } else + runtime_supported_mask = 0; + + return runtime_supported_mask; +} + int __init efi_config_parse_tables(const efi_config_table_t *config_tables, int count, const efi_config_table_type_t *arch_tables) @@ -695,15 +713,7 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, } } - if (rt_prop != EFI_INVALID_TABLE_ADDR) { - efi_rt_properties_table_t *tbl; - - tbl = early_memremap(rt_prop, sizeof(*tbl)); - if (tbl) { - efi.runtime_supported_mask &= tbl->runtime_services_supported; - early_memunmap(tbl, sizeof(*tbl)); - } - } + efi.runtime_supported_mask &= efi_get_supported_rt_services(); if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && initrd != EFI_INVALID_TABLE_ADDR && phys_initrd_size == 0) { diff --git a/include/linux/efi.h b/include/linux/efi.h index 4b27519143f5..fcaf0d7fc07e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -717,6 +717,7 @@ extern void __init efi_esrt_init(void); #else static inline void efi_esrt_init(void) { } #endif +extern unsigned int efi_get_supported_rt_services(void); extern int efi_config_parse_tables(const efi_config_table_t *config_tables, int count, const efi_config_table_type_t *arch_tables);