prog_loaders: Remove prog_locate()

This patch rewrites the last few users of prog_locate() to access CBFS
APIs directly and removes the call. This eliminates the double-meaning
of prog_rdev() (referring to both the boot medium where the program is
stored before loading, and the memory area where it is loaded after) and
makes sure that programs are always located and loaded in a single
operation. This makes CBFS verification easier to implement and secure
because it avoids leaking a raw rdev of unverified data outside the CBFS
core code.

Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I7a5525f66e1d5f3a632e8f6f0ed9e116e3cebfcf
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49337
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

5 files changed, 16 insertions, 35 deletions

diff --git a/src/drivers/intel/fsp1_1/car.c b/src/drivers/intel/fsp1_1/car.c
index 9b47e71db1..5d41a017b6 100644
--- a/src/drivers/intel/fsp1_1/car.c
+++ b/src/drivers/intel/fsp1_1/car.c
@@ -2,13 +2,13 @@
 
 #include <arch/romstage.h>
 #include <arch/symbols.h>
+#include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <commonlib/helpers.h>
 #include <cpu/x86/mtrr.h>
 #include <fsp/car.h>
 #include <fsp/util.h>
-#include <program_loading.h>
 
 void fill_postcar_frame(struct postcar_frame *pcf)
 {
@@ -27,14 +27,14 @@ void mainboard_romstage_entry(void)
 {
 	/* Need to locate the current FSP_INFO_HEADER. The cache-as-ram
 	 * is still enabled. We can directly access work buffer here. */
-	struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin");
+	void *fsp = cbfs_map("fsp.bin", NULL);
 
-	if (prog_locate(&fsp))
+	if (!fsp)
 		die_with_post_code(POST_INVALID_CBFS, "Unable to locate fsp.bin");
 
 	/* This leaks a mapping which this code assumes is benign as
 	 * the flash is memory mapped CPU's address space. */
-	FSP_INFO_HEADER *fih = find_fsp((uintptr_t)rdev_mmap_full(prog_rdev(&fsp)));
+	FSP_INFO_HEADER *fih = find_fsp((uintptr_t)fsp);
 
 	if (!fih)
 		die("Invalid FSP header\n");
diff --git a/src/drivers/intel/fsp1_1/fsp_relocate.c b/src/drivers/intel/fsp1_1/fsp_relocate.c
index d078f5998d..7aaba82e6b 100644
--- a/src/drivers/intel/fsp1_1/fsp_relocate.c
+++ b/src/drivers/intel/fsp1_1/fsp_relocate.c
@@ -1,29 +1,24 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <cbfs.h>
 #include <cbmem.h>
 #include <commonlib/fsp.h>
 #include <fsp/util.h>
 
-int fsp_relocate(struct prog *fsp_relocd, const struct region_device *fsp_src)
+int fsp_relocate(struct prog *fsp_relocd)
 {
-	void *new_loc;
 	void *fih;
 	ssize_t fih_offset;
-	size_t size = region_device_sz(fsp_src);
-
-	new_loc = cbmem_add(CBMEM_ID_REFCODE, size);
+	size_t size;
 
+	void *new_loc = cbfs_cbmem_alloc(prog_name(fsp_relocd),
+					 CBMEM_ID_REFCODE, &size);
 	if (new_loc == NULL) {
 		printk(BIOS_ERR, "ERROR: Unable to load FSP into memory.\n");
 		return -1;
 	}
 
-	if (rdev_readat(fsp_src, new_loc, 0, size) != size) {
-		printk(BIOS_ERR, "ERROR: Can't read FSP's region device.\n");
-		return -1;
-	}
-
 	fih_offset = fsp1_1_relocate((uintptr_t)new_loc, new_loc, size);
 
 	if (fih_offset <= 0) {
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index e67ecd16d0..e1fb59605a 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -40,10 +40,10 @@ static inline uint32_t fsp_version(FSP_INFO_HEADER *fih)
 
 /*
  * Relocate FSP entire binary into ram. Returns < 0 on error, 0 on success.
- * The FSP source is pointed to by region_device and the relocation information
+ * The CBFS file name of the FSP source and the relocation information
  * is encoded in a struct prog with its entry point set to the FSP info header.
  */
-int fsp_relocate(struct prog *fsp_relocd, const struct region_device *fsp_src);
+int fsp_relocate(struct prog *fsp_relocd);
 
 /* Additional HOB types not included in the FSP:
  * #define EFI_HOB_TYPE_HANDOFF 0x0001
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index 22d4f1c8be..b10fccd5e4 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -144,21 +144,6 @@ static void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header)
 	soc_after_silicon_init();
 }
 
-static int fsp_find_and_relocate(struct prog *fsp)
-{
-	if (prog_locate(fsp)) {
-		printk(BIOS_ERR, "ERROR: Couldn't find %s\n", prog_name(fsp));
-		return -1;
-	}
-
-	if (fsp_relocate(fsp, prog_rdev(fsp))) {
-		printk(BIOS_ERR, "ERROR: FSP relocation failed.\n");
-		return -1;
-	}
-
-	return 0;
-}
-
 static void fsp_load(void)
 {
 	struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin");
@@ -166,7 +151,7 @@ static void fsp_load(void)
 	if (resume_from_stage_cache()) {
 		stage_cache_load_stage(STAGE_REFCODE, &fsp);
 	} else {
-		fsp_find_and_relocate(&fsp);
+		fsp_relocate(&fsp);
 
 		if (prog_entry(&fsp))
 			stage_cache_add(STAGE_REFCODE, &fsp);
diff --git a/src/drivers/intel/fsp1_1/temp_ram_exit.c b/src/drivers/intel/fsp1_1/temp_ram_exit.c
index df7e67459b..4fb95da76c 100644
--- a/src/drivers/intel/fsp1_1/temp_ram_exit.c
+++ b/src/drivers/intel/fsp1_1/temp_ram_exit.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <cbmem.h>
+#include <cbfs.h>
 #include <console/console.h>
 #include <fsp/util.h>
 
@@ -9,13 +10,13 @@ asmlinkage void chipset_teardown_car_main(void)
 	FSP_INFO_HEADER *fih;
 	uint32_t status;
 	FSP_TEMP_RAM_EXIT temp_ram_exit;
-	struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin");
 
 	/* CBMEM_ID_VBOOT_WORKBUF is used as vboot workbuffer.
 	 * Init CBMEM before loading fsp, to have buffer available */
 	cbmem_initialize();
 
-	if (prog_locate(&fsp)) {
+	void *fsp = cbfs_map("fsp.bin", NULL);
+	if (!fsp) {
 		die("Unable to locate fsp.bin\n");
 	} else {
 		/* This leaks a mapping which this code assumes is benign as
@@ -25,7 +26,7 @@ asmlinkage void chipset_teardown_car_main(void)
 		   as it casts error values to FSP_INFO_HEADER pointers.
 		   Checking for return values can only be done sanely once
 		   that is fixed. */
-		fih = find_fsp((uintptr_t)rdev_mmap_full(prog_rdev(&fsp)));
+		fih = find_fsp((uintptr_t)fsp);
 	}
 
 	temp_ram_exit = (FSP_TEMP_RAM_EXIT)(fih->TempRamExitEntryOffset +