Change in coreboot[master]: mb/google/zork/var/vilboz: Add Mainboard Type for VCORE IC

[Martin Roth (Code Review)]

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49683 )

Change subject: mb/google/zork/var/vilboz: Add Mainboard Type for VCORE IC
......................................................................

mb/google/zork/var/vilboz: Add Mainboard Type for VCORE IC

To define Mainboard Type config, use the fw_config bit[26].
Check MB Type to modify SDLE settings for different VCORE IC.

BUG=b:177193131
BRANCH=zork

Signed-off-by: John Su 
Change-Id: If153c0a3e641ae32ef89737925bd9f62dfb71f3d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49683
Tested-by: build bot (Jenkins) 
Reviewed-by: EricR Lai 
Reviewed-by: Kangheui Won 
---
M src/mainboard/google/zork/variants/baseboard/helpers.c
M src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/zork/variants/vilboz/Makefile.inc
A src/mainboard/google/zork/variants/vilboz/romstage.c
4 files changed, 27 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  EricR Lai: Looks good to me, approved
  Kangheui Won: Looks good to me, approved

diff --git a/src/mainboard/google/zork/variants/baseboard/helpers.c b/src/mainboard/google/zork/variants/baseboard/helpers.c
index 00e7a03..38f0a72 100644
--- a/src/mainboard/google/zork/variants/baseboard/helpers.c
+++ b/src/mainboard/google/zork/variants/baseboard/helpers.c
@@ -43,6 +43,9 @@
    /* SAR presence */
    FW_CONFIG_MASK_SAR = 0x7,
    FW_CONFIG_SHIFT_SAR = 23,
+	/* Mainboard Type for VCORE IC */
+	FW_CONFIG_MASK_MB_TYPE = 0x1,
+	FW_CONFIG_SHIFT_MB_TYPE = 26,
    /* Fan information */
    FW_CONFIG_MASK_FAN = 0x3,
    FW_CONFIG_SHIFT_FAN = 27,
@@ -86,6 +89,11 @@
    return extract_field(FW_CONFIG_MASK_SAR, FW_CONFIG_SHIFT_SAR);
 }

+int variant_gets_mb_type_config(void)
+{
+	return extract_field(FW_CONFIG_MASK_MB_TYPE, FW_CONFIG_SHIFT_MB_TYPE);
+}
+
 int variant_has_emmc(void)
 {
    return !!extract_field(FW_CONFIG_MASK_EMMC, FW_CONFIG_SHIFT_EMMC);
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
index 230f059..c8873ab 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
@@ -64,6 +64,8 @@
 /* Retrieve attributes from FW_CONFIG in CBI. */
 /* Return value of SAR config. */
 int variant_gets_sar_config(void);
+/* Return value of Mainboard Type config */
+int variant_gets_mb_type_config(void);
 /* Return 0 if non-existent, 1 if present. */
 int variant_has_emmc(void);
 /* Return 0 if non-existent, 1 if present. */
diff --git a/src/mainboard/google/zork/variants/vilboz/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/Makefile.inc
index af38c88..f8ed418 100644
--- a/src/mainboard/google/zork/variants/vilboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/vilboz/Makefile.inc
@@ -2,5 +2,7 @@

subdirs-y += ./spd

+romstage-y += romstage.c
+
 ramstage-y += variant.c
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/zork/variants/vilboz/romstage.c b/src/mainboard/google/zork/variants/vilboz/romstage.c
new file mode 100644
index 0000000..1e43892
--- /dev/null
+++ b/src/mainboard/google/zork/variants/vilboz/romstage.c
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+#include <console/console.h>
+
+void variant_updm_update(FSP_M_CONFIG *mcfg)
+{
+	printk(BIOS_INFO, "%s UPDM update\n", __func__);
+	if (variant_gets_mb_type_config()) {
+		mcfg->telemetry_vddcr_vdd_slope_mA = 32453;
+		mcfg->telemetry_vddcr_vdd_offset = 168;
+		mcfg->telemetry_vddcr_soc_slope_mA = 22644;
+		mcfg->telemetry_vddcr_soc_offset = -70;
+	}
+}