Johnny Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42903 )
Change subject: mb/ocp/deltalake: Use VPD data to configure FSP UPD at romstage ......................................................................
mb/ocp/deltalake: Use VPD data to configure FSP UPD at romstage
Read VPD variable 'FSP_LOG' to decide enabling FSP log or not. With VPD_RW_THEN_RO, VPD_RW takes precedence over VPD_RO, and would be set to enabled if both places cannot find it.
Tested=On OCP Delta Lake, use vpd to create and set FSP_LOG and verified the results are expected.
Change-Id: I0b3463acedd90e8e17f7e4eedc2fab63644f87e1 Signed-off-by: Johnny Lin johnny_lin@wiwynn.com --- M src/mainboard/ocp/deltalake/romstage.c 1 file changed, 24 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/42903/1
diff --git a/src/mainboard/ocp/deltalake/romstage.c b/src/mainboard/ocp/deltalake/romstage.c index f56f7c7..5bca0bd 100644 --- a/src/mainboard/ocp/deltalake/romstage.c +++ b/src/mainboard/ocp/deltalake/romstage.c @@ -2,6 +2,7 @@
#include <console/console.h> #include <drivers/ipmi/ipmi_kcs.h> +#include <drivers/vpd/vpd.h> #include <fsp/api.h> #include <FspmUpd.h> #include <soc/romstage.h> @@ -9,6 +10,28 @@ #include "cpxsp_dl_iio.h" #include "ipmi.h"
+/* Define the VPD keys for UPD variables that can be overwritten */ +#define FSP_LOG "FSP_LOG" + +/* + * Search for VPD_RW first then VPD_RO for UPD config variables, + * overwrites them from VPD if it's found. + */ +static void mainboard_config_upd(FSPM_UPD *mupd) +{ + uint8_t val; + + /* Send FSP log message to SOL */ + if (vpd_get_bool(FSP_LOG, VPD_RW_THEN_RO, &val)) + mupd->FspmConfig.SerialIoUartDebugEnable = val; + else { + printk(BIOS_ERR, "Failed to get VPD %s, default set SerialIoUartDebugEnable to 1\n", + FSP_LOG); + mupd->FspmConfig.SerialIoUartDebugEnable = 1; + } + mupd->FspmConfig.SerialIoUartDebugIoBase = 0x2f8; +} + /* Update bifurcation settings according to different Configs */ static void oem_update_iio(FSPM_UPD *mupd) { @@ -54,10 +77,6 @@
static void mainboard_config_iio(FSPM_UPD *mupd) { - /* Send FSP log message to SOL */ - mupd->FspmConfig.SerialIoUartDebugEnable = 1; - mupd->FspmConfig.SerialIoUartDebugIoBase = 0x2f8; - /* Enable only PCH: PCIE[8:11] */ for (uint8_t i = 0; i < 20; i++) { if (i >= 8 && i <= 11) @@ -102,4 +121,5 @@
mainboard_config_gpios(mupd); mainboard_config_iio(mupd); + mainboard_config_upd(mupd); }