[coreboot-gerrit] Change in coreboot[master]: xeon_sp/cpx: Fix get_system_memory_map to return the correct address

[Johnny Lin (Code Review)]

Johnny Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44502 )

Change subject: xeon_sp/cpx: Fix get_system_memory_map to return the correct address
......................................................................

xeon_sp/cpx: Fix get_system_memory_map to return the correct address

Similar to CB:43336, the HOB structure is actually a 8 byte address
pointing to the HOB data.

Tested=Verified the values of the hob fields are the same printed by
soc_display_memmap_hob().

Change-Id: I348d3cd80a56e86d22f20fcadf0316b462b86829
Signed-off-by: Johnny Lin 
---
M src/soc/intel/xeon_sp/cpx/soc_util.c
1 file changed, 7 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/44502/1

diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c
index fb78910a1..4153104 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_util.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_util.c
@@ -29,14 +29,17 @@
 {
    size_t hob_size;
    const uint8_t mem_hob_guid[16] = FSP_SYSTEM_MEMORYMAP_HOB_GUID;
+	const struct SystemMemoryMapHob **memmap_addr;

-	const void *memmap_addr = fsp_find_extension_hob_by_guid(mem_hob_guid, &hob_size);
-	assert(memmap_addr != NULL && hob_size != 0);
-	printk(BIOS_DEBUG, "FSP_SYSTEM_MEMORYMAP_HOB_GUID hob_size: %ld\n", hob_size);
+	memmap_addr = (const struct SystemMemoryMapHob **)
+		fsp_find_extension_hob_by_guid(mem_hob_guid, &hob_size);
+	/* hob_size is the size of the 8-byte address not the hob data */
+	assert(memmap_addr != NULL && *memmap_addr != NULL && hob_size != 0);

-	return (const struct SystemMemoryMapHob *) memmap_addr;
+	return (const struct SystemMemoryMapHob *)*memmap_addr;
 }

+
 void get_cpu_info_from_apicid(uint32_t apicid, uint32_t core_bits, uint32_t thread_bits,
    uint8_t *package, uint8_t *core, uint8_t *thread)
 {