[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake/vr_config: Add loadline defaults

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34938 )

Change subject: soc/intel/skylake/vr_config: Add loadline defaults
......................................................................

soc/intel/skylake/vr_config: Add loadline defaults

In addition to zero IccMax specified by mainboard with socketed CPU, allow
a zero LoadLine default.
The SoC code will fill in the default AC/DC LoadLine values are per
datasheets:

* "7th Generation Intel® Processor Families for H Platforms, Vol 1"
  Document Number: 335190-003
* "7th Generation Intel® Processor Families for S Platforms and
  Intel ®Core™ X-Series Processor Family, Vol 1"
  Document Number: 335195-003

The AC/DC LoadLine is CPU and board specific.
TODO: Find out how to get the LoadLine from vendor firmware and find out
how to map those to different CPU LoadLines.

Change-Id: I849845ced094697e8700470b4af95ad0afb98e3e
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34938
Reviewed-by: Philipp Deppenwiese 
Reviewed-by: Maxim Polyakov 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/skylake/include/soc/vr_config.h
M src/soc/intel/skylake/vr_config.c
2 files changed, 84 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, but someone else must approve
  Maxim Polyakov: Looks good to me, approved

diff --git a/src/soc/intel/skylake/include/soc/vr_config.h b/src/soc/intel/skylake/include/soc/vr_config.h
index 465e248..aebbbdf 100644
--- a/src/soc/intel/skylake/include/soc/vr_config.h
+++ b/src/soc/intel/skylake/include/soc/vr_config.h
@@ -68,6 +68,7 @@
 };

#define VR_CFG_AMP(i) ((i) * 4)
+#define VR_CFG_MOHMS(i) (uint16_t)((i) * 100)

#if CONFIG(PLATFORM_USES_FSP1_1)
 /* VrConfig Settings for 5 domains
diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c
index 33ce54a..089dd5d 100644
--- a/src/soc/intel/skylake/vr_config.c
+++ b/src/soc/intel/skylake/vr_config.c
@@ -220,6 +220,81 @@
    return 0;
 }

+#if CONFIG(PLATFORM_USES_FSP2_0)
+static uint16_t get_sku_ac_dc_loadline(const int domain)
+{
+	static uint16_t mch_id = 0, igd_id = 0;
+	if (!mch_id) {
+		struct device *dev = pcidev_path_on_root(SA_DEVFN_ROOT);
+		mch_id = pci_read_config16(dev, PCI_DEVICE_ID);
+	}
+	if (!igd_id) {
+		struct device *dev = pcidev_path_on_root(SA_DEVFN_IGD);
+		if (dev)
+			igd_id = pci_read_config16(dev, PCI_DEVICE_ID);
+		else
+			igd_id = 0xffff;
+	}
+
+	switch (mch_id) {
+	case PCI_DEVICE_ID_INTEL_KBL_ID_S: /* fallthrough */
+	case PCI_DEVICE_ID_INTEL_KBL_ID_DT: /* fallthrough */
+	case PCI_DEVICE_ID_INTEL_KBL_ID_DT_2: {
+		static const uint16_t loadline[NUM_VR_DOMAINS] = {
+			VR_CFG_MOHMS(0), /* Not specified */
+			VR_CFG_MOHMS(2.1),
+			VR_CFG_MOHMS(3.1),
+			VR_CFG_MOHMS(3.1),
+		};
+
+		return loadline[domain];
+	}
+	case PCI_DEVICE_ID_INTEL_KBL_ID_H: {
+		static const uint16_t loadline[NUM_VR_DOMAINS] = {
+			VR_CFG_MOHMS(10),
+			VR_CFG_MOHMS(1.8),
+			VR_CFG_MOHMS(2.65),
+			VR_CFG_MOHMS(2.65),
+		};
+
+		return loadline[domain];
+	}
+	case PCI_DEVICE_ID_INTEL_KBL_ID_Y: {
+		uint16_t loadline[NUM_VR_DOMAINS] = {
+			VR_CFG_MOHMS(18),
+			VR_CFG_MOHMS(5.9),
+			VR_CFG_MOHMS(5.7),
+			VR_CFG_MOHMS(5.7),
+		};
+
+		if (igd_id == PCI_DEVICE_ID_INTEL_AML_GT2_ULX)
+			loadline[VR_IA_CORE] = VR_CFG_MOHMS(4);
+
+		return loadline[domain];
+	}
+	case PCI_DEVICE_ID_INTEL_KBL_U_R: /* fallthrough */
+	case PCI_DEVICE_ID_INTEL_KBL_ID_U: {
+		uint16_t loadline[NUM_VR_DOMAINS] = {
+			VR_CFG_MOHMS(10.3),
+			VR_CFG_MOHMS(2.4),
+			VR_CFG_MOHMS(3.1),
+			VR_CFG_MOHMS(3.1),
+		};
+
+		if (igd_id == PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22) {
+			loadline[VR_GT_UNSLICED] = VR_CFG_MOHMS(6);
+			loadline[VR_GT_SLICED] = VR_CFG_MOHMS(6);
+		}
+
+		return loadline[domain];
+	}
+	default:
+		printk(BIOS_ERR, "ERROR: Unknown MCH in VR-config\n");
+	}
+	return 0;
+}
+#endif
+
 void fill_vr_domain_config(void *params,
    	int domain, const struct vr_config *chip_cfg)
 {
@@ -251,7 +326,13 @@
    vr_params->VrVoltageLimit[domain] = cfg->voltage_limit;

#if CONFIG(PLATFORM_USES_FSP2_0)
-	vr_params->AcLoadline[domain] = cfg->ac_loadline;
-	vr_params->DcLoadline[domain] = cfg->dc_loadline;
+	if (cfg->ac_loadline)
+		vr_params->AcLoadline[domain] = cfg->ac_loadline;
+	else
+		vr_params->AcLoadline[domain] = get_sku_ac_dc_loadline(domain);
+	if (cfg->dc_loadline)
+		vr_params->DcLoadline[domain] = cfg->dc_loadline;
+	else
+		vr_params->DcLoadline[domain] = get_sku_ac_dc_loadline(domain);
 #endif
 }