hekate: write rsvd cfg to update.bin if different

bootloader/hos/pkg3.c

@@ -29,7 +29,7 @@
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
-extern bool is_ipl_updated(void *buf, const char *path, bool force);
+extern bool is_ipl_updated(void *buf, u32 size, const char *path, bool force);
 
 #define PKG3_KIP_SKIP_MAX 16
 
@@ -84,9 +84,10 @@ typedef struct _pkg3_content_t
 
 static void _pkg3_update_r2p()
 {
-	u8 *r2p_payload = sd_file_read("atmosphere/reboot_payload.bin", NULL);
+	u32 size = 0;
+	u8 *r2p_payload = sd_file_read("atmosphere/reboot_payload.bin", &size);
 
-	is_ipl_updated(r2p_payload, "atmosphere/reboot_payload.bin", h_cfg.updater2p ? true : false);
+	is_ipl_updated(r2p_payload, size, "atmosphere/reboot_payload.bin", h_cfg.updater2p ? true : false);
 
 	free(r2p_payload);
 }

bootloader/main.c

@@ -92,6 +92,7 @@ static void _check_power_off_from_hos()
 // This is a safe and unused DRAM region for our payloads.
 #define RELOC_META_OFF      0x7C
 #define PATCHED_RELOC_SZ    0x94
+#define VERSION_RCFG_OFF    0x120
 #define PATCHED_RELOC_STACK 0x40007000
 #define PATCHED_RELOC_ENTRY 0x40010000
 #define EXT_PAYLOAD_ADDR    0xC0000000
@@ -121,7 +122,7 @@ static void _reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size)
 	}
 }
 
-bool is_ipl_updated(void *buf, const char *path, bool force)
+bool is_ipl_updated(void *buf, u32 size, const char *path, bool force)
 {
 	ipl_ver_meta_t *update_ft = (ipl_ver_meta_t *)(buf + PATCHED_RELOC_SZ + sizeof(boot_cfg_t));
 
@@ -131,28 +132,32 @@ bool is_ipl_updated(void *buf, const char *path, bool force)
 
 	// Check if newer version.
 	if (!force && magic_valid)
+	{
+		// Copy reserved config.
+		if (size && !is_valid_old && memcmp((u8 *)(IPL_LOAD_ADDR + VERSION_RCFG_OFF), (u8 *)(buf + VERSION_RCFG_OFF), sizeof(rsvd_cfg_t)))
+		{
+			memcpy((u8 *)(buf + VERSION_RCFG_OFF), (u8 *)(IPL_LOAD_ADDR + VERSION_RCFG_OFF), sizeof(rsvd_cfg_t));
+			sd_save_to_file(buf, size, path);
+		}
+
 		if (byte_swap_32(update_ft->version) > byte_swap_32(ipl_ver.version))
 			return false;
+	}
 
 	// Update if old or broken.
 	if (force_update || is_valid_old)
 	{
-		FIL fp;
+		boot_cfg_t tmp_cfg;
 		reloc_meta_t *reloc = (reloc_meta_t *)(IPL_LOAD_ADDR + RELOC_META_OFF);
-		boot_cfg_t *tmp_cfg = zalloc(sizeof(boot_cfg_t));
-
-		f_open(&fp, path, FA_WRITE | FA_CREATE_ALWAYS);
-		f_write(&fp, (u8 *)reloc->start, reloc->end - reloc->start, NULL);
-
-		// Write needed tag in case injected ipl uses old versioning.
-		f_write(&fp, "ICTC49", 6, NULL);
 
 		// Reset boot storage configuration.
-		f_lseek(&fp, PATCHED_RELOC_SZ);
+		memcpy(&tmp_cfg, (u8 *)(reloc->start + PATCHED_RELOC_SZ), sizeof(boot_cfg_t));
-		f_write(&fp, tmp_cfg, sizeof(boot_cfg_t), NULL);
+		memset((u8 *)(reloc->start + PATCHED_RELOC_SZ), 0, sizeof(boot_cfg_t));
 
-		f_close(&fp);
+		sd_save_to_file((u8 *)reloc->start, reloc->end - reloc->start, path);
-		free(tmp_cfg);
+
+		// Restore boot storage configuration.
+		memcpy((u8 *)(reloc->start + PATCHED_RELOC_SZ), &tmp_cfg, sizeof(boot_cfg_t));
 	}
 
 	return true;
@@ -164,8 +169,10 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 		gfx_clear_grey(0x1B);
 	gfx_con_setpos(0, 0);
 
-	FIL fp;
+	// Read payload.
-	if (f_open(&fp, path, FA_READ))
+	u32 size = 0;
+	void *buf = sd_file_read(path, &size);
+	if (!buf)
 	{
 		gfx_con.mute = false;
 		EPRINTFARGS("Payload file is missing!\n(%s)", path);
@@ -173,20 +180,20 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 		goto out;
 	}
 
-	// Read and copy the payload to our chosen address
+	if (update && is_ipl_updated(buf, size, path, false))
-	void *buf;
+		goto out;
-	u32 size = f_size(&fp);
 
+
+	// Set payload address.
+	void *payload;
 	if (size < 0x30000)
-		buf = (void *)RCM_PAYLOAD_ADDR;
+		payload = (void *)RCM_PAYLOAD_ADDR;
 	else
 	{
 		coreboot_addr = (void *)(COREBOOT_END_ADDR - size);
-		buf = coreboot_addr;
+		payload = coreboot_addr;
 		if (h_cfg.t210b01)
 		{
-			f_close(&fp);
-
 			gfx_con.mute = false;
 			EPRINTF("Coreboot not allowed on Mariko!");
 
@@ -194,20 +201,11 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 		}
 	}
 
-	if (f_read(&fp, buf, size, NULL))
-	{
-		f_close(&fp);
-
-		goto out;
-	}
-
-	f_close(&fp);
-
-	if (update && is_ipl_updated(buf, path, false))
-		goto out;
-
 	sd_end();
 
+	// Copy the payload to our chosen address.
+	memcpy(payload, buf, size);
+
 	if (size < 0x30000)
 	{
 		if (update)
@@ -215,7 +213,7 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 		else
 			_reloc_patcher(PATCHED_RELOC_ENTRY, EXT_PAYLOAD_ADDR, ALIGN(size, 0x10));
 
-		hw_deinit(false, byte_swap_32(*(u32 *)(buf + size - sizeof(u32))));
+		hw_deinit(false, byte_swap_32(*(u32 *)(payload + size - sizeof(u32))));
 	}
 	else
 	{
@@ -223,7 +221,7 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 
 		// Get coreboot seamless display magic.
 		u32 magic = 0;
-		char *magic_ptr = buf + COREBOOT_VER_OFF;
+		char *magic_ptr = payload + COREBOOT_VER_OFF;
 		memcpy(&magic, magic_ptr + strlen(magic_ptr) - 4, 4);
 		hw_deinit(true, magic);
 	}
@@ -247,6 +245,7 @@ static void _launch_payload(char *path, bool update, bool clear_screen)
 	}
 
 out:
+	free(buf);
 	if (!update)
 	{
 		gfx_con.mute = false;
@@ -750,7 +749,7 @@ static void _check_for_updated_bootloader()
 		else
 		{
 			u8 *buf = zalloc(0x200);
-			is_ipl_updated(buf, "bootloader/update.bin", true);
+			is_ipl_updated(buf, 0, "bootloader/update.bin", true);
 			free(buf);
 		}
 	}