<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/24995">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/vboot: Replace all region device and map functions<br><br>* Use blob_provider to read blobs.<br><br>Change-Id: I1e288c7a17cc96d7e65f914f7253aaa4b74d04e8<br>Signed-off-by: zaolin <zaolin@das-labor.org><br>---<br>M src/arch/x86/acpi.c<br>M src/cpu/amd/microcode/microcode.c<br>M src/cpu/intel/microcode/microcode.c<br>M src/cpu/via/nano/update_ucode.c<br>M src/device/oprom/realmode/x86.c<br>M src/device/oprom/yabel/vbe.c<br>M src/drivers/amd/agesa/def_callouts.c<br>M src/drivers/amd/agesa/state_machine.c<br>M src/drivers/intel/fsp1_0/fastboot_cache.c<br>M src/drivers/intel/fsp1_1/vbt.c<br>M src/drivers/intel/fsp2_0/memory_init.c<br>M src/drivers/intel/fsp2_0/silicon_init.c<br>M src/drivers/intel/fsp2_0/temp_ram_exit.c<br>M src/drivers/net/r8168.c<br>M src/drivers/pc80/rtc/mc146818rtc.c<br>M src/drivers/pc80/rtc/mc146818rtc_boot.c<br>M src/drivers/siemens/nc_fpga/nc_fpga.c<br>M src/lib/coreboot_table.c<br>M src/lib/nhlt.c<br>M src/lib/spd_bin.c<br>M src/mainboard/amd/serengeti_cheetah/acpi_tables.c<br>M src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c<br>M src/mainboard/apple/macbookair4_2/early_southbridge.c<br>M src/mainboard/google/auron/variants/auron_paine/spd/spd.c<br>M src/mainboard/google/auron/variants/auron_yuna/spd/spd.c<br>M src/mainboard/google/auron/variants/gandof/spd/spd.c<br>M src/mainboard/google/auron/variants/lulu/spd/spd.c<br>M src/mainboard/google/auron/variants/samus/spd/spd.c<br>M src/mainboard/google/beltino/lan.c<br>M src/mainboard/google/butterfly/mainboard.c<br>M src/mainboard/google/chell/spd/spd.c<br>M src/mainboard/google/cyan/spd/spd.c<br>M src/mainboard/google/eve/spd/spd.c<br>M src/mainboard/google/glados/spd/spd.c<br>M src/mainboard/google/jecht/lan.c<br>M src/mainboard/google/lars/spd/spd.c<br>M src/mainboard/google/link/romstage.c<br>M src/mainboard/google/poppy/romstage.c<br>M src/mainboard/google/rambi/romstage.c<br>M src/mainboard/google/rambi/variants/ninja/lan.c<br>M src/mainboard/google/rambi/variants/sumo/lan.c<br>M src/mainboard/google/slippy/variants/falco/romstage.c<br>M src/mainboard/google/slippy/variants/leon/romstage.c<br>M src/mainboard/google/slippy/variants/peppy/romstage.c<br>M src/mainboard/google/slippy/variants/wolf/romstage.c<br>M src/mainboard/google/urara/boardid.c<br>M src/mainboard/hp/revolve_810_g1/romstage.c<br>M src/mainboard/intel/harcuvar/spd/spd.c<br>M src/mainboard/intel/kunimitsu/spd/spd_util.c<br>M src/mainboard/iwill/dk8_htx/acpi_tables.c<br>M src/mainboard/lenovo/s230u/romstage.c<br>M src/mainboard/lenovo/x1_carbon_gen1/romstage.c<br>M src/mainboard/purism/librem_skl/mainboard.c<br>M src/mainboard/samsung/lumpy/romstage.c<br>M src/mainboard/siemens/mc_apl1/mainboard.c<br>M src/mainboard/siemens/mc_apl1/ptn3460.c<br>M src/mainboard/siemens/mc_bdx1/mainboard.c<br>M src/mainboard/siemens/mc_tcu3/mainboard.c<br>M src/mainboard/siemens/mc_tcu3/ptn3460.c<br>M src/mainboard/siemens/mc_tcu3/romstage.c<br>M src/northbridge/amd/amdmct/mct_ddr3/s3utils.c<br>M src/northbridge/amd/pi/agesawrapper.c<br>M src/northbridge/intel/common/mrc_cache.c<br>M src/northbridge/intel/haswell/raminit.c<br>M src/northbridge/intel/sandybridge/raminit_mrc.c<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>M src/soc/amd/common/block/pi/def_callouts.c<br>M src/soc/amd/common/block/psp/psp.c<br>M src/soc/intel/baytrail/romstage/raminit.c<br>M src/soc/intel/broadwell/romstage/raminit.c<br>M src/soc/intel/common/mma.c<br>M src/soc/intel/common/vbt.c<br>M src/soc/intel/denverton_ns/chip.c<br>M src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c<br>M src/soc/intel/quark/romstage/romstage.c<br>M src/soc/nvidia/tegra210/mtc.c<br>M src/soc/qualcomm/ipq40xx/blobs_init.c<br>M src/soc/qualcomm/ipq806x/blobs_init.c<br>M src/vendorcode/siemens/hwilib/hwilib.c<br>M src/vendorcode/siemens/hwilib/hwilib.h<br>80 files changed, 265 insertions(+), 368 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/24995/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c</span><br><span>index 601b6f0..a766fd4 100644</span><br><span>--- a/src/arch/x86/acpi.c</span><br><span>+++ b/src/arch/x86/acpi.c</span><br><span>@@ -47,6 +47,7 @@</span><br><span> #include <cpu/x86/lapic_def.h></span><br><span> #include <cpu/cpu.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> u8 acpi_checksum(u8 *table, u32 length)</span><br><span> {</span><br><span>@@ -1004,9 +1005,7 @@</span><br><span> if (fw)</span><br><span> return fw;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dsdt_file = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- CONFIG_CBFS_PREFIX "/dsdt.aml",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &dsdt_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ dsdt_file = blob_read_map(BLOB_DATA_ACPI_DSDT, &dsdt_size);</span><br><span> if (!dsdt_file) {</span><br><span> printk(BIOS_ERR, "No DSDT file, skipping ACPI tables\n");</span><br><span> return current;</span><br><span>@@ -1019,8 +1018,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- slic_file = cbfs_boot_map_with_leak(CONFIG_CBFS_PREFIX "/slic",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &slic_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ slic_file = blob_read_map(BLOB_DATA_ACPI_SLIC, &slic_size);</span><br><span> if (slic_file</span><br><span> && (slic_file->length > slic_size</span><br><span> || slic_file->length < sizeof(acpi_header_t)</span><br><span>diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c</span><br><span>index ec7e733..08bab31 100644</span><br><span>--- a/src/cpu/amd/microcode/microcode.c</span><br><span>+++ b/src/cpu/amd/microcode/microcode.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <cbfs.h></span><br><span> #include <arch/io.h></span><br><span> #include <smp/spinlock.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define UCODE_DEBUG(fmt, args...) \</span><br><span> do { printk(BIOS_DEBUG, "[microcode] "fmt, ##args); } while (0)</span><br><span>@@ -203,9 +204,9 @@</span><br><span> spin_lock(romstage_microcode_cbfs_lock());</span><br><span> #endif</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ucode = cbfs_boot_map_with_leak(microcode_cbfs_file[i],</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MICROCODE, &ucode_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ ucode = blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, microcode_cbfs_file[i],</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_MICROCODE, &ucode_len);</span><br><span> if (!ucode) {</span><br><span> UCODE_DEBUG("microcode file not found. Skipping updates.\n");</span><br><span> #ifdef __PRE_RAM__</span><br><span>diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c</span><br><span>index 59c3b8a..7deac06 100644</span><br><span>--- a/src/cpu/intel/microcode/microcode.c</span><br><span>+++ b/src/cpu/intel/microcode/microcode.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #if !defined(__ROMCC__)</span><br><span> #include <cbfs.h></span><br><span> #include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> #else</span><br><span> #include <arch/cbfs.h></span><br><span> #endif</span><br><span>@@ -131,9 +132,8 @@</span><br><span> ucode_updates = CBFS_SUBHEADER(microcode_file);</span><br><span> microcode_len = ntohl(microcode_file->len);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- ucode_updates = cbfs_boot_map_with_leak(MICROCODE_CBFS_FILE,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MICROCODE,</span><br><span style="color: hsl(0, 100%, 40%);">- µcode_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ ucode_updates =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_MICROCODE, µcode_len);</span><br><span> if (ucode_updates == NULL)</span><br><span> return NULL;</span><br><span> #endif</span><br><span>diff --git a/src/cpu/via/nano/update_ucode.c b/src/cpu/via/nano/update_ucode.c</span><br><span>index 9ff66e7..cde6239 100644</span><br><span>--- a/src/cpu/via/nano/update_ucode.c</span><br><span>+++ b/src/cpu/via/nano/update_ucode.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <cpu/cpu.h></span><br><span> #include <arch/cpu.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static ucode_update_status nano_apply_ucode(const nano_ucode_header *ucode)</span><br><span> {</span><br><span>@@ -107,8 +108,7 @@</span><br><span> u32 *ucode_data;</span><br><span> size_t ucode_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ucode_data = cbfs_boot_map_with_leak("cpu_microcode_blob.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MICROCODE, &ucode_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ ucode_data = blob_read_map(BLOB_DATA_MICROCODE, &ucode_len);</span><br><span> /* Oops, did you forget to include the microcode ? */</span><br><span> if (ucode_data == NULL) {</span><br><span> printk(BIOS_ALERT, "WARNING: No microcode file found in CBFS. "</span><br><span>diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c</span><br><span>index d9fac36..80e9fe0 100644</span><br><span>--- a/src/device/oprom/realmode/x86.c</span><br><span>+++ b/src/device/oprom/realmode/x86.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <pc80/i8254.h></span><br><span> #include <string.h></span><br><span> #include <vbe.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* we use x86emu's register file representation */</span><br><span> #include <x86emu/regs.h></span><br><span>@@ -270,9 +271,8 @@</span><br><span> vbe_set_mode(&mode_info);</span><br><span> #if IS_ENABLED(CONFIG_BOOTSPLASH)</span><br><span> struct jpeg_decdata *decdata;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char *jpeg = cbfs_boot_map_with_leak("bootsplash.jpg",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_BOOTSPLASH,</span><br><span style="color: hsl(0, 100%, 40%);">- NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char *jpeg =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_BOOTSPLASH, NULL);</span><br><span> if (!jpeg) {</span><br><span> printk(BIOS_DEBUG, "VBE: No bootsplash found.\n");</span><br><span> return;</span><br><span>diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c</span><br><span>index 876df23..f51b903 100644</span><br><span>--- a/src/device/oprom/yabel/vbe.c</span><br><span>+++ b/src/device/oprom/yabel/vbe.c</span><br><span>@@ -58,6 +58,7 @@</span><br><span> #include "../../src/lib/jpeg.h"</span><br><span> </span><br><span> #include <vbe.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> // pointer to VBEInfoBuffer, set by vbe_prepare</span><br><span> u8 *vbe_info_buffer = 0;</span><br><span>@@ -745,9 +746,8 @@</span><br><span> * cares. */</span><br><span> // int imagesize = 1024*768*2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char *jpeg = cbfs_boot_map_with_leak("bootsplash.jpg",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_BOOTSPLASH,</span><br><span style="color: hsl(0, 100%, 40%);">- NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char *jpeg =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_BOOTSPLASH, NULL);</span><br><span> if (!jpeg) {</span><br><span> DEBUG_PRINTF_VBE("Could not find bootsplash.jpg\n");</span><br><span> return;</span><br><span>diff --git a/src/drivers/amd/agesa/def_callouts.c b/src/drivers/amd/agesa/def_callouts.c</span><br><span>index 21530a1..2cc0828 100644</span><br><span>--- a/src/drivers/amd/agesa/def_callouts.c</span><br><span>+++ b/src/drivers/amd/agesa/def_callouts.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <northbridge/amd/agesa/state_machine.h></span><br><span> #include <northbridge/amd/agesa/BiosCallOuts.h></span><br><span> #include <northbridge/amd/agesa/dimmSpd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI)</span><br><span> #if IS_ENABLED(CONFIG_ARCH_ROMSTAGE_X86_64) || \</span><br><span>@@ -149,9 +150,9 @@</span><br><span> AGESA_STATUS agesa_GfxGetVbiosImage(UINT32 Func, UINTN FchData, VOID *ConfigPrt)</span><br><span> {</span><br><span> GFX_VBIOS_IMAGE_INFO *pVbiosImageInfo = (GFX_VBIOS_IMAGE_INFO *)ConfigPrt;</span><br><span style="color: hsl(0, 100%, 40%);">- pVbiosImageInfo->ImagePtr = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- "pci"CONFIG_VGA_BIOS_ID".rom",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_OPTIONROM, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ pVbiosImageInfo->ImagePtr = blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "pci" CONFIG_VGA_BIOS_ID ".rom",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_OPTIONROM, NULL);</span><br><span> /* printk(BIOS_DEBUG, "IMGptr=%x\n", pVbiosImageInfo->ImagePtr); */</span><br><span> return pVbiosImageInfo->ImagePtr == NULL ? AGESA_WARNING : AGESA_SUCCESS;</span><br><span> }</span><br><span>diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c</span><br><span>index fdd2e6e..8332374 100644</span><br><span>--- a/src/drivers/amd/agesa/state_machine.c</span><br><span>+++ b/src/drivers/amd/agesa/state_machine.c</span><br><span>@@ -27,6 +27,8 @@</span><br><span> #include <northbridge/amd/agesa/BiosCallOuts.h></span><br><span> #include "amdlib.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "AMD.h"</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CPU_AMD_AGESA_OPENSOURCE)</span><br><span>@@ -45,8 +47,7 @@</span><br><span> const void *agesa, *image;</span><br><span> size_t file_size;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &file_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ agesa = blob_read_map(BLOB_CODE_AMD_AGESA, &file_size);</span><br><span> if (agesa == NULL)</span><br><span> return;</span><br><span> </span><br><span>diff --git a/src/drivers/intel/fsp1_0/fastboot_cache.c b/src/drivers/intel/fsp1_0/fastboot_cache.c</span><br><span>index 906b356..928bbdd 100644</span><br><span>--- a/src/drivers/intel/fsp1_0/fastboot_cache.c</span><br><span>+++ b/src/drivers/intel/fsp1_0/fastboot_cache.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <spi_flash.h></span><br><span> #include <lib.h> // hexdump</span><br><span> #include "fsp_util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* convert a pointer to flash area into the offset inside the flash */</span><br><span> static inline u32 to_flash_offset(void *p) {</span><br><span>@@ -58,18 +59,12 @@</span><br><span> size_t region_size;</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_MRC_CACHE_FMAP)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RW_MRC_CACHE", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- *mrc_region_ptr = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- return region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- *mrc_region_ptr = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ *mrc_region_ptr = blob_read_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ BLOB_DATA_MRC_CACHE_RW_REGION, ®ion_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ return region_size;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- *mrc_region_ptr = cbfs_boot_map_with_leak("mrc.cache",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MRC_CACHE,</span><br><span style="color: hsl(0, 100%, 40%);">- ®ion_size);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ *mrc_region_ptr =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_MRC_CACHE, ®ion_size);</span><br><span> return region_size;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/drivers/intel/fsp1_1/vbt.c b/src/drivers/intel/fsp1_1/vbt.c</span><br><span>index 92a4c91..57f4191 100644</span><br><span>--- a/src/drivers/intel/fsp1_1/vbt.c</span><br><span>+++ b/src/drivers/intel/fsp1_1/vbt.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <fsp/gop.h></span><br><span> #include <fsp/ramstage.h></span><br><span> #include <fsp/util.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* Reading VBT table from flash */</span><br><span> const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len)</span><br><span>@@ -31,7 +32,7 @@</span><br><span> } vbt;</span><br><span> </span><br><span> /* Locate the vbt file in cbfs */</span><br><span style="color: hsl(0, 100%, 40%);">- vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, &vbt_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ vbt.data = blob_read_map(BLOB_DATA_VGA_VBT, &vbt_size);</span><br><span> if (!vbt.data) {</span><br><span> printk(BIOS_INFO,</span><br><span> "FSP_INFO: VBT data file (vbt.bin) not found in CBFS");</span><br><span>diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c</span><br><span>index 3dafa00..3b71156 100644</span><br><span>--- a/src/drivers/intel/fsp2_0/memory_init.c</span><br><span>+++ b/src/drivers/intel/fsp2_0/memory_init.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <security/vboot/vboot_common.h></span><br><span> #include <vb2_api.h></span><br><span> #include <fsp/memory_init.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> __attribute__((weak)) void mrc_cache_update_hash(const uint8_t *data,</span><br><span> size_t size)</span><br><span>@@ -359,21 +360,15 @@</span><br><span> {</span><br><span> struct fsp_header hdr;</span><br><span> enum cb_err status;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file_desc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device file_data;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *name = CONFIG_FSP_M_CBFS;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device fspm;</span><br><span> struct memranges memmap;</span><br><span> struct range_entry freeranges[2];</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_ELOG_BOOT_COUNT) && !s3wake)</span><br><span> boot_count_increment();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file_desc, name, NULL)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_CRIT, "Could not locate %s in CBFS\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_CODE_INTEL_FSP_M, &fspm))</span><br><span> die("FSPM not available!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&file_data, &file_desc);</span><br><span> </span><br><span> /* Build up memory map of romstage address space including CAR. */</span><br><span> memranges_init_empty(&memmap, &freeranges[0], ARRAY_SIZE(freeranges));</span><br><span>@@ -382,9 +377,9 @@</span><br><span> memranges_insert(&memmap, (uintptr_t)_program, _program_size, 0);</span><br><span> </span><br><span> if (!IS_ENABLED(CONFIG_FSP_M_XIP))</span><br><span style="color: hsl(0, 100%, 40%);">- status = load_fspm_mem(&hdr, &file_data, &memmap);</span><br><span style="color: hsl(120, 100%, 40%);">+ status = load_fspm_mem(&hdr, &fspm, &memmap);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- status = load_fspm_xip(&hdr, &file_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ status = load_fspm_xip(&hdr, &fspm);</span><br><span> </span><br><span> if (status != CB_SUCCESS)</span><br><span> die("Loading FSPM failed!\n");</span><br><span>diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c</span><br><span>index bda88d1..2ab037e 100644</span><br><span>--- a/src/drivers/intel/fsp2_0/silicon_init.c</span><br><span>+++ b/src/drivers/intel/fsp2_0/silicon_init.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <stage_cache.h></span><br><span> #include <string.h></span><br><span> #include <timestamp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> struct fsp_header fsps_hdr;</span><br><span> </span><br><span>@@ -64,7 +65,6 @@</span><br><span> void fsps_load(bool s3wake)</span><br><span> {</span><br><span> struct fsp_header *hdr = &fsps_hdr;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file_desc;</span><br><span> struct region_device rdev;</span><br><span> const char *name = CONFIG_FSP_S_CBFS;</span><br><span> void *dest;</span><br><span>@@ -84,13 +84,11 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file_desc, name, NULL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_CODE_INTEL_FSP_S, &rdev) < 0) {</span><br><span> printk(BIOS_ERR, "Could not locate %s in CBFS\n", name);</span><br><span> die("FSPS not available!\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&rdev, &file_desc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Load and relocate into CBMEM. */</span><br><span> size = region_device_sz(&rdev);</span><br><span> dest = cbmem_add(CBMEM_ID_REFCODE, size);</span><br><span>diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c</span><br><span>index 6b3a999..9773aff 100644</span><br><span>--- a/src/drivers/intel/fsp2_0/temp_ram_exit.c</span><br><span>+++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c</span><br><span>@@ -18,24 +18,19 @@</span><br><span> #include <string.h></span><br><span> #include <timestamp.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void fsp_temp_ram_exit(void)</span><br><span> {</span><br><span> struct fsp_header hdr;</span><br><span> uint32_t status;</span><br><span> temp_ram_exit_fn temp_ram_exit;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file_desc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device file_data;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *name = CONFIG_FSP_M_CBFS;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device fsps;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file_desc, name, NULL)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_CRIT, "Could not locate %s in CBFS\n", name);</span><br><span style="color: hsl(0, 100%, 40%);">- die("FSPM not available for CAR Exit!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_CODE_INTEL_FSP_S, &fsps))</span><br><span style="color: hsl(120, 100%, 40%);">+ die("FSPS not available!\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&file_data, &file_desc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fsp_validate_component(&hdr, &file_data) != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fsp_validate_component(&hdr, &fsps) != CB_SUCCESS)</span><br><span> die("Invalid FSPM header!\n");</span><br><span> </span><br><span> temp_ram_exit = (void *)(hdr.image_base + hdr.temp_ram_exit_entry);</span><br><span>diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c</span><br><span>index 4c17017..b9f2e70 100644</span><br><span>--- a/src/drivers/net/r8168.c</span><br><span>+++ b/src/drivers/net/r8168.c</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <device/pci_def.h></span><br><span> #include <delay.h></span><br><span> #include <fmap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> #include "chip.h"</span><br><span> </span><br><span> #define NIC_TIMEOUT 1000</span><br><span>@@ -93,23 +94,18 @@</span><br><span> </span><br><span> static enum cb_err fetch_mac_string_vpd(u8 *macstrbuf)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span> void *search_address;</span><br><span> size_t search_length;</span><br><span> size_t offset;</span><br><span> char key[] = "ethernet_mac";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_VPD_RO_REGION, &search_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (search_address == NULL) {</span><br><span> printk(BIOS_ERR, "Error: Couldn't find RO_VPD region.");</span><br><span> return CB_ERR;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_address == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "LAN: VPD not found.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return CB_ERR;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span> offset = search(key, search_address, strlen(key),</span><br><span> search_length);</span><br><span> if (offset == search_length) {</span><br><span>@@ -132,17 +128,19 @@</span><br><span> </span><br><span> static enum cb_err fetch_mac_string_cbfs(u8 *macstrbuf)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf fh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t matchraw = CBFS_TYPE_RAW;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device rdev;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!cbfs_boot_locate(&fh, "rt8168-macaddress", &matchraw)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* check the cbfs for the mac address */</span><br><span style="color: hsl(0, 100%, 40%);">- if (rdev_readat(&fh.data, macstrbuf, 0, MACLEN) != MACLEN) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR, "r8168: Error reading MAC from CBFS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_arbitrary_region_device(COREBOOT_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rt8168-macaddress",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, &rdev) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rdev_readat(&rdev, macstrbuf, 0, MACLEN) != MACLEN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "r8168: Error reading MAC from CBFS\n");</span><br><span> return CB_ERR;</span><br><span> }</span><br><span> return CB_SUCCESS;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CB_ERR;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c</span><br><span>index 928b403..e9eb957 100644</span><br><span>--- a/src/drivers/pc80/rtc/mc146818rtc.c</span><br><span>+++ b/src/drivers/pc80/rtc/mc146818rtc.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <cbfs.h></span><br><span> #include <security/vboot/vbnv.h></span><br><span> #include <security/vboot/vbnv_layout.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* There's no way around this include guard. option_table.h is autogenerated */</span><br><span> #if IS_ENABLED(CONFIG_USE_OPTION_TABLE)</span><br><span>@@ -256,8 +257,7 @@</span><br><span> namelen = strnlen(name, CMOS_MAX_NAME_LENGTH);</span><br><span> </span><br><span> /* find the requested entry record */</span><br><span style="color: hsl(0, 100%, 40%);">- ct = cbfs_boot_map_with_leak("cmos_layout.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_CMOS_LAYOUT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ct = blob_read_map(BLOB_DATA_NVRAM_CMOS_LAYOUT, NULL);</span><br><span> if (!ct) {</span><br><span> printk(BIOS_ERR, "RTC: cmos_layout.bin could not be found. "</span><br><span> "Options are disabled\n");</span><br><span>@@ -359,8 +359,7 @@</span><br><span> namelen = strnlen(name, CMOS_MAX_NAME_LENGTH);</span><br><span> </span><br><span> /* find the requested entry record */</span><br><span style="color: hsl(0, 100%, 40%);">- ct = cbfs_boot_map_with_leak("cmos_layout.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_CMOS_LAYOUT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ct = blob_read_map(BLOB_DATA_NVRAM_CMOS_LAYOUT, NULL);</span><br><span> if (!ct) {</span><br><span> printk(BIOS_ERR, "cmos_layout.bin could not be found. "</span><br><span> "Options are disabled\n");</span><br><span>diff --git a/src/drivers/pc80/rtc/mc146818rtc_boot.c b/src/drivers/pc80/rtc/mc146818rtc_boot.c</span><br><span>index c5cd86c..03494d9 100644</span><br><span>--- a/src/drivers/pc80/rtc/mc146818rtc_boot.c</span><br><span>+++ b/src/drivers/pc80/rtc/mc146818rtc_boot.c</span><br><span>@@ -16,6 +16,7 @@</span><br><span> #include <arch/cbfs.h></span><br><span> #else</span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> #endif</span><br><span> #include <pc80/mc146818rtc.h></span><br><span> #if IS_ENABLED(CONFIG_USE_OPTION_TABLE)</span><br><span>@@ -63,8 +64,8 @@</span><br><span> #ifdef __ROMCC__</span><br><span> walkcbfs("cmos.default");</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_boot_map_with_leak("cmos.default",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_CMOS_DEFAULT, &length);</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_CMOS_DEFAULT,</span><br><span style="color: hsl(120, 100%, 40%);">+ &length);</span><br><span> #endif</span><br><span> if (cmos_default) {</span><br><span> int i;</span><br><span>diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c</span><br><span>index 41b79a6..7f20a7f 100644</span><br><span>--- a/src/drivers/siemens/nc_fpga/nc_fpga.c</span><br><span>+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c</span><br><span>@@ -118,7 +118,7 @@</span><br><span> set the FW_DONE bit before jumping to payload. */</span><br><span> nc_fpga_bar0 = bar0_ptr;</span><br><span> /* Open hwinfo block. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return;</span><br><span> /* Set up FAN controller and temperature monitor according to */</span><br><span> /* capability bits. */</span><br><span>diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c</span><br><span>index aeaff28..124ecc2 100644</span><br><span>--- a/src/lib/coreboot_table.c</span><br><span>+++ b/src/lib/coreboot_table.c</span><br><span>@@ -47,6 +47,7 @@</span><br><span> #include <cpu/x86/mtrr.h></span><br><span> #endif</span><br><span> #include <commonlib/helpers.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static struct lb_header *lb_table_init(unsigned long addr)</span><br><span> {</span><br><span>@@ -507,8 +508,7 @@</span><br><span> #if IS_ENABLED(CONFIG_USE_OPTION_TABLE)</span><br><span> {</span><br><span> struct cmos_option_table *option_table =</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_boot_map_with_leak("cmos_layout.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_CMOS_LAYOUT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_CMOS_LAYOUT, NULL);</span><br><span> if (option_table) {</span><br><span> struct lb_record *rec_dest = lb_new_record(head);</span><br><span> /* Copy the option config table, it's already a</span><br><span>diff --git a/src/lib/nhlt.c b/src/lib/nhlt.c</span><br><span>index da94415..1595620 100644</span><br><span>--- a/src/lib/nhlt.c</span><br><span>+++ b/src/lib/nhlt.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <nhlt.h></span><br><span> #include <stdlib.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define NHLT_RID 1</span><br><span> #define NHLT_SSID 1</span><br><span>@@ -161,9 +162,8 @@</span><br><span> </span><br><span> for (i = 0; i < num_formats; i++) {</span><br><span> struct nhlt_format *fmt;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file;</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device settings;</span><br><span> void *settings_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t settings_data_size;</span><br><span> const struct nhlt_format_config *cfg = &formats[i];</span><br><span> </span><br><span> fmt = nhlt_add_format(endp, cfg->num_channels,</span><br><span>@@ -178,24 +178,17 @@</span><br><span> if (cfg->settings_file == NULL)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Find the settings file in CBFS and place it in format. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file, cfg->settings_file, NULL))</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&settings, &file);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- settings_data = rdev_mmap_full(&settings);</span><br><span style="color: hsl(120, 100%, 40%);">+ settings_data =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_arbitrary_map(COREBOOT_REGION, cfg->settings_file,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, &settings_data_size);</span><br><span> </span><br><span> if (settings_data == NULL)</span><br><span> return -1;</span><br><span> </span><br><span> if (nhlt_format_append_config(fmt, settings_data,</span><br><span style="color: hsl(0, 100%, 40%);">- region_device_sz(&settings))) {</span><br><span style="color: hsl(0, 100%, 40%);">- rdev_munmap(&settings, settings_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ settings_data_size)) {</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rdev_munmap(&settings, settings_data);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/lib/spd_bin.c b/src/lib/spd_bin.c</span><br><span>index 79bda1e..994058a 100644</span><br><span>--- a/src/lib/spd_bin.c</span><br><span>+++ b/src/lib/spd_bin.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <string.h></span><br><span> #include <device/early_smbus.h></span><br><span> #include <device/dram/ddr3.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static u8 spd_data[CONFIG_DIMM_MAX * CONFIG_DIMM_SPD_SIZE] CAR_GLOBAL;</span><br><span> </span><br><span>@@ -114,13 +115,11 @@</span><br><span> </span><br><span> int get_spd_cbfs_rdev(struct region_device *spd_rdev, u8 spd_index)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf fh;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t cbfs_type = CBFS_TYPE_SPD;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&fh, "spd.bin", &cbfs_type) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_arbitrary_region_device(COREBOOT_REGION, "spd.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_SPD, spd_rdev) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Can't locate spd.bin.\n");</span><br><span> return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(spd_rdev, &fh);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return rdev_chain(spd_rdev, spd_rdev, spd_index * CONFIG_DIMM_SPD_SIZE,</span><br><span> CONFIG_DIMM_SPD_SIZE);</span><br><span> }</span><br><span>@@ -188,8 +187,7 @@</span><br><span> size_t spd_file_len = 0;</span><br><span> size_t min_len = (idx + 1) * CONFIG_DIMM_SPD_SIZE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> printk(BIOS_EMERG, "file [spd.bin] not found in CBFS");</span><br><span> if (spd_file_len < min_len)</span><br><span>diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>index 41e12eb..c17774f 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include "northbridge/amd/amdk8/acpi.h"</span><br><span> #include "mb_sysconf.h"</span><br><span> #include "mainboard.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> unsigned long acpi_fill_madt(unsigned long current)</span><br><span> {</span><br><span>@@ -173,9 +174,8 @@</span><br><span> default:</span><br><span> continue;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- p = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- file_name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &p_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ p = blob_read_arbitrary_map(COREBOOT_REGION, file_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, &p_size);</span><br><span> if (!p || p_size < sizeof(acpi_header_t))</span><br><span> continue;</span><br><span> </span><br><span>diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>index 6911c36..f391f07 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <device/pci_ids.h></span><br><span> #include <cpu/amd/amdfam10_sysconf.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "mb_sysconf.h"</span><br><span> #include "mainboard.h"</span><br><span>@@ -162,9 +163,8 @@</span><br><span> /* HTX no io apic */</span><br><span> file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- p = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- file_name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &p_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ p = blob_read_arbitrary_map(COREBOOT_REGION, file_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, &p_size);</span><br><span> if (!p || p_size < sizeof(acpi_header_t))</span><br><span> continue;</span><br><span> memcpy(ssdtx, p, sizeof(acpi_header_t));</span><br><span>diff --git a/src/mainboard/apple/macbookair4_2/early_southbridge.c b/src/mainboard/apple/macbookair4_2/early_southbridge.c</span><br><span>index 3388322..9be0f4e 100644</span><br><span>--- a/src/mainboard/apple/macbookair4_2/early_southbridge.c</span><br><span>+++ b/src/mainboard/apple/macbookair4_2/early_southbridge.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <arch/cpu.h></span><br><span> #include <cpu/x86/msr.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void pch_enable_lpc(void)</span><br><span> {</span><br><span>@@ -76,8 +77,7 @@</span><br><span> {</span><br><span> void *spd_file;</span><br><span> size_t spd_file_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (spd_file && spd_file_len >= 1024) {</span><br><span> int i;</span><br><span> for (i = 0; i < 4; i++)</span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c</span><br><span>index 12c876e..1424b49 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <mainboard/google/auron/ec.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/spd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void mainboard_print_spd_info(uint8_t spd[])</span><br><span> {</span><br><span>@@ -102,7 +103,7 @@</span><br><span> spd_bits[1], spd_gpio[1],</span><br><span> spd_bits[0], spd_gpio[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", 0xab, &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c</span><br><span>index 12c876e..1424b49 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <mainboard/google/auron/ec.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/spd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void mainboard_print_spd_info(uint8_t spd[])</span><br><span> {</span><br><span>@@ -102,7 +103,7 @@</span><br><span> spd_bits[1], spd_gpio[1],</span><br><span> spd_bits[0], spd_gpio[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", 0xab, &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/auron/variants/gandof/spd/spd.c b/src/mainboard/google/auron/variants/gandof/spd/spd.c</span><br><span>index 12c876e..1424b49 100644</span><br><span>--- a/src/mainboard/google/auron/variants/gandof/spd/spd.c</span><br><span>+++ b/src/mainboard/google/auron/variants/gandof/spd/spd.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <mainboard/google/auron/ec.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/spd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void mainboard_print_spd_info(uint8_t spd[])</span><br><span> {</span><br><span>@@ -102,7 +103,7 @@</span><br><span> spd_bits[1], spd_gpio[1],</span><br><span> spd_bits[0], spd_gpio[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", 0xab, &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/auron/variants/lulu/spd/spd.c b/src/mainboard/google/auron/variants/lulu/spd/spd.c</span><br><span>index ac99f5c..ca1fd53 100644</span><br><span>--- a/src/mainboard/google/auron/variants/lulu/spd/spd.c</span><br><span>+++ b/src/mainboard/google/auron/variants/lulu/spd/spd.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <mainboard/google/auron/ec.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/spd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void mainboard_print_spd_info(uint8_t spd[])</span><br><span> {</span><br><span>@@ -107,7 +108,7 @@</span><br><span> spd_bits[1], spd_gpio[1],</span><br><span> spd_bits[0], spd_gpio[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", 0xab, &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/auron/variants/samus/spd/spd.c b/src/mainboard/google/auron/variants/samus/spd/spd.c</span><br><span>index dd632f3..f4f9574 100644</span><br><span>--- a/src/mainboard/google/auron/variants/samus/spd/spd.c</span><br><span>+++ b/src/mainboard/google/auron/variants/samus/spd/spd.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <mainboard/google/auron/ec.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/spd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void mainboard_print_spd_info(uint8_t spd[])</span><br><span> {</span><br><span>@@ -102,7 +103,7 @@</span><br><span> spd_bits[3], spd_gpio[3], spd_bits[2], spd_gpio[2],</span><br><span> spd_bits[1], spd_gpio[1], spd_bits[0], spd_gpio[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", 0xab, &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/beltino/lan.c b/src/mainboard/google/beltino/lan.c</span><br><span>index 140c814..4dbac68 100644</span><br><span>--- a/src/mainboard/google/beltino/lan.c</span><br><span>+++ b/src/mainboard/google/beltino/lan.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <fmap.h></span><br><span> #include <southbridge/intel/bd82x6x/pch.h></span><br><span> #include "onboard.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static unsigned int search(char *p, u8 *a, unsigned int lengthp,</span><br><span> unsigned int lengtha)</span><br><span>@@ -115,18 +116,11 @@</span><br><span> u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_address != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = blob_read_map(BLOB_DATA_NVRAM_VPD_RO_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ &search_length);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = cbfs_boot_map_with_leak("vpd.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &search_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_VPD, &search_length);</span><br><span> }</span><br><span> </span><br><span> if (search_address == NULL)</span><br><span>diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c</span><br><span>index a100981..2cf05b7 100644</span><br><span>--- a/src/mainboard/google/butterfly/mainboard.c</span><br><span>+++ b/src/mainboard/google/butterfly/mainboard.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <ec/quanta/ene_kb3940q/ec.h></span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static unsigned int search(char *p, char *a, unsigned int lengthp,</span><br><span> unsigned int lengtha)</span><br><span>@@ -187,28 +188,13 @@</span><br><span> size_t search_length = -1;</span><br><span> u16 io_base = 0;</span><br><span> struct device *ethernet_dev = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- void *vpd_file;</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vpd_file = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (vpd_file != NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = (uintptr_t)vpd_file;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = (uintptr_t)blob_read_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ BLOB_DATA_NVRAM_VPD_RO_REGION, &search_length);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vpd_file = cbfs_boot_map_with_leak("vpd.bin", CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &search_length);</span><br><span style="color: hsl(0, 100%, 40%);">- if (vpd_file) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = (unsigned long)vpd_file;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = (uintptr_t)blob_read_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ BLOB_DATA_NVRAM_VPD, &search_length);</span><br><span> }</span><br><span> </span><br><span> /* Initialize the Embedded Controller */</span><br><span>diff --git a/src/mainboard/google/chell/spd/spd.c b/src/mainboard/google/chell/spd/spd.c</span><br><span>index 251b6de..e10f753 100644</span><br><span>--- a/src/mainboard/google/chell/spd/spd.c</span><br><span>+++ b/src/mainboard/google/chell/spd/spd.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <soc/pei_data.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "../gpio.h"</span><br><span> #include "spd.h"</span><br><span>@@ -95,8 +96,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c</span><br><span>index a3db2ed..b61e92c 100644</span><br><span>--- a/src/mainboard/google/cyan/spd/spd.c</span><br><span>+++ b/src/mainboard/google/cyan/spd/spd.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <string.h></span><br><span> #include <spd_bin.h></span><br><span> #include "spd_util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> __attribute__ ((weak)) uint8_t get_ramid(void)</span><br><span> {</span><br><span>@@ -66,8 +67,7 @@</span><br><span> int dual_channel = 0;</span><br><span> </span><br><span> /* Find the SPD data in CBFS. */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/eve/spd/spd.c b/src/mainboard/google/eve/spd/spd.c</span><br><span>index 2f365a7..5dd52b8 100644</span><br><span>--- a/src/mainboard/google/eve/spd/spd.c</span><br><span>+++ b/src/mainboard/google/eve/spd/spd.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <soc/pei_data.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "../gpio.h"</span><br><span> #include "spd.h"</span><br><span>@@ -98,8 +99,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c</span><br><span>index 251b6de..e10f753 100644</span><br><span>--- a/src/mainboard/google/glados/spd/spd.c</span><br><span>+++ b/src/mainboard/google/glados/spd/spd.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <soc/pei_data.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "../gpio.h"</span><br><span> #include "spd.h"</span><br><span>@@ -95,8 +96,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c</span><br><span>index 59ed111..b3ed9d6 100644</span><br><span>--- a/src/mainboard/google/jecht/lan.c</span><br><span>+++ b/src/mainboard/google/jecht/lan.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <soc/pch.h></span><br><span> #include "onboard.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static unsigned int search(char *p, u8 *a, unsigned int lengthp,</span><br><span> unsigned int lengtha)</span><br><span>@@ -115,18 +116,11 @@</span><br><span> u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_address != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = blob_read_map(BLOB_DATA_NVRAM_VPD_RO_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ &search_length);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = cbfs_boot_map_with_leak("vpd.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &search_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_VPD, &search_length);</span><br><span> }</span><br><span> </span><br><span> if (search_address == NULL)</span><br><span>diff --git a/src/mainboard/google/lars/spd/spd.c b/src/mainboard/google/lars/spd/spd.c</span><br><span>index 106eb83..8f1837d 100644</span><br><span>--- a/src/mainboard/google/lars/spd/spd.c</span><br><span>+++ b/src/mainboard/google/lars/spd/spd.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <soc/pei_data.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "spd.h"</span><br><span> </span><br><span>@@ -86,8 +87,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c</span><br><span>index bf05be9..6a91dd7 100644</span><br><span>--- a/src/mainboard/google/link/romstage.c</span><br><span>+++ b/src/mainboard/google/link/romstage.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <cpu/x86/msr.h></span><br><span> #include <halt.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include <southbridge/intel/bd82x6x/chip.h></span><br><span> </span><br><span>@@ -122,8 +123,7 @@</span><br><span> int spd_index = get_gpios(gpio_vector);</span><br><span> </span><br><span> printk(BIOS_DEBUG, "spd index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/poppy/romstage.c b/src/mainboard/google/poppy/romstage.c</span><br><span>index 6bb4076..cf954b5 100644</span><br><span>--- a/src/mainboard/google/poppy/romstage.c</span><br><span>+++ b/src/mainboard/google/poppy/romstage.c</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include <console/console.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include <fsp/soc_binding.h></span><br><span> </span><br><span>@@ -122,8 +123,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c</span><br><span>index 25fe859..bea433c 100644</span><br><span>--- a/src/mainboard/google/rambi/romstage.c</span><br><span>+++ b/src/mainboard/google/rambi/romstage.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <soc/mrc_wrapper.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <variant/variant.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void *get_spd_pointer(char *spd_file_content, int total_spds, int *dual)</span><br><span> {</span><br><span>@@ -61,7 +62,7 @@</span><br><span> void *spd_content;</span><br><span> int dual_channel = 0;</span><br><span> void *spd_file;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t spd_fsize;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t spd_file_len;</span><br><span> </span><br><span> struct mrc_params mp = {</span><br><span> .mainboard = {</span><br><span>@@ -71,12 +72,11 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_fsize);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_content = get_spd_pointer(spd_file, spd_fsize / SPD_SIZE,</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_content = get_spd_pointer(spd_file, spd_file_len / SPD_SIZE,</span><br><span> &dual_channel);</span><br><span> mp.mainboard.dram_data[0] = spd_content;</span><br><span> if (dual_channel)</span><br><span>diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c</span><br><span>index 3d08ad7..2bdf693 100644</span><br><span>--- a/src/mainboard/google/rambi/variants/ninja/lan.c</span><br><span>+++ b/src/mainboard/google/rambi/variants/ninja/lan.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <fmap.h></span><br><span> #include <variant/onboard.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static unsigned int search(char *p, u8 *a, unsigned int lengthp,</span><br><span> unsigned int lengtha)</span><br><span>@@ -114,18 +115,11 @@</span><br><span> u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_address != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = blob_read_map(BLOB_DATA_NVRAM_VPD_RO_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ &search_length);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = cbfs_boot_map_with_leak("vpd.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &search_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_VPD, &search_length);</span><br><span> }</span><br><span> </span><br><span> if (search_address == NULL)</span><br><span>diff --git a/src/mainboard/google/rambi/variants/sumo/lan.c b/src/mainboard/google/rambi/variants/sumo/lan.c</span><br><span>index 07fe3d9..f30ca4a 100644</span><br><span>--- a/src/mainboard/google/rambi/variants/sumo/lan.c</span><br><span>+++ b/src/mainboard/google/rambi/variants/sumo/lan.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <fmap.h></span><br><span> #include <variant/onboard.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static unsigned int search(char *p, u8 *a, unsigned int lengthp,</span><br><span> unsigned int lengtha)</span><br><span>@@ -114,18 +115,11 @@</span><br><span> u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_address != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- search_length = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address = blob_read_map(BLOB_DATA_NVRAM_VPD_RO_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ &search_length);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- search_address = cbfs_boot_map_with_leak("vpd.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &search_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ search_address =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_NVRAM_VPD, &search_length);</span><br><span> }</span><br><span> </span><br><span> if (search_address == NULL)</span><br><span>diff --git a/src/mainboard/google/slippy/variants/falco/romstage.c b/src/mainboard/google/slippy/variants/falco/romstage.c</span><br><span>index 81174db..72c6ee8 100644</span><br><span>--- a/src/mainboard/google/slippy/variants/falco/romstage.c</span><br><span>+++ b/src/mainboard/google/slippy/variants/falco/romstage.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <southbridge/intel/lynxpoint/lp_gpio.h></span><br><span> #include <variant/gpio.h></span><br><span> #include "../../variant.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> const struct rcba_config_instruction rcba_config[] = {</span><br><span> </span><br><span>@@ -77,8 +78,7 @@</span><br><span> size_t spd_len = sizeof(peid->spd_data[0]);</span><br><span> </span><br><span> printk(BIOS_DEBUG, "SPD index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c</span><br><span>index 132f586..2b57b33 100644</span><br><span>--- a/src/mainboard/google/slippy/variants/leon/romstage.c</span><br><span>+++ b/src/mainboard/google/slippy/variants/leon/romstage.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <southbridge/intel/lynxpoint/lp_gpio.h></span><br><span> #include <variant/gpio.h></span><br><span> #include "../../variant.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> const struct rcba_config_instruction rcba_config[] = {</span><br><span> </span><br><span>@@ -77,8 +78,7 @@</span><br><span> size_t spd_len = sizeof(peid->spd_data[0]);</span><br><span> </span><br><span> printk(BIOS_DEBUG, "SPD index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c</span><br><span>index bf21cbc..607a5be 100644</span><br><span>--- a/src/mainboard/google/slippy/variants/peppy/romstage.c</span><br><span>+++ b/src/mainboard/google/slippy/variants/peppy/romstage.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <variant/gpio.h></span><br><span> #include "../../onboard.h"</span><br><span> #include "../../variant.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> const struct rcba_config_instruction rcba_config[] = {</span><br><span> </span><br><span>@@ -80,8 +81,7 @@</span><br><span> size_t spd_len = sizeof(peid->spd_data[0]);</span><br><span> </span><br><span> printk(BIOS_DEBUG, "SPD index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c</span><br><span>index 5b6b254..c5f79c1 100644</span><br><span>--- a/src/mainboard/google/slippy/variants/wolf/romstage.c</span><br><span>+++ b/src/mainboard/google/slippy/variants/wolf/romstage.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <southbridge/intel/lynxpoint/lp_gpio.h></span><br><span> #include <variant/gpio.h></span><br><span> #include "../../variant.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> const struct rcba_config_instruction rcba_config[] = {</span><br><span> </span><br><span>@@ -79,8 +80,7 @@</span><br><span> size_t spd_len = sizeof(peid->spd_data[0]);</span><br><span> </span><br><span> printk(BIOS_DEBUG, "SPD index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/google/urara/boardid.c b/src/mainboard/google/urara/boardid.c</span><br><span>index 9a6b64e..afba754 100644</span><br><span>--- a/src/mainboard/google/urara/boardid.c</span><br><span>+++ b/src/mainboard/google/urara/boardid.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> #include <boardid.h></span><br><span> #include <cbfs.h></span><br><span> #include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "mainboard/google/urara/urara_boardid.h"</span><br><span> </span><br><span>@@ -48,8 +49,8 @@</span><br><span> int i;</span><br><span> size_t length;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- file_contents = cbfs_boot_map_with_leak(board_id_file_name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &length);</span><br><span style="color: hsl(120, 100%, 40%);">+ file_contents = blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, board_id_file_name, CBFS_TYPE_RAW, &length);</span><br><span> </span><br><span> if (!file_contents) {</span><br><span> printk(BIOS_WARNING,</span><br><span>diff --git a/src/mainboard/hp/revolve_810_g1/romstage.c b/src/mainboard/hp/revolve_810_g1/romstage.c</span><br><span>index dbf786e..689ad06 100644</span><br><span>--- a/src/mainboard/hp/revolve_810_g1/romstage.c</span><br><span>+++ b/src/mainboard/hp/revolve_810_g1/romstage.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <northbridge/intel/sandybridge/raminit_native.h></span><br><span> #include <southbridge/intel/bd82x6x/pch.h></span><br><span> #include <ec/hp/kbc1126/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void pch_enable_lpc(void)</span><br><span> {</span><br><span>@@ -79,8 +80,7 @@</span><br><span> {</span><br><span> /* C1S0 is a soldered RAM with no real SPD. Use stored SPD. */</span><br><span> size_t spd_file_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- void *spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> </span><br><span> if (!spd_file || spd_file_len < sizeof(spd_raw_data))</span><br><span> die("SPD data for C1S0 not found.");</span><br><span>diff --git a/src/mainboard/intel/harcuvar/spd/spd.c b/src/mainboard/intel/harcuvar/spd/spd.c</span><br><span>index 37f4424..987f694 100644</span><br><span>--- a/src/mainboard/intel/harcuvar/spd/spd.c</span><br><span>+++ b/src/mainboard/intel/harcuvar/spd/spd.c</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include <cbfs.h></span><br><span> #include <console/console.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "spd.h"</span><br><span> </span><br><span>@@ -32,8 +33,7 @@</span><br><span> </span><br><span> spd_index = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/intel/kunimitsu/spd/spd_util.c b/src/mainboard/intel/kunimitsu/spd/spd_util.c</span><br><span>index a17b519..856ac3e 100644</span><br><span>--- a/src/mainboard/intel/kunimitsu/spd/spd_util.c</span><br><span>+++ b/src/mainboard/intel/kunimitsu/spd/spd_util.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <soc/pei_wrapper.h></span><br><span> #include "boardid.h"</span><br><span> #include "spd.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void mainboard_fill_dq_map_data(void *dq_map_ptr)</span><br><span> {</span><br><span>@@ -83,8 +84,7 @@</span><br><span> printk(BIOS_INFO, "SPD index %d\n", spd_index);</span><br><span> </span><br><span> /* Load SPD data from CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>index e9818b3..e48cbdd 100644</span><br><span>--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include "mb_sysconf.h"</span><br><span> #include "mainboard.h"</span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> unsigned long acpi_fill_madt(unsigned long current)</span><br><span> {</span><br><span>@@ -170,9 +171,8 @@</span><br><span> file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- p = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- file_name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &p_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ p = blob_read_arbitrary_map(COREBOOT_REGION, file_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, &p_size);</span><br><span> if (!p || p_size < sizeof(acpi_header_t))</span><br><span> continue;</span><br><span> </span><br><span>diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/romstage.c</span><br><span>index 43a3d52..b26d1ca 100644</span><br><span>--- a/src/mainboard/lenovo/s230u/romstage.c</span><br><span>+++ b/src/mainboard/lenovo/s230u/romstage.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include <arch/cpu.h></span><br><span> #include <cpu/x86/msr.h></span><br><span> #include "ec.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define SPD_LEN 256</span><br><span> </span><br><span>@@ -115,8 +116,7 @@</span><br><span> spd_index, mainboard_spd_names[spd_index]);</span><br><span> </span><br><span> /* C0S0 is a soldered RAM with no real SPD. Use stored SPD. */</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> </span><br><span> if (!spd_file || spd_file_len < SPD_LEN * spd_index + SPD_LEN)</span><br><span> die("SPD data not found.");</span><br><span>diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>index 5f7b82e..4ea739a 100644</span><br><span>--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <arch/cpu.h></span><br><span> #include <cpu/x86/msr.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void pch_enable_lpc(void)</span><br><span> {</span><br><span>@@ -75,8 +76,7 @@</span><br><span> size_t spd_file_len;</span><br><span> </span><br><span> printk(BIOS_DEBUG, "spd index %d\n", spd_index);</span><br><span style="color: hsl(0, 100%, 40%);">- spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_file = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_file)</span><br><span> die("SPD data not found.");</span><br><span> </span><br><span>diff --git a/src/mainboard/purism/librem_skl/mainboard.c b/src/mainboard/purism/librem_skl/mainboard.c</span><br><span>index 462b995..82cecba 100644</span><br><span>--- a/src/mainboard/purism/librem_skl/mainboard.c</span><br><span>+++ b/src/mainboard/purism/librem_skl/mainboard.c</span><br><span>@@ -16,24 +16,21 @@</span><br><span> #include <smbios.h></span><br><span> #include <string.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define MAX_SERIAL_LENGTH 0x100</span><br><span> </span><br><span> const char *smbios_mainboard_serial_number(void)</span><br><span> {</span><br><span> static char serial_number[MAX_SERIAL_LENGTH + 1] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device cbfs_region;</span><br><span> </span><br><span> if (serial_number[0] != 0)</span><br><span> return serial_number;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file, "serial_number", NULL) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device cbfs_region;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t serial_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&cbfs_region, &file);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- serial_len = region_device_sz(&cbfs_region);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_arbitrary_region_device(COREBOOT_REGION, "serial_number",</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, &cbfs_region) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t serial_len = region_device_sz(&cbfs_region);</span><br><span> if (serial_len <= MAX_SERIAL_LENGTH) {</span><br><span> if (rdev_readat(&cbfs_region, serial_number, 0,</span><br><span> serial_len) == serial_len) {</span><br><span>diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c</span><br><span>index d2231aa..1093b21 100644</span><br><span>--- a/src/mainboard/samsung/lumpy/romstage.c</span><br><span>+++ b/src/mainboard/samsung/lumpy/romstage.c</span><br><span>@@ -37,6 +37,7 @@</span><br><span> #include <cpu/x86/msr.h></span><br><span> #include <halt.h></span><br><span> #include "option_table.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> #if IS_ENABLED(CONFIG_DRIVERS_UART_8250IO)</span><br><span> #include <superio/smsc/lpc47n207/lpc47n207.h></span><br><span> #endif</span><br><span>@@ -157,8 +158,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- spd_data = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,</span><br><span style="color: hsl(0, 100%, 40%);">- &spd_file_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ spd_data = blob_read_map(BLOB_DATA_SPD, &spd_file_len);</span><br><span> if (!spd_data)</span><br><span> die("SPD data not found.");</span><br><span> if (spd_file_len < (spd_index + 1) * 256)</span><br><span>diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>index fd19cd1..0866c96 100644</span><br><span>--- a/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>@@ -90,7 +90,7 @@</span><br><span> mapping[i + 4] = buf[chain_len - i - 1];</span><br><span> </span><br><span> /* Open main hwinfo block */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return CB_ERR;</span><br><span> /* Now try to find a valid MAC address in hwinfo for this mapping.*/</span><br><span> for (i = 0; i < MAX_NUM_MAPPINGS; i++) {</span><br><span>@@ -159,7 +159,7 @@</span><br><span> struct stopwatch sw;</span><br><span> </span><br><span> /* Open main hwinfo block. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return;</span><br><span> </span><br><span> /* Get legacy delay parameter from hwinfo. */</span><br><span>diff --git a/src/mainboard/siemens/mc_apl1/ptn3460.c b/src/mainboard/siemens/mc_apl1/ptn3460.c</span><br><span>index 1877e8b..fb0c95a 100644</span><br><span>--- a/src/mainboard/siemens/mc_apl1/ptn3460.c</span><br><span>+++ b/src/mainboard/siemens/mc_apl1/ptn3460.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> uint8_t edid_data[PTN_EDID_LEN];</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!hwi_block || hwilib_find_blocks(hwi_block) != CB_SUCCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!hwi_block || hwilib_find_blocks() != CB_SUCCESS) {</span><br><span> printk(BIOS_ERR, "LCD: Info block \"%s\" not found!\n",</span><br><span> hwi_block);</span><br><span> return 1;</span><br><span>diff --git a/src/mainboard/siemens/mc_bdx1/mainboard.c b/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>index ea525d4..37ec517 100644</span><br><span>--- a/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>@@ -197,7 +197,7 @@</span><br><span> mapping[i + 4] = buf[chain_len - i - 1];</span><br><span> </span><br><span> /* Open main hwinfo block */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return CB_ERR;</span><br><span> /* Now try to find a valid MAC address in hwinfo for this mapping.*/</span><br><span> for (i = 0; i < MAX_NUM_MAPPINGS; i++) {</span><br><span>@@ -223,7 +223,7 @@</span><br><span> struct stopwatch sw;</span><br><span> </span><br><span> /* Open main hwinfo block. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return;</span><br><span> </span><br><span> /* Get legacy delay parameter from hwinfo. */</span><br><span>diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>index df08471..14d9778 100644</span><br><span>--- a/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> uint32_t i;</span><br><span> </span><br><span> /* Open main hwinfo block */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks() != CB_SUCCESS)</span><br><span> return CB_ERR;</span><br><span> /* Get first MAC address from hwinfo. */</span><br><span> if (hwilib_get_field(Mac1, mac_adr, sizeof(mac_adr)) != sizeof(mac_adr))</span><br><span>diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.c b/src/mainboard/siemens/mc_tcu3/ptn3460.c</span><br><span>index 347bc9c..c2f3f9f 100644</span><br><span>--- a/src/mainboard/siemens/mc_tcu3/ptn3460.c</span><br><span>+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> uint8_t edid_data[0x80];</span><br><span> uint8_t hwid[4], tcu31_hwid[4] = {7, 9, 2, 0};</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!hwi_block || hwilib_find_blocks(hwi_block) != CB_SUCCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!hwi_block || hwilib_find_blocks() != CB_SUCCESS) {</span><br><span> printk(BIOS_ERR, "LCD: Info block \"%s\" not found!\n",</span><br><span> hwi_block);</span><br><span> return 1;</span><br><span>diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c</span><br><span>index 15d949e..f466207 100644</span><br><span>--- a/src/mainboard/siemens/mc_tcu3/romstage.c</span><br><span>+++ b/src/mainboard/siemens/mc_tcu3/romstage.c</span><br><span>@@ -174,7 +174,7 @@</span><br><span> </span><br><span> /* Get SPD data from hwinfo block and set up memory down */</span><br><span> /* parameters for FSP accordingly. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hwilib_find_blocks("hwinfo.hex")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hwilib_find_blocks()) {</span><br><span> printk(BIOS_ERR,</span><br><span> "HWInfo not found, use default timings for DDR3.\n");</span><br><span> return;</span><br><span>diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>index 4100b26..5132023 100644</span><br><span>--- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <string.h></span><br><span> #include "mct_d.h"</span><br><span> #include "mct_d_gcc.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "s3utils.h"</span><br><span> </span><br><span>@@ -56,12 +57,12 @@</span><br><span> ssize_t get_s3nv_file_offset(void)</span><br><span> {</span><br><span> struct region_device s3nv_region;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf s3nv_cbfs_file;</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&s3nv_cbfs_file, S3NV_FILE_NAME, NULL)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "S3 state file not found in CBFS: %s\n", S3NV_FILE_NAME);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_DATA_AMD_S3NV, &s3nv_region)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "S3 state file not found in CBFS: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ S3NV_FILE_NAME);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&s3nv_region, &s3nv_cbfs_file);</span><br><span> </span><br><span> return s3nv_region.region.offset;</span><br><span> }</span><br><span>@@ -213,7 +214,7 @@</span><br><span> s3nv_file_offset = s3nv_offset - s3nv_file_offset;</span><br><span> </span><br><span> /* Map data structure in CBFS and restore settings */</span><br><span style="color: hsl(0, 100%, 40%);">- s3nv_cbfs_file_ptr = cbfs_boot_map_with_leak(S3NV_FILE_NAME, CBFS_TYPE_RAW, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ s3nv_cbfs_file_ptr = blob_read_map(BLOB_DATA_AMD_S3NV, NULL);</span><br><span> if (!s3nv_cbfs_file_ptr) {</span><br><span> printk(BIOS_DEBUG, "S3 state file could not be mapped: %s\n", S3NV_FILE_NAME);</span><br><span> return NULL;</span><br><span>diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c</span><br><span>index d912317..fe4d7d9 100644</span><br><span>--- a/src/northbridge/amd/pi/agesawrapper.c</span><br><span>+++ b/src/northbridge/amd/pi/agesawrapper.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <northbridge/amd/agesa/state_machine.h></span><br><span> #include <northbridge/amd/pi/agesawrapper.h></span><br><span> #include <northbridge/amd/agesa/BiosCallOuts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void __attribute__((weak)) OemPostParams(AMD_POST_PARAMS *PostParams) {}</span><br><span> </span><br><span>@@ -293,14 +294,7 @@</span><br><span> const AMD_MODULE_HEADER* module;</span><br><span> size_t file_size;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (IS_ENABLED(CONFIG_VBOOT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Use phys. location in flash and prevent vboot from searching cbmem */</span><br><span style="color: hsl(0, 100%, 40%);">- agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION;</span><br><span style="color: hsl(0, 100%, 40%);">- file_size = 0x100000;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_RAW, &file_size);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ agesa = blob_read_map(BLOB_CODE_AMD_AGESA, &file_size);</span><br><span> </span><br><span> if (!agesa)</span><br><span> return NULL;</span><br><span>diff --git a/src/northbridge/intel/common/mrc_cache.c b/src/northbridge/intel/common/mrc_cache.c</span><br><span>index f692282..7a0b77d 100644</span><br><span>--- a/src/northbridge/intel/common/mrc_cache.c</span><br><span>+++ b/src/northbridge/intel/common/mrc_cache.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <spi-generic.h></span><br><span> #include <spi_flash.h></span><br><span> #include "mrc_cache.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* convert a pointer to flash area into the offset inside the flash */</span><br><span> static inline u32 to_flash_offset(struct spi_flash *flash, void *p) {</span><br><span>@@ -64,16 +65,11 @@</span><br><span> *mrc_region_ptr = NULL;</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_CHROMEOS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device rdev;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (fmap_locate_area_as_rdev("RW_MRC_CACHE", &rdev) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- region_size = region_device_sz(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- *mrc_region_ptr = rdev_mmap_full(&rdev);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ *mrc_region_ptr = blob_read_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ BLOB_DATA_MRC_CACHE_RW_REGION, ®ion_size);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- *mrc_region_ptr = cbfs_boot_map_with_leak("mrc.cache",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MRC_CACHE,</span><br><span style="color: hsl(0, 100%, 40%);">- ®ion_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ *mrc_region_ptr =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_MRC_CACHE, ®ion_size);</span><br><span> }</span><br><span> return region_size;</span><br><span> }</span><br><span>diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c</span><br><span>index f17a374..dbc9a64 100644</span><br><span>--- a/src/northbridge/intel/haswell/raminit.c</span><br><span>+++ b/src/northbridge/intel/haswell/raminit.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include "raminit.h"</span><br><span> #include "pei_data.h"</span><br><span> #include "haswell.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void save_mrc_data(struct pei_data *pei_data)</span><br><span> {</span><br><span>@@ -141,8 +142,7 @@</span><br><span> pei_data->tx_byte = do_putchar;</span><br><span> </span><br><span> /* Locate and call UEFI System Agent binary. */</span><br><span style="color: hsl(0, 100%, 40%);">- entry = (unsigned long)cbfs_boot_map_with_leak("mrc.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MRC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ entry = (unsigned long)blob_read_map(BLOB_CODE_INTEL_MRC, NULL);</span><br><span> if (entry) {</span><br><span> int rv;</span><br><span> asm volatile (</span><br><span>diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c</span><br><span>index 901a083..730f8a4 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/raminit_mrc.c</span><br><span>+++ b/src/northbridge/intel/sandybridge/raminit_mrc.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include "pei_data.h"</span><br><span> #include "sandybridge.h"</span><br><span> #include <security/vboot/vboot_common.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* Management Engine is in the southbridge */</span><br><span> #include "southbridge/intel/bd82x6x/me.h"</span><br><span>@@ -216,7 +217,7 @@</span><br><span> pei_data->tx_byte = do_putchar;</span><br><span> </span><br><span> /* Locate and call UEFI System Agent binary. */</span><br><span style="color: hsl(0, 100%, 40%);">- entry = cbfs_boot_map_with_leak("mrc.bin", CBFS_TYPE_MRC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ entry = blob_read_map(BLOB_CODE_INTEL_MRC, NULL);</span><br><span> if (entry) {</span><br><span> int rv;</span><br><span> rv = entry (pei_data);</span><br><span>diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>index 5c25d64..23505aa 100644</span><br><span>--- a/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>+++ b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <rmodule.h></span><br><span> #include <string.h></span><br><span> #include <timestamp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> void __attribute__((weak)) SetMemParams(AMD_POST_PARAMS *PostParams) {}</span><br><span> void __attribute__((weak)) OemPostParams(AMD_POST_PARAMS *PostParams) {}</span><br><span>@@ -396,34 +397,24 @@</span><br><span> return Status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int agesa_locate_file(const char *name, struct region_device *rdev,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t type)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf fh;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&fh, name, &type))</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(rdev, &fh);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int agesa_locate_raw_file(const char *name, struct region_device *rdev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return agesa_locate_file(name, rdev, CBFS_TYPE_RAW);</span><br><span style="color: hsl(120, 100%, 40%);">+ return blob_read_arbitrary_region_device(COREBOOT_REGION, name,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, rdev);</span><br><span> }</span><br><span> </span><br><span> static int agesa_locate_stage_file_early(const char *name,</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device *rdev)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device *rdev)</span><br><span> {</span><br><span> const size_t metadata_sz = sizeof(struct cbfs_stage);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (agesa_locate_file(name, rdev, CBFS_TYPE_STAGE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_arbitrary_region_device(COREBOOT_REGION, name,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_STAGE, rdev))</span><br><span> return -1;</span><br><span> </span><br><span> /* Peel off the cbfs stage metadata. */</span><br><span> return rdev_chain(rdev, rdev, metadata_sz,</span><br><span style="color: hsl(0, 100%, 40%);">- region_device_sz(rdev) - metadata_sz);</span><br><span style="color: hsl(120, 100%, 40%);">+ region_device_sz(rdev) - metadata_sz);</span><br><span> }</span><br><span> </span><br><span> static int agesa_locate_stage_file_ramstage(const char *name,</span><br><span>diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>index c05d4de..2304060 100644</span><br><span>--- a/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>+++ b/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <amdblocks/agesawrapper_call.h></span><br><span> #include <reset.h></span><br><span> #include <soc/southbridge.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #if ENV_BOOTBLOCK</span><br><span> const BIOS_CALLOUT_STRUCT BiosCallouts[] = {</span><br><span>@@ -143,9 +144,9 @@</span><br><span> GFX_VBIOS_IMAGE_INFO *pVbiosImageInfo;</span><br><span> </span><br><span> pVbiosImageInfo = (GFX_VBIOS_IMAGE_INFO *)ConfigPrt;</span><br><span style="color: hsl(0, 100%, 40%);">- pVbiosImageInfo->ImagePtr = cbfs_boot_map_with_leak(</span><br><span style="color: hsl(0, 100%, 40%);">- "pci"CONFIG_VGA_BIOS_ID".rom",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_OPTIONROM, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ pVbiosImageInfo->ImagePtr = blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "pci" CONFIG_VGA_BIOS_ID ".rom",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_OPTIONROM, NULL);</span><br><span> printk(BIOS_DEBUG, "agesa_GfxGetVbiosImage: IMGptr=%p\n",</span><br><span> pVbiosImageInfo->ImagePtr);</span><br><span> return pVbiosImageInfo->ImagePtr ? AGESA_SUCCESS : AGESA_WARNING;</span><br><span>diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c</span><br><span>index a1a0e5b..ed7f913 100644</span><br><span>--- a/src/soc/amd/common/block/psp/psp.c</span><br><span>+++ b/src/soc/amd/common/block/psp/psp.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <bootstate.h></span><br><span> #include <console/console.h></span><br><span> #include <amdblocks/psp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static const char *psp_status_nobase = "error: PSP BAR3 not assigned";</span><br><span> static const char *psp_status_halted = "error: PSP in halted state";</span><br><span>@@ -247,16 +248,14 @@</span><br><span> int psp_load_named_blob(int type, const char *name)</span><br><span> {</span><br><span> void *blob;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf cbfs_file;</span><br><span> struct region_device rdev;</span><br><span> int r;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&cbfs_file, name, NULL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_CODE_AMD_PSP, &rdev)) {</span><br><span> printk(BIOS_ERR, "BUG: Cannot locate blob for PSP loading\n");</span><br><span> return PSPSTS_INVALID_NAME;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&rdev, &cbfs_file);</span><br><span> blob = rdev_mmap_full(&rdev);</span><br><span> if (blob) {</span><br><span> r = psp_load_blob(type, blob);</span><br><span>diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c</span><br><span>index 45bc75b..e7ee0fe 100644</span><br><span>--- a/src/soc/intel/baytrail/romstage/raminit.c</span><br><span>+++ b/src/soc/intel/baytrail/romstage/raminit.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <ec/google/chromeec/ec.h></span><br><span> #include <ec/google/chromeec/ec_commands.h></span><br><span> #include <security/vboot/vboot_common.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void reset_system(void)</span><br><span> {</span><br><span>@@ -140,7 +141,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Determine if mrc.bin is in the cbfs. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_map_with_leak("mrc.bin", CBFS_TYPE_MRC, NULL) == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_map(BLOB_CODE_INTEL_MRC, NULL) == NULL) {</span><br><span> printk(BIOS_DEBUG, "Couldn't find mrc.bin\n");</span><br><span> return;</span><br><span> }</span><br><span>diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c</span><br><span>index 665dad2..b9601b9 100644</span><br><span>--- a/src/soc/intel/broadwell/romstage/raminit.c</span><br><span>+++ b/src/soc/intel/broadwell/romstage/raminit.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <soc/romstage.h></span><br><span> #include <soc/smm.h></span><br><span> #include <soc/systemagent.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /*</span><br><span> * Find PEI executable in coreboot filesystem and execute it.</span><br><span>@@ -78,7 +79,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Determine if mrc.bin is in the cbfs. */</span><br><span style="color: hsl(0, 100%, 40%);">- entry = cbfs_boot_map_with_leak("mrc.bin", CBFS_TYPE_MRC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ entry = blob_read_map(BLOB_CODE_INTEL_MRC, NULL);</span><br><span> if (entry == NULL) {</span><br><span> printk(BIOS_DEBUG, "Couldn't find mrc.bin\n");</span><br><span> return;</span><br><span>diff --git a/src/soc/intel/common/mma.c b/src/soc/intel/common/mma.c</span><br><span>index 541a7b4..32de5d2 100644</span><br><span>--- a/src/soc/intel/common/mma.c</span><br><span>+++ b/src/soc/intel/common/mma.c</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include <cbmem.h></span><br><span> #include <console/console.h></span><br><span> #include <soc/intel/common/mma.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define MMA_TEST_METADATA_FILENAME "mma_test_metadata.bin"</span><br><span> #define MMA_TEST_NAME_TAG "MMA_TEST_NAME"</span><br><span>@@ -118,22 +119,15 @@</span><br><span> size_t mma_test_metadata_file_len;</span><br><span> char test_filename[TEST_NAME_MAX_SIZE],</span><br><span> test_param_filename[TEST_PARAM_MAX_SIZE];</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf metadata_fh, test_content_fh, test_param_fh;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cbfsf test_content_fh, test_param_fh;</span><br><span> uint32_t mma_type = CBFS_TYPE_MMA;</span><br><span> uint32_t efi_type = CBFS_TYPE_EFI;</span><br><span> bool metadata_parse_flag = true;</span><br><span> </span><br><span> printk(BIOS_DEBUG, "MMA: Entry %s\n", __func__);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_locate_file_in_region(&metadata_fh, MMA_CBFS_REGION,</span><br><span style="color: hsl(0, 100%, 40%);">- MMA_TEST_METADATA_FILENAME, &mma_type)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "MMA: Failed to locate %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- MMA_TEST_METADATA_FILENAME);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mma_test_metadata = rdev_mmap_full(&metadata_fh.data);</span><br><span style="color: hsl(0, 100%, 40%);">- mma_test_metadata_file_len = region_device_sz(&metadata_fh.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ mma_test_metadata = blob_read_map(BLOB_CODE_INTEL_MMA,</span><br><span style="color: hsl(120, 100%, 40%);">+ &mma_test_metadata_file_len);</span><br><span> </span><br><span> if (!mma_test_metadata || !mma_test_metadata_file_len) {</span><br><span> printk(BIOS_DEBUG, "MMA: Failed to read %s\n",</span><br><span>diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c</span><br><span>index eba7d40..0087c2e 100644</span><br><span>--- a/src/soc/intel/common/vbt.c</span><br><span>+++ b/src/soc/intel/common/vbt.c</span><br><span>@@ -18,6 +18,7 @@</span><br><span> #include <arch/acpi.h></span><br><span> #include <bootmode.h></span><br><span> #include <bootstate.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "vbt.h"</span><br><span> </span><br><span>@@ -35,19 +36,17 @@</span><br><span> void *locate_vbt(void)</span><br><span> {</span><br><span> uint32_t vbtsig = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file_desc;</span><br><span> </span><br><span> if (vbt_data != NULL)</span><br><span> return vbt_data;</span><br><span> </span><br><span> const char *filename = mainboard_vbt_filename();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&file_desc, filename, NULL) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_arbitrary_region_device(COREBOOT_REGION, filename,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_RAW, &vbt_rdev) < 0) {</span><br><span> printk(BIOS_ERR, "Could not locate a VBT file in in CBFS\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&vbt_rdev, &file_desc);</span><br><span> rdev_readat(&vbt_rdev, &vbtsig, 0, sizeof(uint32_t));</span><br><span> </span><br><span> if (vbtsig != VBT_SIGNATURE) {</span><br><span>diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c</span><br><span>index a43504c..efc91ce 100644</span><br><span>--- a/src/soc/intel/denverton_ns/chip.c</span><br><span>+++ b/src/soc/intel/denverton_ns/chip.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include <soc/ramstage.h></span><br><span> #include <soc/fiamux.h></span><br><span> #include <spi-generic.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static void pci_domain_set_resources(device_t dev)</span><br><span> {</span><br><span>@@ -104,8 +105,8 @@</span><br><span> const struct microcode *microcode_file;</span><br><span> size_t microcode_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- microcode_file = cbfs_boot_map_with_leak("cpu_microcode_blob.bin",</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_TYPE_MICROCODE, µcode_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ microcode_file =</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_read_map(BLOB_DATA_MICROCODE, µcode_len);</span><br><span> </span><br><span> if ((microcode_file != NULL) && (microcode_len != 0)) {</span><br><span> /* Update CPU Microcode patch base address/size */</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c</span><br><span>index 7a9e8f5..cfbd63e 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <soc/romstage.h></span><br><span> #include <chip.h></span><br><span> #include <fsp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> /* Copy the default UPD region and settings to a buffer for modification */</span><br><span> static void GetUpdDefaultFromFsp (FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *UpdData)</span><br><span>@@ -61,17 +62,25 @@</span><br><span> UpdData->MemDownEnable = 1;</span><br><span> </span><br><span> if (IS_ENABLED(CONFIG_FSP_MEMORY_DOWN_CH0DIMM0_SPD_PRESENT))</span><br><span style="color: hsl(0, 100%, 40%);">- UpdData->MemDownCh0Dimm0SpdPtr</span><br><span style="color: hsl(0, 100%, 40%);">- = (UINT32)cbfs_boot_map_with_leak("spd_ch0_dimm0.bin", CBFS_TYPE_SPD, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ UpdData->MemDownCh0Dimm0SpdPtr =</span><br><span style="color: hsl(120, 100%, 40%);">+ (UINT32)blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "spd_ch0_dimm0.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_SPD, NULL);</span><br><span> if (IS_ENABLED(CONFIG_FSP_MEMORY_DOWN_CH0DIMM1_SPD_PRESENT))</span><br><span style="color: hsl(0, 100%, 40%);">- UpdData->MemDownCh0Dimm1SpdPtr</span><br><span style="color: hsl(0, 100%, 40%);">- = (UINT32)cbfs_boot_map_with_leak("spd_ch0_dimm1.bin", CBFS_TYPE_SPD, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ UpdData->MemDownCh0Dimm1SpdPtr =</span><br><span style="color: hsl(120, 100%, 40%);">+ (UINT32)blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "spd_ch0_dimm1.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_SPD, NULL);</span><br><span> if (IS_ENABLED(CONFIG_FSP_MEMORY_DOWN_CH1DIMM0_SPD_PRESENT))</span><br><span style="color: hsl(0, 100%, 40%);">- UpdData->MemDownCh1Dimm0SpdPtr</span><br><span style="color: hsl(0, 100%, 40%);">- = (UINT32)cbfs_boot_map_with_leak("spd_ch1_dimm0.bin", CBFS_TYPE_SPD, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ UpdData->MemDownCh1Dimm0SpdPtr =</span><br><span style="color: hsl(120, 100%, 40%);">+ (UINT32)blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "spd_ch1_dimm0.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_SPD, NULL);</span><br><span> if (IS_ENABLED(CONFIG_FSP_MEMORY_DOWN_CH1DIMM1_SPD_PRESENT))</span><br><span style="color: hsl(0, 100%, 40%);">- UpdData->MemDownCh1Dimm1SpdPtr</span><br><span style="color: hsl(0, 100%, 40%);">- = (UINT32)cbfs_boot_map_with_leak("spd_ch1_dimm1.bin", CBFS_TYPE_SPD, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ UpdData->MemDownCh1Dimm1SpdPtr =</span><br><span style="color: hsl(120, 100%, 40%);">+ (UINT32)blob_read_arbitrary_map(</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT_REGION, "spd_ch1_dimm1.bin",</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_TYPE_SPD, NULL);</span><br><span> } else {</span><br><span> UpdData->MemDownEnable = 0;</span><br><span> }</span><br><span>diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c</span><br><span>index c5f59c6..b5b8a33 100644</span><br><span>--- a/src/soc/intel/quark/romstage/romstage.c</span><br><span>+++ b/src/soc/intel/quark/romstage/romstage.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <soc/pm.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <soc/reg_access.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static const struct reg_script clear_smi_and_wake_events_script[] = {</span><br><span> /* Clear any SMI or wake events */</span><br><span>@@ -65,29 +66,5 @@</span><br><span> </span><br><span> void *locate_rmu_file(size_t *rmu_file_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf fh;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t fsize;</span><br><span style="color: hsl(0, 100%, 40%);">- void *rmu_data;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t type;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Locate the rmu.bin file in the read-only region of the flash */</span><br><span style="color: hsl(0, 100%, 40%);">- type = CBFS_TYPE_RAW;</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_locate_file_in_region(&fh, "COREBOOT", "rmu.bin", &type))</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the file size */</span><br><span style="color: hsl(0, 100%, 40%);">- fsize = region_device_sz(&fh.data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rmu_file_len != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- *rmu_file_len = fsize;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the data address */</span><br><span style="color: hsl(0, 100%, 40%);">- rmu_data = rdev_mmap(&fh.data, 0, fsize);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Since the SPI flash is directly mapped into memory, we do not need</span><br><span style="color: hsl(0, 100%, 40%);">- * the mapping provided by the rdev service. Unmap the file to prevent</span><br><span style="color: hsl(0, 100%, 40%);">- * a memory leak. Return/leak the SPI flash address for the rmu.bin</span><br><span style="color: hsl(0, 100%, 40%);">- * file data which will be directly accessed by FSP MemoryInit.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- rdev_munmap(&fh.data, rmu_data);</span><br><span style="color: hsl(0, 100%, 40%);">- return rmu_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ return blob_read_map(BLOB_DATA_MICROCODE_RMU, rmu_file_len);</span><br><span> }</span><br><span>diff --git a/src/soc/nvidia/tegra210/mtc.c b/src/soc/nvidia/tegra210/mtc.c</span><br><span>index f71e5e8..29318d0 100644</span><br><span>--- a/src/soc/nvidia/tegra210/mtc.c</span><br><span>+++ b/src/soc/nvidia/tegra210/mtc.c</span><br><span>@@ -18,6 +18,7 @@</span><br><span> #include <console/console.h></span><br><span> #include <soc/mtc.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> static size_t mtc_table_size;</span><br><span> </span><br><span>@@ -28,26 +29,23 @@</span><br><span> int tegra210_run_mtc(void)</span><br><span> {</span><br><span> ssize_t nread;</span><br><span style="color: hsl(0, 100%, 40%);">- struct region_device fh;</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf mtc_file;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region_device mtc_file;</span><br><span> </span><br><span> void * const mtc = (void *)(uintptr_t)CONFIG_MTC_ADDRESS;</span><br><span> void *dvfs_table;</span><br><span> size_t (*mtc_fw)(void **dvfs_table) = (void *)mtc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_boot_locate(&mtc_file, "tegra_mtc.bin", NULL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (blob_read_region_device(BLOB_CODE_NVIDIA_MTC, &mtc_file)) {</span><br><span> printk(BIOS_ERR, "MTC file not found: tegra_mtc.bin\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(&fh, &mtc_file);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Read MTC file into predefined region. */</span><br><span style="color: hsl(0, 100%, 40%);">- nread = rdev_readat(&fh, mtc, 0, region_device_sz(&fh));</span><br><span style="color: hsl(120, 100%, 40%);">+ nread = rdev_readat(&mtc_file, mtc, 0, region_device_sz(&mtc_file));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nread != region_device_sz(&fh)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nread != region_device_sz(&mtc_file)) {</span><br><span> printk(BIOS_ERR, "MTC bytes read (%zu) != file length(%zu)!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- nread, region_device_sz(&fh));</span><br><span style="color: hsl(120, 100%, 40%);">+ nread, region_device_sz(&mtc_file));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/soc/qualcomm/ipq40xx/blobs_init.c b/src/soc/qualcomm/ipq40xx/blobs_init.c</span><br><span>index 77c0289..75cc044 100644</span><br><span>--- a/src/soc/qualcomm/ipq40xx/blobs_init.c</span><br><span>+++ b/src/soc/qualcomm/ipq40xx/blobs_init.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> </span><br><span> #include <soc/iomap.h></span><br><span> #include <soc/soc_services.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "mbn_header.h"</span><br><span> </span><br><span>@@ -33,14 +34,13 @@</span><br><span> uint8_t *cdt_ptr; /* pointer to CDT */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void *load_ipq_blob(const char *file_name)</span><br><span style="color: hsl(120, 100%, 40%);">+static void *load_ipq_blob(struct blob_locator identifier)</span><br><span> {</span><br><span> struct mbn_header *blob_mbn;</span><br><span> void *blob_dest;</span><br><span> size_t blob_size;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- blob_mbn = cbfs_boot_map_with_leak(file_name, CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &blob_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_mbn = blob_read_map(identifier, &blob_size);</span><br><span> if (!blob_mbn)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -91,8 +91,8 @@</span><br><span> </span><br><span> sbl_rw_ret_info_t (*(*ddr_init_function)(struct cdt_info *cdt_header));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cdt = load_ipq_blob(CONFIG_CDT_MBN);</span><br><span style="color: hsl(0, 100%, 40%);">- ddr_init_function = load_ipq_blob(CONFIG_DDR_MBN);</span><br><span style="color: hsl(120, 100%, 40%);">+ cdt = load_ipq_blob(BLOB_CODE_QUALCOMM_CDT);</span><br><span style="color: hsl(120, 100%, 40%);">+ ddr_init_function = load_ipq_blob(BLOB_CODE_QUALCOMM_DDR);</span><br><span> </span><br><span> if (!cdt || !ddr_init_function) {</span><br><span> printk(BIOS_ERR, "cdt: %p, ddr_init_function: %p\n",</span><br><span>@@ -126,7 +126,7 @@</span><br><span> #else /* __PRE_RAM__ */</span><br><span> void start_tzbsp(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- void *tzbsp = load_ipq_blob(CONFIG_TZ_MBN);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *tzbsp = load_ipq_blob(BLOB_CODE_QUALCOMM_TZ);</span><br><span> </span><br><span> if (!tzbsp)</span><br><span> die("could not find or map TZBSP\n");</span><br><span>diff --git a/src/soc/qualcomm/ipq806x/blobs_init.c b/src/soc/qualcomm/ipq806x/blobs_init.c</span><br><span>index 5b19fc1..9a1e1ab 100644</span><br><span>--- a/src/soc/qualcomm/ipq806x/blobs_init.c</span><br><span>+++ b/src/soc/qualcomm/ipq806x/blobs_init.c</span><br><span>@@ -23,17 +23,17 @@</span><br><span> </span><br><span> #include <soc/iomap.h></span><br><span> #include <soc/soc_services.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #include "mbn_header.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void *load_ipq_blob(const char *file_name)</span><br><span style="color: hsl(120, 100%, 40%);">+static void *load_ipq_blob(struct blob_locator identifier)</span><br><span> {</span><br><span> struct mbn_header *blob_mbn;</span><br><span> void *blob_dest;</span><br><span> size_t blob_size;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- blob_mbn = cbfs_boot_map_with_leak(file_name, CBFS_TYPE_RAW,</span><br><span style="color: hsl(0, 100%, 40%);">- &blob_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ blob_mbn = blob_read_map(identifier, &blob_size);</span><br><span> if (!blob_mbn)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -67,8 +67,8 @@</span><br><span> void *cdt;</span><br><span> int (*ddr_init_function)(void *cdt_header);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cdt = load_ipq_blob("cdt.mbn");</span><br><span style="color: hsl(0, 100%, 40%);">- ddr_init_function = load_ipq_blob("ddr.mbn");</span><br><span style="color: hsl(120, 100%, 40%);">+ cdt = load_ipq_blob(BLOB_CODE_QUALCOMM_CDT);</span><br><span style="color: hsl(120, 100%, 40%);">+ ddr_init_function = load_ipq_blob(BLOB_CODE_QUALCOMM_DDR);</span><br><span> </span><br><span> if (!cdt || !ddr_init_function) {</span><br><span> printk(BIOS_ERR, "cdt: %p, ddr_init_function: %p\n",</span><br><span>@@ -93,7 +93,7 @@</span><br><span> </span><br><span> void start_tzbsp(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- void *tzbsp = load_ipq_blob("tz.mbn");</span><br><span style="color: hsl(120, 100%, 40%);">+ void *tzbsp = load_ipq_blob(BLOB_CODE_QUALCOMM_TZ);</span><br><span> </span><br><span> if (!tzbsp)</span><br><span> die("could not find or map TZBSP\n");</span><br><span>@@ -118,7 +118,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- load_addr = (u32) load_ipq_blob("rpm.mbn");</span><br><span style="color: hsl(120, 100%, 40%);">+ load_addr = (u32) load_ipq_blob(BLOB_CODE_QUALCOMM_RPM);</span><br><span> if (!load_addr)</span><br><span> die("could not find or map RPM code\n");</span><br><span> </span><br><span>diff --git a/src/vendorcode/siemens/hwilib/hwilib.c b/src/vendorcode/siemens/hwilib/hwilib.c</span><br><span>index f15937b..87cc26d 100644</span><br><span>--- a/src/vendorcode/siemens/hwilib/hwilib.c</span><br><span>+++ b/src/vendorcode/siemens/hwilib/hwilib.c</span><br><span>@@ -19,7 +19,7 @@</span><br><span> #include <arch/io.h></span><br><span> #include <arch/early_variables.h></span><br><span> #include "hwilib.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#include <blob_provider.h></span><br><span> </span><br><span> #define MAX_BLOCK_NUM 4</span><br><span> #define LEN_HIB 0x1fd</span><br><span>@@ -460,10 +460,9 @@</span><br><span> }</span><br><span> </span><br><span> /** \brief This function finds all available block types in a given cbfs file.</span><br><span style="color: hsl(0, 100%, 40%);">- * @param *hwi_filename Name of the cbfs-file to use.</span><br><span> * @return CB_SUCCESS when no error, otherwise error code</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-enum cb_err hwilib_find_blocks (const char *hwi_filename)</span><br><span style="color: hsl(120, 100%, 40%);">+enum cb_err hwilib_find_blocks (void)</span><br><span> {</span><br><span> uint8_t *ptr = NULL, *base = NULL;</span><br><span> uint32_t next_offset = 1;</span><br><span>@@ -471,13 +470,9 @@</span><br><span> uint16_t *all_blk_size_ptr = car_get_var_ptr(&all_blk_size[0]);</span><br><span> size_t filesize = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Check for a valid parameter */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!hwi_filename)</span><br><span style="color: hsl(0, 100%, 40%);">- return CB_ERR_ARG;</span><br><span style="color: hsl(0, 100%, 40%);">- ptr = cbfs_boot_map_with_leak(hwi_filename, CBFS_TYPE_RAW, &filesize);</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr = blob_read_map(BLOB_DATA_SIEMENS_HWLIB, &filesize);</span><br><span> if (!ptr) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_ERR,"HWILIB: Missing file \"%s\" in cbfs.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- hwi_filename);</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR,"HWILIB: Missing file HWLIB in cbfs.\n");</span><br><span> return CB_ERR;</span><br><span> }</span><br><span> /* Ensure the block has the right magic */</span><br><span>diff --git a/src/vendorcode/siemens/hwilib/hwilib.h b/src/vendorcode/siemens/hwilib/hwilib.h</span><br><span>index 6850f07..41510fa 100644</span><br><span>--- a/src/vendorcode/siemens/hwilib/hwilib.h</span><br><span>+++ b/src/vendorcode/siemens/hwilib/hwilib.h</span><br><span>@@ -131,7 +131,7 @@</span><br><span> /* Use this function to find all supported blocks in cbfs. It must be called</span><br><span> * once with a valid cbfs file name before hwilib_get_field() can be used.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-enum cb_err hwilib_find_blocks (const char *hwi_filename);</span><br><span style="color: hsl(120, 100%, 40%);">+enum cb_err hwilib_find_blocks (void);</span><br><span> </span><br><span> /* Use this function to get fields out of supported info blocks</span><br><span> * This function returns the number of copied bytes or 0 on error.</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/24995">change 24995</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/24995"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1e288c7a17cc96d7e65f914f7253aaa4b74d04e8 </div>
<div style="display:none"> Gerrit-Change-Number: 24995 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>