mb, soc: change mainboard_get_dram_part_num() prototype

Change mainboard_get_dram_part_num() to return a constant character
pointer to a null-terminated C string and to take no input
parameters.  This also addresses the issue that different SOCs and
motherboards were using different definitions for
mainboard_get_dram_part_num by consolidating to a single definition.

BUG=b:169774661, b:168724473
TEST="emerge-volteer coreboot && emerge-dedede coreboot && emerge-hatch
coreboot" and verify build completes successfully.

Change-Id: Ie7664eab65a2b9e25b7853bf68baf2525b040487
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45873
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nick Vaccaro
2020-09-30 09:49:05 -07:00
parent aef9ac97c7
commit 0ed02d00cb
13 changed files with 59 additions and 45 deletions

View File

@@ -6,7 +6,7 @@
#include <fsp/api.h>
/* Provide a callback to allow mainboard to override the DRAM part number. */
bool mainboard_get_dram_part_num(const char **part_num, size_t *len);
const char *mainboard_get_dram_part_num(void);
void mainboard_memory_init_params(FSPM_UPD *mupd);
void systemagent_early_init(void);
void romstage_pch_init(void);

View File

@@ -21,10 +21,10 @@
0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \
}
bool __weak mainboard_get_dram_part_num(const char **part_num, size_t *len)
const char * __weak mainboard_get_dram_part_num(void)
{
/* Default weak implementation, no need to override part number. */
return false;
return NULL;
}
/* Save the DIMM information for SMBIOS table 17 */
@@ -42,7 +42,7 @@ static void save_dimm_info(void)
FSP_SMBIOS_MEMORY_INFO_GUID;
const uint8_t *serial_num;
const char *dram_part_num = NULL;
size_t dram_part_num_len;
size_t dram_part_num_len = 0;
bool is_dram_part_overridden = false;
/* Locate the memory info HOB, presence validated by raminit */
@@ -66,8 +66,11 @@ static void save_dimm_info(void)
memset(mem_info, 0, sizeof(*mem_info));
/* Allow mainboard to override DRAM part number. */
is_dram_part_overridden = mainboard_get_dram_part_num(&dram_part_num,
&dram_part_num_len);
dram_part_num = mainboard_get_dram_part_num();
if (dram_part_num) {
dram_part_num_len = strlen(dram_part_num);
is_dram_part_overridden = true;
}
/* Save available DIMM information */
index = 0;