4 files changed, 43 insertions, 16 deletions

diff --git a/src/soc/intel/quark/include/soc/romstage.h b/src/soc/intel/quark/include/soc/romstage.h
index d6f9186754..43d420e1e7 100644
--- a/src/soc/intel/quark/include/soc/romstage.h
+++ b/src/soc/intel/quark/include/soc/romstage.h
@@ -32,6 +32,7 @@
 asmlinkage void *car_stage_c_entry(void);
 void clear_smi_and_wake_events(void);
 void disable_rom_shadow(void);
+void *locate_rmu_file(size_t *rmu_file_len);
 void report_platform_info(void);
 int set_base_address_and_enable_uart(u8 bus, u8 dev, u8 func, u32 mmio_base);
 void pcie_init(void);
diff --git a/src/soc/intel/quark/romstage/fsp1_1.c b/src/soc/intel/quark/romstage/fsp1_1.c
index 84fc5a55ba..f715f43425 100644
--- a/src/soc/intel/quark/romstage/fsp1_1.c
+++ b/src/soc/intel/quark/romstage/fsp1_1.c
@@ -17,7 +17,6 @@
 
 #include <arch/early_variables.h>
 #include <console/console.h>
-#include <cbfs.h>
 #include "../chip.h"
 #include <fsp/memmap.h>
 #include <fsp/util.h>
@@ -82,8 +81,8 @@ void soc_memory_init_params(struct romstage_params *params,
 {
 	const struct device *dev;
 	const struct soc_intel_quark_config *config;
-	char *rmu_file;
-	size_t rmu_file_len;
+	void *rmu_data;
+	size_t rmu_data_len;
 
 	/* Locate the configuration data from devicetree.cb */
 	dev = dev_find_slot(0, LPC_DEV_FUNC);
@@ -100,9 +99,8 @@ void soc_memory_init_params(struct romstage_params *params,
 	clear_smi_and_wake_events();
 
 	/* Locate the RMU data file in flash */
-	rmu_file = cbfs_boot_map_with_leak("rmu.bin", CBFS_TYPE_RAW,
-		&rmu_file_len);
-	if (!rmu_file)
+	rmu_data = locate_rmu_file(&rmu_data_len);
+	if (!rmu_data)
 		die("Microcode file (rmu.bin) not found.");
 
 	/* Display the ESRAM layout */
@@ -154,8 +152,8 @@ void soc_memory_init_params(struct romstage_params *params,
 	upd->Flags = config->Flags;
 	upd->FspReservedMemoryLength = config->FspReservedMemoryLength;
 	upd->RankMask = config->RankMask;
-	upd->RmuBaseAddress = (uintptr_t)rmu_file;
-	upd->RmuLength = rmu_file_len;
+	upd->RmuBaseAddress = (uintptr_t)rmu_data;
+	upd->RmuLength = rmu_data_len;
 	upd->SerialPortWriteChar = console_log_level(BIOS_SPEW)
 		? (uintptr_t)fsp_write_line : 0;
 	upd->SmmTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ?
diff --git a/src/soc/intel/quark/romstage/fsp2_0.c b/src/soc/intel/quark/romstage/fsp2_0.c
index 4d7f7c9479..d03545d759 100644
--- a/src/soc/intel/quark/romstage/fsp2_0.c
+++ b/src/soc/intel/quark/romstage/fsp2_0.c
@@ -15,7 +15,6 @@
 
 #include <arch/early_variables.h>
 #include <console/console.h>
-#include <cbfs.h>
 #include <cbmem.h>
 #include "../chip.h"
 #include <cpu/x86/cache.h>
@@ -92,17 +91,16 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version)
 	FSPM_ARCH_UPD *aupd;
 	const struct device *dev;
 	const struct soc_intel_quark_config *config;
-	char *rmu_file;
-	size_t rmu_file_len;
+	void *rmu_data;
+	size_t rmu_data_len;
 	FSP_M_CONFIG *upd;
 
 	/* Clear SMI and wake events */
 	clear_smi_and_wake_events();
 
 	/* Locate the RMU data file in flash */
-	rmu_file = cbfs_boot_map_with_leak("rmu.bin", CBFS_TYPE_RAW,
-		&rmu_file_len);
-	if (!rmu_file)
+	rmu_data = locate_rmu_file(&rmu_data_len);
+	if (!rmu_data)
 		die("Microcode file (rmu.bin) not found.");
 
 	/* Locate the configuration data from devicetree.cb */
@@ -157,8 +155,8 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version)
 	upd->Flags = config->Flags;
 	upd->FspReservedMemoryLength = config->FspReservedMemoryLength;
 	upd->RankMask = config->RankMask;
-	upd->RmuBaseAddress = (uintptr_t)rmu_file;
-	upd->RmuLength = rmu_file_len;
+	upd->RmuBaseAddress = (uintptr_t)rmu_data;
+	upd->RmuLength = rmu_data_len;
 	upd->SerialPortWriteChar = console_log_level(BIOS_SPEW)
 		? (uintptr_t)fsp_write_line : 0;
 	upd->SmmTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ?
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index e774993bf2..c5f59c6325 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -16,6 +16,7 @@
 #define __SIMPLE_DEVICE__
 
 #include <arch/early_variables.h>
+#include <cbfs.h>
 #include <console/console.h>
 #include <fsp/util.h>
 #include <soc/pci_devs.h>
@@ -61,3 +62,32 @@ void disable_rom_shadow(void)
 			QNC_MSG_FSBIC_REG_HMISC, data);
 	}
 }
+
+void *locate_rmu_file(size_t *rmu_file_len)
+{
+	struct cbfsf fh;
+	size_t fsize;
+	void *rmu_data;
+	uint32_t type;
+
+	/* Locate the rmu.bin file in the read-only region of the flash */
+	type = CBFS_TYPE_RAW;
+	if (cbfs_locate_file_in_region(&fh, "COREBOOT", "rmu.bin", &type))
+		return NULL;
+
+	/* Get the file size */
+	fsize = region_device_sz(&fh.data);
+	if (rmu_file_len != NULL)
+		*rmu_file_len = fsize;
+
+	/* Get the data address */
+	rmu_data = rdev_mmap(&fh.data, 0, fsize);
+
+	/* Since the SPI flash is directly mapped into memory, we do not need
+	 * the mapping provided by the rdev service.  Unmap the file to prevent
+	 * a memory leak.  Return/leak the SPI flash address for the rmu.bin
+	 * file data which will be directly accessed by FSP MemoryInit.
+	 */
+	rdev_munmap(&fh.data, rmu_data);
+	return rmu_data;
+}