stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value
@ 2022-01-28  4:50 Sunil V L
  2022-01-28  6:17 ` Heinrich Schuchardt
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Sunil V L @ 2022-01-28  4:50 UTC (permalink / raw)
  To: Ard Biesheuvel, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Atish Patra
  Cc: linux-efi, linux-riscv, linux-kernel, Heinrich Schuchardt,
	Anup Patel, Sunil V L, stable

The get_boot_hartid_from_fdt() function currently returns U32_MAX
for failure case which is not correct because U32_MAX is a valid
hartid value. This patch fixes the issue by returning error code.

Fixes: d7071743db31 ("RISC-V: Add EFI stub support.")
Cc: stable@vger.kernel.org

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 drivers/firmware/efi/libstub/riscv-stub.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/firmware/efi/libstub/riscv-stub.c b/drivers/firmware/efi/libstub/riscv-stub.c
index 380e4e251399..9c460843442f 100644
--- a/drivers/firmware/efi/libstub/riscv-stub.c
+++ b/drivers/firmware/efi/libstub/riscv-stub.c
@@ -25,7 +25,7 @@ typedef void __noreturn (*jump_kernel_func)(unsigned int, unsigned long);
 
 static u32 hartid;
 
-static u32 get_boot_hartid_from_fdt(void)
+static int get_boot_hartid_from_fdt(void)
 {
 	const void *fdt;
 	int chosen_node, len;
@@ -33,23 +33,26 @@ static u32 get_boot_hartid_from_fdt(void)
 
 	fdt = get_efi_config_table(DEVICE_TREE_GUID);
 	if (!fdt)
-		return U32_MAX;
+		return -EINVAL;
 
 	chosen_node = fdt_path_offset(fdt, "/chosen");
 	if (chosen_node < 0)
-		return U32_MAX;
+		return -EINVAL;
 
 	prop = fdt_getprop((void *)fdt, chosen_node, "boot-hartid", &len);
 	if (!prop || len != sizeof(u32))
-		return U32_MAX;
+		return -EINVAL;
 
-	return fdt32_to_cpu(*prop);
+	hartid = fdt32_to_cpu(*prop);
+	return 0;
 }
 
 efi_status_t check_platform_features(void)
 {
-	hartid = get_boot_hartid_from_fdt();
-	if (hartid == U32_MAX) {
+	int ret;
+
+	ret = get_boot_hartid_from_fdt();
+	if (ret) {
 		efi_err("/chosen/boot-hartid missing or invalid!\n");
 		return EFI_UNSUPPORTED;
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2022-02-17 19:52 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-28  4:50 [PATCH] riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value Sunil V L
2022-01-28  6:17 ` Heinrich Schuchardt
2022-02-14  8:41 ` Sunil V L
2022-02-14  9:12 ` Andreas Schwab
2022-02-14  9:24   ` Heinrich Schuchardt
2022-02-14  9:33     ` Andreas Schwab
2022-02-14 10:15     ` Andreas Schwab
2022-02-14 10:27       ` Heinrich Schuchardt
2022-02-14 11:09         ` Andreas Schwab
2022-02-17 10:54           ` Sunil V L
2022-02-17 19:46             ` Atish Patra
2022-02-17 19:52               ` Ard Biesheuvel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).