From b824f7dbae82f9dba336b2f29f2f9ed9b3e617aa Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Mon, 9 Dec 2019 08:56:39 +0100 Subject: soc/intel/skylake/vr_config: Use lookup table by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the board doesn't provide VRconfig in devicetree make sure to use the lookup table for IccMax instead of defaults for some mobile SoC. Also use decimal values instead of hex. Change-Id: If31063f9b483a3bbd6cc90df1c1b76b4efc66445 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/37598 Reviewed-by: Maxim Polyakov Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/soc/intel/skylake/vr_config.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c index 54dfd31ebe..9a4ddd899a 100644 --- a/src/soc/intel/skylake/vr_config.c +++ b/src/soc/intel/skylake/vr_config.c @@ -31,9 +31,9 @@ static const struct vr_config default_configs[NUM_VR_DOMAINS] = { .psi3threshold = VR_CFG_AMP(1), .psi3enable = 0, .psi4enable = 0, - .imon_slope = 0x0, - .imon_offset = 0x0, - .icc_max = VR_CFG_AMP(7), + .imon_slope = 0, + .imon_offset = 0, + .icc_max = 0, .voltage_limit = 1520, }, [VR_IA_CORE] = { @@ -43,9 +43,9 @@ static const struct vr_config default_configs[NUM_VR_DOMAINS] = { .psi3threshold = VR_CFG_AMP(1), .psi3enable = 0, .psi4enable = 0, - .imon_slope = 0x0, - .imon_offset = 0x0, - .icc_max = VR_CFG_AMP(34), + .imon_slope = 0, + .imon_offset = 0, + .icc_max = 0, .voltage_limit = 1520, }, [VR_GT_UNSLICED] = { @@ -55,9 +55,9 @@ static const struct vr_config default_configs[NUM_VR_DOMAINS] = { .psi3threshold = VR_CFG_AMP(1), .psi3enable = 0, .psi4enable = 0, - .imon_slope = 0x0, - .imon_offset = 0x0, - .icc_max = VR_CFG_AMP(35), + .imon_slope = 0, + .imon_offset = 0, + .icc_max = 0, .voltage_limit = 1520, }, [VR_GT_SLICED] = { @@ -67,9 +67,9 @@ static const struct vr_config default_configs[NUM_VR_DOMAINS] = { .psi3threshold = VR_CFG_AMP(1), .psi3enable = 0, .psi4enable = 0, - .imon_slope = 0x0, - .imon_offset = 0x0, - .icc_max = VR_CFG_AMP(35), + .imon_slope = 0, + .imon_offset = 0, + .icc_max = 0, .voltage_limit = 1520, }, }; @@ -334,6 +334,7 @@ void fill_vr_domain_config(void *params, vr_params->Psi4Enable[domain] = cfg->psi4enable; vr_params->ImonSlope[domain] = cfg->imon_slope; vr_params->ImonOffset[domain] = cfg->imon_offset; + /* If board provided non-zero value, use it. */ if (cfg->icc_max) vr_params->IccMax[domain] = cfg->icc_max; -- cgit v1.2.3