summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2023-03-29 15:34:07 +0200
committerLean Sheng Tan <sheng.tan@9elements.com>2023-04-02 06:27:50 +0000
commitf7f7b3bbf6827494985afae5f10312e63d6a8049 (patch)
treef6f3bc60c9e05956cad4b6708b248a52fef83324 /src
parent3453c313acf7d1a6d26ef649b47dc1c3c0c7b677 (diff)
downloadcoreboot-f7f7b3bbf6827494985afae5f10312e63d6a8049.tar.gz
coreboot-f7f7b3bbf6827494985afae5f10312e63d6a8049.tar.bz2
coreboot-f7f7b3bbf6827494985afae5f10312e63d6a8049.zip
soc/intel/alderlake: Add ADL-P 4+4 with 28W TDP
Add the 28W TDP version of the ADL-P with MCHID 0x4629. Verified that all 28W SoCs have the same PL1/PL2 defined in Intel document #655258 "12th Generation Intel Core Processors Datasheet, Volume 1 of 2". Fixes the error seen in coreboot log: [ERROR] unknown SA ID: 0x4629, skipped power Limit Configuration Change-Id: Iad676f083dfd1cceb4df9435d467dc0f31a63f80 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/74116 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com> Reviewed-by: Sean Rhodes <sean@starlabs.systems> Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/brya/variants/aurash/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/banshee/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/kano/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/moli/overridetree.cb2
-rw-r--r--src/mainboard/google/brya/variants/zydron/overridetree.cb2
-rw-r--r--src/mainboard/starlabs/starbook/variants/adl/devtree.c2
-rw-r--r--src/mainboard/system76/adl/variants/darp8/overridetree.cb2
-rw-r--r--src/mainboard/system76/adl/variants/galp6/overridetree.cb2
-rw-r--r--src/soc/intel/alderlake/chip.h7
-rw-r--r--src/soc/intel/alderlake/chipset.cb2
10 files changed, 13 insertions, 12 deletions
diff --git a/src/mainboard/google/brya/variants/aurash/overridetree.cb b/src/mainboard/google/brya/variants/aurash/overridetree.cb
index e40709494fd7..bd3e9d12540e 100644
--- a/src/mainboard/google/brya/variants/aurash/overridetree.cb
+++ b/src/mainboard/google/brya/variants/aurash/overridetree.cb
@@ -50,7 +50,7 @@ chip soc/intel/alderlake
.tdp_pl1_override = 15,
.tdp_pl2_override = 25,
}"
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 64,
}"
device domain 0 on
diff --git a/src/mainboard/google/brya/variants/banshee/overridetree.cb b/src/mainboard/google/brya/variants/banshee/overridetree.cb
index faed00d04ca7..a6b1a087fbd8 100644
--- a/src/mainboard/google/brya/variants/banshee/overridetree.cb
+++ b/src/mainboard/google/brya/variants/banshee/overridetree.cb
@@ -87,7 +87,7 @@ chip soc/intel/alderlake
register "tcc_offset" = "10" # TCC of 90
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 30,
.tdp_pl2_override = 60,
.tdp_pl4 = 90,
diff --git a/src/mainboard/google/brya/variants/kano/overridetree.cb b/src/mainboard/google/brya/variants/kano/overridetree.cb
index 97682bd9d2f4..8b06732b7465 100644
--- a/src/mainboard/google/brya/variants/kano/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kano/overridetree.cb
@@ -83,7 +83,7 @@ chip soc/intel/alderlake
},
}"
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 20,
.tdp_pl2_override = 43,
.tdp_pl4 = 105,
diff --git a/src/mainboard/google/brya/variants/moli/overridetree.cb b/src/mainboard/google/brya/variants/moli/overridetree.cb
index ded70f2f509a..cad69bb95ffa 100644
--- a/src/mainboard/google/brya/variants/moli/overridetree.cb
+++ b/src/mainboard/google/brya/variants/moli/overridetree.cb
@@ -51,7 +51,7 @@ chip soc/intel/alderlake
register "power_limits_config[ADL_P_142_242_282_15W_CORE]" = "{
.tdp_pl1_override = 55,
}"
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 64,
}"
device domain 0 on
diff --git a/src/mainboard/google/brya/variants/zydron/overridetree.cb b/src/mainboard/google/brya/variants/zydron/overridetree.cb
index ed3595bb3a00..49d8302ee1a6 100644
--- a/src/mainboard/google/brya/variants/zydron/overridetree.cb
+++ b/src/mainboard/google/brya/variants/zydron/overridetree.cb
@@ -83,7 +83,7 @@ chip soc/intel/alderlake
},
}"
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 20,
.tdp_pl2_override = 43,
.tdp_pl4 = 105,
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devtree.c b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
index 0b764fdda84d..27ab6c90f21e 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
@@ -16,7 +16,7 @@ void devtree_update(void)
common_config = chip_get_common_soc_structure();
struct soc_power_limits_config *soc_conf_10core =
- &cfg->power_limits_config[ADL_P_282_482_28W_CORE];
+ &cfg->power_limits_config[ADL_P_282_442_482_28W_CORE];
struct soc_power_limits_config *soc_conf_12core =
&cfg->power_limits_config[ADL_P_682_28W_CORE];
diff --git a/src/mainboard/system76/adl/variants/darp8/overridetree.cb b/src/mainboard/system76/adl/variants/darp8/overridetree.cb
index 5f82c443c016..a4dbed835739 100644
--- a/src/mainboard/system76/adl/variants/darp8/overridetree.cb
+++ b/src/mainboard/system76/adl/variants/darp8/overridetree.cb
@@ -1,7 +1,7 @@
chip soc/intel/alderlake
# HACK: Limit PL4 to PL2 to prevent power-off when system is booted on
# battery power. This seems to only happen with the i7 units.
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 20,
.tdp_pl2_override = 56,
.tdp_pl4 = 56, // FIXME: Set to 65
diff --git a/src/mainboard/system76/adl/variants/galp6/overridetree.cb b/src/mainboard/system76/adl/variants/galp6/overridetree.cb
index c10e17adbc9d..cac4df644dc5 100644
--- a/src/mainboard/system76/adl/variants/galp6/overridetree.cb
+++ b/src/mainboard/system76/adl/variants/galp6/overridetree.cb
@@ -1,5 +1,5 @@
chip soc/intel/alderlake
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 28,
.tdp_pl2_override = 60,
.tdp_pl4 = 90,
diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h
index 04a4a2272f86..b6fc43d2877d 100644
--- a/src/soc/intel/alderlake/chip.h
+++ b/src/soc/intel/alderlake/chip.h
@@ -42,7 +42,7 @@ struct ibecc_config {
/* Types of different SKUs */
enum soc_intel_alderlake_power_limits {
ADL_P_142_242_282_15W_CORE,
- ADL_P_282_482_28W_CORE,
+ ADL_P_282_442_482_28W_CORE,
ADL_P_682_28W_CORE,
ADL_P_442_482_45W_CORE,
ADL_P_642_682_45W_CORE,
@@ -102,13 +102,14 @@ static const struct {
{ PCI_DID_INTEL_ADL_P_ID_10, ADL_P_142_242_282_15W_CORE, TDP_15W },
{ PCI_DID_INTEL_ADL_P_ID_7, ADL_P_142_242_282_15W_CORE, TDP_15W },
{ PCI_DID_INTEL_ADL_P_ID_6, ADL_P_142_242_282_15W_CORE, TDP_15W },
- { PCI_DID_INTEL_ADL_P_ID_7, ADL_P_282_482_28W_CORE, TDP_28W },
- { PCI_DID_INTEL_ADL_P_ID_5, ADL_P_282_482_28W_CORE, TDP_28W },
+ { PCI_DID_INTEL_ADL_P_ID_7, ADL_P_282_442_482_28W_CORE, TDP_28W },
+ { PCI_DID_INTEL_ADL_P_ID_5, ADL_P_282_442_482_28W_CORE, TDP_28W },
{ PCI_DID_INTEL_ADL_P_ID_3, ADL_P_682_28W_CORE, TDP_28W },
{ PCI_DID_INTEL_ADL_P_ID_5, ADL_P_442_482_45W_CORE, TDP_45W },
{ PCI_DID_INTEL_ADL_P_ID_4, ADL_P_642_682_45W_CORE, TDP_45W },
{ PCI_DID_INTEL_ADL_P_ID_3, ADL_P_642_682_45W_CORE, TDP_45W },
{ PCI_DID_INTEL_ADL_P_ID_1, ADL_P_442_482_45W_CORE, TDP_45W },
+ { PCI_DID_INTEL_ADL_P_ID_1, ADL_P_282_442_482_28W_CORE, TDP_28W },
{ PCI_DID_INTEL_ADL_M_ID_1, ADL_M_282_12W_CORE, TDP_12W },
{ PCI_DID_INTEL_ADL_M_ID_1, ADL_M_282_15W_CORE, TDP_15W },
{ PCI_DID_INTEL_ADL_M_ID_2, ADL_M_242_CORE, TDP_9W },
diff --git a/src/soc/intel/alderlake/chipset.cb b/src/soc/intel/alderlake/chipset.cb
index 2b9d3802a5bf..b9abe06d16c2 100644
--- a/src/soc/intel/alderlake/chipset.cb
+++ b/src/soc/intel/alderlake/chipset.cb
@@ -8,7 +8,7 @@ chip soc/intel/alderlake
.tdp_pl4 = 123,
}"
- register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
+ register "power_limits_config[ADL_P_282_442_482_28W_CORE]" = "{
.tdp_pl1_override = 28,
.tdp_pl2_override = 64,
.tdp_pl4 = 90,