[S] Change in coreboot[main]: drivers/intel/fsp2_0: Avoid unnecessary extra CBFS access

[Jérémy Compostella (Code Review)]

Jérémy Compostella has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81256?usp=email )

Change subject: drivers/intel/fsp2_0: Avoid unnecessary extra CBFS access
......................................................................

drivers/intel/fsp2_0: Avoid unnecessary extra CBFS access

fsp_mrc_version() function does not need to perform a CBFS access to
to get an address to the FSP-M blob as the caller,
do_fsp_memory_init(), already has it loaded. In addition to make the
code simpler, it avoids an unnecessary decompression of the FSP blob
if `FSP_COMPRESS_FSP_M_LZ4' or `FSP_COMPRESS_FSP_M_LZMA' are set.

TEST=Verified on Meteor Lake rex

Change-Id: If355b5811a09a0b76acc8a297db719d54caedc54
Signed-off-by: Jeremy Compostella 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81256
Reviewed-by: Shuo Liu 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
Reviewed-by: Bora Guvendik 
---
M src/drivers/intel/fsp2_0/memory_init.c
1 file changed, 3 insertions(+), 9 deletions(-)

Approvals:
  Shuo Liu: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Bora Guvendik: Looks good to me, approved
  Arthur Heymans: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 27921c6..dc725c3 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -259,23 +259,17 @@
  * MRC version is by reading the FSP_PRODUCDER_DATA_TABLES
  * from the FSP-M binary (by parsing the FSP header).
  */
-static uint32_t fsp_mrc_version(void)
+static uint32_t fsp_mrc_version(const struct fsp_header *hdr)
 {
    uint32_t ver = 0;
 #if CONFIG(MRC_CACHE_USING_MRC_VERSION)
-	size_t fspm_blob_size;
-	const char *fspm_cbfs = soc_select_fsp_m_cbfs();
-	void *fspm_blob_file = cbfs_map(fspm_cbfs, &fspm_blob_size);
-	if (!fspm_blob_file)
-		return 0;
-
+	void *fspm_blob_file = (void *)(uintptr_t)hdr->image_base;
    FSP_PRODUCER_DATA_TABLES *ft = fspm_blob_file + FSP_HDR_OFFSET;
    FSP_PRODUCER_DATA_TYPE2 *table2 = &ft->FspProduceDataType2;
    size_t mrc_version_size = sizeof(table2->MrcVersion);
    for (size_t i = 0; i < mrc_version_size; i++) {
    	ver |= (table2->MrcVersion[i] << ((mrc_version_size - 1) - i) * 8);
    }
-	cbfs_unmap(fspm_blob_file);
 #endif
    return ver;
 }
@@ -349,7 +343,7 @@
    post_code(POSTCODE_MEM_PREINIT_PREP_START);

if (CONFIG(MRC_CACHE_USING_MRC_VERSION))
-		version = fsp_mrc_version();
+		version = fsp_mrc_version(hdr);
    else
    	version = fsp_memory_settings_version(hdr);