sw64: efi: fix boot failure when Secure Boot unsupported in firmware

Gu Zitao · opsiff · commit bd7938f96cbc · 2025-12-09T16:59:53.000+08:00
Signed-off-by: Gu Zitao &lt;guzitao@wxiat.com&gt;
Reviewed-by: He Sheng &lt;hesheng@wxiat.com&gt;
diff --git a/drivers/firmware/efi/fdtparams.c b/drivers/firmware/efi/fdtparams.c
@@ -56,7 +56,11 @@ static __initconst const struct {
 			[MMSIZE] = "linux,uefi-mmap-size",
 			[DCSIZE] = "linux,uefi-mmap-desc-size",
 			[DCVERS] = "linux,uefi-mmap-desc-ver",
+#ifndef CONFIG_SW64
 			[SBMODE] = "linux,uefi-secure-boot",
+#else
+			[SBMODE] = "",
+#endif
 		}
 	}
 };
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
@@ -132,11 +132,13 @@ static efi_status_t update_fdt(void *orig_fdt, unsigned long orig_fdt_size,
 		}
 	}
 
+#ifndef CONFIG_SW64
 	fdt_val32 = cpu_to_fdt32(efi_get_secureboot());
 	status = fdt_setprop(fdt, node, "linux,uefi-secure-boot",
 			     &fdt_val32, sizeof(fdt_val32));
 	if (status)
 		goto fdt_set_fail;
+#endif
 
 	/* Shrink the FDT back to its minimum size: */
 	fdt_pack(fdt);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,11 @@ static __initconst const struct {`
`56`	`56`	`[MMSIZE] = "linux,uefi-mmap-size",`
`57`	`57`	`[DCSIZE] = "linux,uefi-mmap-desc-size",`
`58`	`58`	`[DCVERS] = "linux,uefi-mmap-desc-ver",`
	`59`	`+#ifndef CONFIG_SW64`
`59`	`60`	`[SBMODE] = "linux,uefi-secure-boot",`
	`61`	`+#else`
	`62`	`+ [SBMODE] = "",`
	`63`	`+#endif`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`	`};`
Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,13 @@ static efi_status_t update_fdt(void *orig_fdt, unsigned long orig_fdt_size,`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
	`135`	`+#ifndef CONFIG_SW64`
`135`	`136`	`fdt_val32 = cpu_to_fdt32(efi_get_secureboot());`
`136`	`137`	`status = fdt_setprop(fdt, node, "linux,uefi-secure-boot",`
`137`	`138`	`&fdt_val32, sizeof(fdt_val32));`
`138`	`139`	`if (status)`
`139`	`140`	`goto fdt_set_fail;`
	`141`	`+#endif`
`140`	`142`
`141`	`143`	`/* Shrink the FDT back to its minimum size: */`
`142`	`144`	`fdt_pack(fdt);`