drivers/intel/fsp2_0: separate component validation from loading
The current FSP component loading mechanism doesn't handle all the
requirements actually needed. Two things need to be added:
1. XIP support for MemoryInit component
2. Relocating SiliconInit component to not corrupt OS memory.
In order to accommodate those requirements the validation
and header initialization needs to be a separate function.
Therefore, provide fsp_validate_component() to help achieve those
requirements.
BUG=chrome-os-partner:52679
Change-Id: I53525498b250033f3187c05db248e07b00cc934d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15740
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index b47b898..942ea09 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -104,6 +104,38 @@
}
+enum cb_err fsp_validate_component(struct fsp_header *hdr,
+ const struct region_device *rdev)
+{
+ void *membase;
+
+ /* Map just enough of the file to be able to parse the header. */
+ membase = rdev_mmap(rdev, FSP_HDR_OFFSET, FSP_HDR_LEN);
+
+ if (membase == NULL) {
+ printk(BIOS_ERR, "Could not mmap() FSP header.\n");
+ return CB_ERR;
+ }
+
+ if (fsp_identify(hdr, membase) != CB_SUCCESS) {
+ rdev_munmap(rdev, membase);
+ printk(BIOS_ERR, "No valid FSP header\n");
+ return CB_ERR;
+ }
+
+ rdev_munmap(rdev, membase);
+
+ fsp_print_header_info(hdr);
+
+ /* Check if size specified in the header matches the cbfs file size */
+ if (region_device_sz(rdev) < hdr->image_size) {
+ printk(BIOS_ERR, "Component size bigger than cbfs file.\n");
+ return CB_ERR;
+ }
+
+ return CB_SUCCESS;
+}
+
/* TODO: this won't work for SoC's that need to XIP certain modules. */
enum cb_err fsp_load_binary(struct fsp_header *hdr,
const char *name,
@@ -111,7 +143,6 @@
{
struct cbfsf file_desc;
struct region_device file_data;
- void *membase;
if (cbfs_boot_locate(&file_desc, name, NULL)) {
printk(BIOS_ERR, "Could not locate %s in CBFS\n", name);
@@ -120,31 +151,10 @@
cbfs_file_data(&file_data, &file_desc);
- /* Map just enough of the file to be able to parse the header. */
- membase = rdev_mmap(&file_data, FSP_HDR_OFFSET, FSP_HDR_LEN);
-
- if (membase == NULL) {
- printk(BIOS_ERR, "Could not mmap() '%s' FSP header.\n", name);
+ if (fsp_validate_component(hdr, &file_data) != CB_SUCCESS)
return CB_ERR;
- }
- if (fsp_identify(hdr, membase) != CB_SUCCESS) {
- rdev_munmap(&file_data, membase);
- printk(BIOS_ERR, "%s did not have a valid FSP header\n", name);
- return CB_ERR;
- }
-
- rdev_munmap(&file_data, membase);
-
- fsp_print_header_info(hdr);
-
- /* Check if size specified in the header matches the cbfs file size */
- if (region_device_sz(&file_data) < hdr->image_size) {
- printk(BIOS_ERR, "%s size bigger than cbfs file.\n", name);
- return CB_ERR;
- }
-
- /* Check if the binary load address is within expected range */
+ /* Check if the component load address is within expected range */
/* TODO: this doesn't check the current running program footprint. */
if (range_entry_base(range) > hdr->image_base ||
range_entry_end(range) <= hdr->image_base + hdr->image_size) {