[coreboot-gerrit] Change in coreboot[master]: soc/qualcomm/common: Fix mem_chip_info bugs in QcLib glue

[Julius Werner (Code Review)]

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/63026 )

Change subject: soc/qualcomm/common: Fix mem_chip_info bugs in QcLib glue
......................................................................

soc/qualcomm/common: Fix mem_chip_info bugs in QcLib glue

This patch fixes an issue introduced by CB:59195 when QcLib
doesn't return a mem_chip_info structure to coreboot, and
solves some other minor leftover issues from that patch.

BUG=b:182963902,b:177917361
TEST=Validated on qualcomm sc7280 development board

Signed-off-by: Ravi Kumar Bokka 
Change-Id: I0d59669adaf287d0eb7b58ccb0fe3f98e3d23281
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63026
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
---
M src/soc/qualcomm/common/qclib.c
1 file changed, 17 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/soc/qualcomm/common/qclib.c b/src/soc/qualcomm/common/qclib.c
index 43b6399..b6d04b1 100644
--- a/src/soc/qualcomm/common/qclib.c
+++ b/src/soc/qualcomm/common/qclib.c
@@ -24,22 +24,31 @@

static void write_mem_chip_information(struct qclib_cb_if_table_entry *te)
 {
-	/* Save mem_chip_info in local variables ahead of hook running */
-	mem_chip_addr = (void *)te->blob_address;
+	if (te->size > sizeof(struct mem_chip_info) &&
+	    te->size == mem_chip_info_size((void *)te->blob_address)) {
+		/* Save mem_chip_addr in global variable ahead of hook running */
+		mem_chip_addr = (void *)te->blob_address;
+	}
 }

static void add_mem_chip_info(int unused)
 {
    void *mem_region_base = NULL;
+	size_t size;
+
+	if (!mem_chip_addr) {
+		printk(BIOS_ERR, "Did not receive valid mem_chip_info from QcLib!");
+		return;
+	}
+
+	size = mem_chip_info_size(mem_chip_addr);

/* Add cbmem table */
-	if (sizeof(struct mem_chip_info) != 0)
-		mem_region_base = cbmem_add(CBMEM_ID_MEM_CHIP_INFO,
-					sizeof(struct mem_chip_info));
+	mem_region_base = cbmem_add(CBMEM_ID_MEM_CHIP_INFO, size);
    ASSERT(mem_region_base != NULL);

/* Migrate the data into CBMEM */
-	memcpy(mem_region_base, mem_chip_addr, sizeof(struct mem_chip_info));
+	memcpy(mem_region_base, mem_chip_addr, size);
 }

ROMSTAGE_CBMEM_INIT_HOOK(add_mem_chip_info);
@@ -168,9 +177,8 @@
    qclib_add_if_table_entry(QCLIB_TE_DDR_TRAINING_DATA,
    			 _ddr_training, REGION_SIZE(ddr_training), 0);

-	/* Attempt to read MEM CHIP information */
-	qclib_add_if_table_entry(QCLIB_TE_MEM_CHIP_INFO,
-				mem_chip_addr, sizeof(mem_chip_addr), 0);
+	/* Address and size of this entry will be filled in by QcLib. */
+	qclib_add_if_table_entry(QCLIB_TE_MEM_CHIP_INFO, NULL, 0, 0);

/* Attempt to load PMICCFG Blob */
    data_size = cbfs_load(CONFIG_CBFS_PREFIX "/pmiccfg",