soc/amd/mendocino: Remove the SPL DPTC parameter

The SPL parameter for DPTC settings is not available for STT-enabled
platforms. It needs to be removed to avoid confusing STT calculations.

BUG=b:265267957
BRANCH=none
TEST=Run the WebGL aquarium with 5000 fish and verify that
there are no power drop peaks.

Change-Id: I8e6dad7d24883f8aadce83ebac401ecd4137d61a
Signed-off-by: Chris Wang <chris.wang@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73124
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Van Patten <timvp@google.com>

4 files changed, 1 insertions, 14 deletions

diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index 698d8c3258a6..c92131c2c345 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -260,6 +260,7 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW"                     = "30000"
 	register "slow_ppt_time_constant_s"              = "5"
 	register "stapm_time_constant_s"                 = "275"
+	# Remove the sustained_power_limit_mW when STT is enabled
 	register "sustained_power_limit_mW"              = "15000"
 	register "thermctl_limit_degreeC"                = "100"
 	register "vrm_current_limit_mA"                  = "28000"
diff --git a/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb b/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
index 00c143b00867..b34e2e35a903 100644
--- a/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
@@ -11,8 +11,6 @@ fw_config
 end
 
 chip soc/amd/mendocino
-	# Power table for tablet mode
-	register "sustained_power_limit_mW_tablet" = "12000"
 
 	register "i2c[0]" = "{
 		.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb b/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb
index f2d7a75d523b..65c3231c9686 100644
--- a/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb
@@ -35,7 +35,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW" = "30000"
 	register "slow_ppt_limit_mW" = "18000"
 	register "slow_ppt_time_constant_s" = "7"
-	register "sustained_power_limit_mW" = "15000"
 
 	register "stt_min_limit" = "7000"
 	register "stt_m1" = "0x148"
@@ -47,7 +46,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_B" = "20000"
 	register "slow_ppt_limit_mW_B" = "13000"
 	register "slow_ppt_time_constant_s_B" = "5"
-	register "sustained_power_limit_mW_B" = "10000"
 
 	register "stt_min_limit_B" = "5000"
 	register "stt_m1_B" = "0x11F"
@@ -59,7 +57,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_C" = "30000"
 	register "slow_ppt_limit_mW_C" = "22000"
 	register "slow_ppt_time_constant_s_C" = "10"
-	register "sustained_power_limit_mW_C" = "15000"
 
 	register "stt_min_limit_C" = "10000"
 	register "stt_m1_C" = "0x1A4"
@@ -71,7 +68,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_D" = "25000"
 	register "slow_ppt_limit_mW_D" = "15000"
 	register "slow_ppt_time_constant_s_D" = "8"
-	register "sustained_power_limit_mW_D" = "10000"
 
 	register "stt_min_limit_D" = "8000"
 	register "stt_m1_D" = "0x1C3"
@@ -83,7 +79,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_E" = "22000"
 	register "slow_ppt_limit_mW_E" = "15000"
 	register "slow_ppt_time_constant_s_E" = "4"
-	register "sustained_power_limit_mW_E" = "12000"
 
 	register "stt_min_limit_E" = "7000"
 	register "stt_m1_E" = "0x114"
@@ -96,7 +91,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_F" = "18000"
 	register "slow_ppt_limit_mW_F" = "12000"
 	register "slow_ppt_time_constant_s_F" = "2"
-	register "sustained_power_limit_mW_F" = "9000"
 
 	register "stt_min_limit_F" = "5000"
 	register "stt_m1_F" = "0x15C"
diff --git a/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb b/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
index c9ac6fc0c7d0..755f96f3b28f 100644
--- a/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/winterhold/overridetree.cb
@@ -35,7 +35,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW" = "30000"
 	register "slow_ppt_limit_mW" = "25000"
 	register "slow_ppt_time_constant_s" = "5"
-	register "sustained_power_limit_mW" = "15000"
 
 	register "stt_min_limit" = "15000"
 	register "stt_m1" = "0x18F"
@@ -47,7 +46,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_B" = "15000"
 	register "slow_ppt_limit_mW_B" = "15000"
 	register "slow_ppt_time_constant_s_B" = "5"
-	register "sustained_power_limit_mW_B" = "10500"
 
 	register "stt_min_limit_B" = "10500"
 	register "stt_m1_B" = "0x18F"
@@ -59,7 +57,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_C" = "30000"
 	register "slow_ppt_limit_mW_C" = "25000"
 	register "slow_ppt_time_constant_s_C" = "5"
-	register "sustained_power_limit_mW_C" = "15000"
 
 	register "stt_min_limit_C" = "15000"
 	register "stt_m1_C" = "0x152"
@@ -71,7 +68,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_D" = "15000"
 	register "slow_ppt_limit_mW_D" = "15000"
 	register "slow_ppt_time_constant_s_D" = "5"
-	register "sustained_power_limit_mW_D" = "10500"
 
 	register "stt_min_limit_D" = "10500"
 	register "stt_m1_D" = "0x152"
@@ -83,7 +79,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_E" = "24000"
 	register "slow_ppt_limit_mW_E" = "20000"
 	register "slow_ppt_time_constant_s_E" = "5"
-	register "sustained_power_limit_mW_E" = "12000"
 
 	register "stt_min_limit_E" = "12000"
 	register "stt_m1_E" = "0x18F"
@@ -96,7 +91,6 @@ chip soc/amd/mendocino
 	register "fast_ppt_limit_mW_F" = "12000"
 	register "slow_ppt_limit_mW_F" = "12000"
 	register "slow_ppt_time_constant_s_F" = "5"
-	register "sustained_power_limit_mW_F" = "8000"
 
 	register "stt_min_limit_F" = "8000"
 	register "stt_m1_F" = "0x18F"