2 files changed, 16 insertions, 9 deletions
diff --git a/src/soc/amd/common/block/psp/psp_def.h b/src/soc/amd/common/block/psp/psp_def.h
index 1d87878c03..a1eceab278 100644
--- a/src/soc/amd/common/block/psp/psp_def.h
+++ b/src/soc/amd/common/block/psp/psp_def.h
@@ -108,5 +108,6 @@ void psp_print_cmd_status(int cmd_status, struct mbox_buffer_header *header);
 int send_psp_command(u32 command, void *buffer);
 
 uint32_t soc_read_c2p38(void);
+void psp_set_spl_fuse(void *unused);
 
 #endif /* __AMD_PSP_DEF_H__ */
diff --git a/src/soc/amd/common/block/psp/psp_gen2.c b/src/soc/amd/common/block/psp/psp_gen2.c
index 65043e5245..92063d6cdb 100644
--- a/src/soc/amd/common/block/psp/psp_gen2.c
+++ b/src/soc/amd/common/block/psp/psp_gen2.c
@@ -114,25 +114,31 @@ uint32_t soc_read_c2p38(void)
 	return smn_read32(SMN_PSP_PUBLIC_BASE + CORE_2_PSP_MSG_38_OFFSET);
 }
 
-static void psp_set_spl_fuse(void *unused)
+void psp_set_spl_fuse(void *unused)
 {
-	if (!CONFIG(SOC_AMD_COMMON_BLOCK_PSP_FUSE_SPL))
-		return;
-
 	int cmd_status = 0;
 	struct mbox_cmd_late_spl_buffer buffer = {
 		.header = {
 			.size = sizeof(buffer)
 		}
 	};
+	uint32_t c2p38 = soc_read_c2p38();
 
-	if (soc_read_c2p38() & CORE_2_PSP_MSG_38_FUSE_SPL) {
-		printk(BIOS_DEBUG, "PSP: Fuse SPL requested\n");
-		cmd_status = send_psp_command(MBOX_BIOS_CMD_SET_SPL_FUSE, &buffer);
-		psp_print_cmd_status(cmd_status, NULL);
+	if (c2p38 & CORE_2_PSP_MSG_38_FUSE_SPL) {
+		printk(BIOS_DEBUG, "PSP: SPL Fusing may be updated.\n");
 	} else {
-		printk(BIOS_DEBUG, "PSP: Fuse SPL not requested\n");
+		printk(BIOS_DEBUG, "PSP: SPL Fusing not currently required.\n");
+		return;
 	}
+
+	if (!CONFIG(SOC_AMD_COMMON_BLOCK_PSP_FUSE_SPL))
+		return;
+
+	printk(BIOS_DEBUG, "PSP: SPL Fusing Update Requested.\n");
+	cmd_status = send_psp_command(MBOX_BIOS_CMD_SET_SPL_FUSE, &buffer);
+	psp_print_cmd_status(cmd_status, NULL);
 }
 
+#if CONFIG(HAVE_SPL_FILE)
 BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_ENTRY, psp_set_spl_fuse, NULL);
+#endif