mb/google/volteer: Convert static ASL files to new DPTF implementation

This patch converts the current DPTF policies from static ASL files into
the new SSDT-based DPTF implementation. All settings are intended to be
copied exactly.

Change-Id: I964c53afbd503d47a07b982672425f0e7a986a3f
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41895
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 90 insertions, 176 deletions

diff --git a/src/drivers/intel/dptf/chip.h b/src/drivers/intel/dptf/chip.h
index 28403a83bd..db4c3aedbd 100644
--- a/src/drivers/intel/dptf/chip.h
+++ b/src/drivers/intel/dptf/chip.h
@@ -4,6 +4,13 @@
 #define _DRIVERS_INTEL_DPTF_CHIP_H_
 
 #include <acpi/acpigen_dptf.h>
+#include <timer.h> /* for MSECS_PER_SEC */
+
+#define DPTF_PASSIVE(src, tgt, tmp, prd) \
+	{.source = DPTF_##src, .target = DPTF_##tgt, .temp = (tmp), .period = (prd)}
+#define DPTF_CRITICAL(src, tmp, typ) \
+	{.source = DPTF_##src, .temp = (tmp), .type = DPTF_CRITICAL_##typ}
+#define TEMP_PCT(t, p) {.temp = (t), .fan_pct = (p)}
 
 struct drivers_intel_dptf_config {
 	struct {
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 5c6f13ccbd..16834ae199 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -5,6 +5,7 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_SX9310
+	select DRIVERS_INTEL_DPTF
 	select DRIVERS_INTEL_PMC
 	select DRIVERS_I2C_MAX98373
 	select DRIVERS_INTEL_SOUNDWIRE
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index 3189767455..ddbc10f4e4 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -52,17 +52,6 @@ DefinitionBlock(
 		#include <ec/google/chromeec/acpi/ec.asl>
 	}
 
-	/* Dynamic Platform Thermal Framework */
-	Scope (\_SB)
-	{
-		/* Per board variant specific definitions. */
-		#include <variant/acpi/dptf.asl>
-		/* Include Tiger Lake soc specific DPTF changes */
-		#include <soc/intel/tigerlake/acpi/dptf.asl>
-		/* Include common dptf ASL files */
-		#include <soc/intel/common/acpi/dptf/dptf.asl>
-	}
-
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 #if CONFIG(VARIANT_HAS_MIPI_CAMERA)
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 88aff01c0a..322389dc07 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -282,7 +282,88 @@ chip soc/intel/tigerlake
 		#From EDS(575683)
 		device pci 00.0 on  end # Host Bridge			0x9A14:U/0x9A12:Y
 		device pci 02.0 on  end # Graphics
-		device pci 04.0 on  end # DPTF				0x9A03
+		device pci 04.0 on
+			# Default DPTF Policy for all Volteer boards if not overridden
+			chip drivers/intel/dptf
+				## Active Policy
+				register "policies.active[0]" = "{.target=DPTF_CPU,
+					.thresholds={TEMP_PCT(85, 90),
+						     TEMP_PCT(80, 69),
+						     TEMP_PCT(75, 56),
+						     TEMP_PCT(70, 46),
+						     TEMP_PCT(65, 36),}}"
+				register "policies.active[1]" = "{.target=DPTF_TEMP_SENSOR_0,
+					.thresholds={TEMP_PCT(50, 90),
+						     TEMP_PCT(47, 69),
+						     TEMP_PCT(45, 56),
+						     TEMP_PCT(42, 46),
+						     TEMP_PCT(39, 36),}}"
+				register "policies.active[2]" = "{.target=DPTF_TEMP_SENSOR_1,
+					.thresholds={TEMP_PCT(50, 90),
+						     TEMP_PCT(47, 69),
+						     TEMP_PCT(45, 56),
+						     TEMP_PCT(42, 46),
+						     TEMP_PCT(39, 36),}}"
+				register "policies.active[3]" = "{.target=DPTF_TEMP_SENSOR_2,
+					.thresholds={TEMP_PCT(50, 90),
+						     TEMP_PCT(47, 69),
+						     TEMP_PCT(45, 56),
+						     TEMP_PCT(42, 46),
+						     TEMP_PCT(39, 36),}}"
+
+				## Passive Policy
+				register "policies.passive[0]" = "DPTF_PASSIVE(CPU,     CPU,           95, 5000)"
+				register "policies.passive[1]" = "DPTF_PASSIVE(CPU,     TEMP_SENSOR_0, 65, 6000)"
+				register "policies.passive[2]" = "DPTF_PASSIVE(CHARGER, TEMP_SENSOR_1, 65, 6000)"
+				register "policies.passive[3]" = "DPTF_PASSIVE(CPU,     TEMP_SENSOR_2, 65, 6000)"
+
+				## Critical Policy
+				register "policies.critical[0]" = "DPTF_CRITICAL(CPU,          105, SHUTDOWN)"
+				register "policies.critical[1]" = "DPTF_CRITICAL(TEMP_SENSOR_0, 75, SHUTDOWN)"
+				register "policies.critical[2]" = "DPTF_CRITICAL(TEMP_SENSOR_1, 75, SHUTDOWN)"
+				register "policies.critical[3]" = "DPTF_CRITICAL(TEMP_SENSOR_2, 75, SHUTDOWN)"
+
+				## Power Limits Control
+				# 10-15W PL1 in 200mW increments, avg over 28-32s interval
+				# PL2 is fixed at 64W, avg over 28-32s interval
+				register "controls.power_limits.pl1" = "{
+					.min_power = 3000,
+					.max_power = 15000,
+					.time_window_min = 28 * MSECS_PER_SEC,
+					.time_window_max = 32 * MSECS_PER_SEC,
+					.granularity = 200,}"
+				register "controls.power_limits.pl2" = "{
+					.min_power = 15000,
+					.max_power = 60000,
+					.time_window_min = 28 * MSECS_PER_SEC,
+					.time_window_max = 32 * MSECS_PER_SEC,
+					.granularity = 1000,}"
+
+				## Charger Performance Control (Control, mA)
+				register "controls.charger_perf[0]" = "{ 255, 1700 }"
+				register "controls.charger_perf[1]" = "{  24, 1500 }"
+				register "controls.charger_perf[2]" = "{  16, 1000 }"
+				register "controls.charger_perf[3]" = "{   8,  500 }"
+
+				## Fan Performance Control (Percent, Speed, Noise, Power)
+				register "controls.fan_perf[0]" = "{  90, 6700, 220, 2200, }"
+				register "controls.fan_perf[1]" = "{  80, 5800, 180, 1800, }"
+				register "controls.fan_perf[2]" = "{  70, 5000, 145, 1450, }"
+				register "controls.fan_perf[3]" = "{  60, 4900, 115, 1150, }"
+				register "controls.fan_perf[4]" = "{  50, 3838,  90,  900, }"
+				register "controls.fan_perf[5]" = "{  40, 2904,  55,  550, }"
+				register "controls.fan_perf[6]" = "{  30, 2337,  30,  300, }"
+				register "controls.fan_perf[7]" = "{  20, 1608,  15,  150, }"
+				register "controls.fan_perf[8]" = "{  10,  800,  10,  100, }"
+				register "controls.fan_perf[9]" = "{   0,    0,   0,   50, }"
+
+				# Fan options
+				register "options.fan.fine_grained_control" = "1"
+				register "options.fan.step_size" = "2"
+
+				device generic 0 on end
+			end
+		end # DPTF				0x9A03
 		device pci 05.0 off end # IPU				0x9A19
 		device pci 06.0 off end # PEG60				0x9A09
 		device pci 07.0 on  end # TBT_PCIe0			0x9A23
diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/dptf.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/dptf.asl
deleted file mode 100644
index ddf8814312..0000000000
--- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/dptf.asl
+++ /dev/null
@@ -1,148 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#define DPTF_CPU_PASSIVE       95
-#define DPTF_CPU_CRITICAL      105
-#define DPTF_CPU_ACTIVE_AC0    85
-#define DPTF_CPU_ACTIVE_AC1    80
-#define DPTF_CPU_ACTIVE_AC2    75
-#define DPTF_CPU_ACTIVE_AC3    70
-#define DPTF_CPU_ACTIVE_AC4    65
-
-#define DPTF_TSR0_SENSOR_ID    0
-#define DPTF_TSR0_SENSOR_NAME  "Thermal Sensor 1"
-#define DPTF_TSR0_PASSIVE      65
-#define DPTF_TSR0_CRITICAL     75
-#define DPTF_TSR0_ACTIVE_AC0   50
-#define DPTF_TSR0_ACTIVE_AC1   47
-#define DPTF_TSR0_ACTIVE_AC2   45
-#define DPTF_TSR0_ACTIVE_AC3   42
-#define DPTF_TSR0_ACTIVE_AC4   39
-
-#define DPTF_TSR1_SENSOR_ID    1
-#define DPTF_TSR1_SENSOR_NAME  "Thermal Sensor 2"
-#define DPTF_TSR1_PASSIVE      65
-#define DPTF_TSR1_CRITICAL     75
-#define DPTF_TSR1_ACTIVE_AC0   50
-#define DPTF_TSR1_ACTIVE_AC1   47
-#define DPTF_TSR1_ACTIVE_AC2   45
-#define DPTF_TSR1_ACTIVE_AC3   42
-#define DPTF_TSR1_ACTIVE_AC4   39
-
-#define DPTF_TSR2_SENSOR_ID    2
-#define DPTF_TSR2_SENSOR_NAME  "Thermal Sensor 3"
-#define DPTF_TSR2_PASSIVE      65
-#define DPTF_TSR2_CRITICAL     75
-#define DPTF_TSR2_ACTIVE_AC0   50
-#define DPTF_TSR2_ACTIVE_AC1   47
-#define DPTF_TSR2_ACTIVE_AC2   45
-#define DPTF_TSR2_ACTIVE_AC3   42
-#define DPTF_TSR2_ACTIVE_AC4   39
-
-#define DPTF_TSR3_SENSOR_ID    3
-#define DPTF_TSR3_SENSOR_NAME  "Thermal Sensor 4"
-#define DPTF_TSR3_PASSIVE      65
-#define DPTF_TSR3_CRITICAL     75
-#define DPTF_TSR3_ACTIVE_AC0   50
-#define DPTF_TSR3_ACTIVE_AC1   47
-#define DPTF_TSR3_ACTIVE_AC2   45
-#define DPTF_TSR3_ACTIVE_AC3   42
-#define DPTF_TSR3_ACTIVE_AC4   39
-
-#define DPTF_ENABLE_CHARGER
-#define DPTF_ENABLE_FAN_CONTROL
-
-/* Charger performance states, board-specific values from charger and EC */
-Name (CHPS, Package () {
-       Package () { 0, 0, 0, 0, 255, 0x6a4, "mA", 0 }, /* 1.7A (MAX) */
-       Package () { 0, 0, 0, 0, 24, 0x600, "mA", 0 },  /* 1.5A */
-       Package () { 0, 0, 0, 0, 16, 0x400, "mA", 0 },  /* 1.0A */
-       Package () { 0, 0, 0, 0, 8, 0x200, "mA", 0 },   /* 0.5A */
-})
-
-/* DFPS: Fan Performance States */
-Name (DFPS, Package () {
-       0,      // Revision
-       /*
-        * TODO : Need to update this Table after characterization.
-        *        These are initial reference values.
-        */
-       /* Control, Trip Point, Speed, NoiseLevel, Power */
-       Package () {90,         0xFFFFFFFF,     6700,   220,    2200},
-       Package () {80,         0xFFFFFFFF,     5800,   180,    1800},
-       Package () {70,         0xFFFFFFFF,     5000,   145,    1450},
-       Package () {60,         0xFFFFFFFF,     4900,   115,    1150},
-       Package () {50,         0xFFFFFFFF,     3838,   90,     900},
-       Package () {40,         0xFFFFFFFF,     2904,   55,     550},
-       Package () {30,         0xFFFFFFFF,     2337,   30,     300},
-       Package () {20,         0xFFFFFFFF,     1608,   15,     150},
-       Package () {10,         0xFFFFFFFF,     800,    10,     100},
-       Package () {0,          0xFFFFFFFF,     0,      0,      50}
-})
-
-Name (DART, Package () {
-       /* Fan effect on CPU */
-       0,      // Revision
-       Package () {
-               /*
-                * Source, Target, Weight, AC0, AC1, AC2, AC3, AC4, AC5, AC6,
-                *      AC7, AC8, AC9
-                */
-               \_SB.DPTF.TFN1, \_SB.PCI0.TCPU, 100, 90, 69, 56, 46, 36, 0, 0,
-                       0, 0, 0
-       },
-       Package () {
-               \_SB.DPTF.TFN1, \_SB.DPTF.TSR0, 100, 90, 69, 56, 46, 36, 0, 0,
-                       0, 0, 0
-       },
-       Package () {
-               \_SB.DPTF.TFN1, \_SB.DPTF.TSR1, 100, 90, 69, 56, 46, 36, 0, 0,
-                       0, 0, 0
-       },
-       Package () {
-               \_SB.DPTF.TFN1, \_SB.DPTF.TSR2, 100, 90, 69, 56, 46, 36, 0, 0,
-                       0, 0, 0
-       },
-       Package () {
-               \_SB.DPTF.TFN1, \_SB.DPTF.TSR3, 100, 90, 69, 56, 46, 36, 0, 0,
-                       0, 0, 0
-       }
-})
-
-
-Name (DTRT, Package () {
-       /* CPU Throttle Effect on CPU */
-       Package () { \_SB.PCI0.TCPU, \_SB.PCI0.TCPU, 100, 50, 0, 0, 0, 0 },
-
-       /* CPU Throttle Effect on TSR1 sensor */
-       Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR1, 100, 60, 0, 0, 0, 0 },
-
-       /* Charger Throttle Effect on Charger (TSR0) */
-       Package () { \_SB.DPTF.TCHG, \_SB.DPTF.TSR0, 100, 60, 0, 0, 0, 0 },
-
-       /* CPU Throttle Effect on TSR2 sensor */
-       Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR2, 100, 60, 0, 0, 0, 0 },
-
-       /* CPU Throttle Effect on TSR3 sensor */
-       Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR3, 100, 60, 0, 0, 0, 0 },
-})
-
-Name (MPPC, Package ()
-{
-       0x2,            /* Revision */
-       Package () {    /* Power Limit 1 */
-               0,      /* PowerLimitIndex, 0 for Power Limit 1 */
-               3000,   /* PowerLimitMinimum */
-               15000,  /* PowerLimitMaximum */
-               28000,  /* TimeWindowMinimum */
-               32000,  /* TimeWindowMaximum */
-               200     /* StepSize */
-       },
-       Package () {    /* Power Limit 2 */
-               1,      /* PowerLimitIndex, 1 for Power Limit 2 */
-               15000,  /* PowerLimitMinimum */
-               60000,  /* PowerLimitMaximum */
-               28000,  /* TimeWindowMinimum */
-               32000,  /* TimeWindowMaximum */
-               1000    /* StepSize */
-       }
-})
diff --git a/src/mainboard/google/volteer/variants/halvor/include/variant/acpi/dptf.asl b/src/mainboard/google/volteer/variants/halvor/include/variant/acpi/dptf.asl
deleted file mode 100644
index 189cafea4c..0000000000
--- a/src/mainboard/google/volteer/variants/halvor/include/variant/acpi/dptf.asl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <baseboard/acpi/dptf.asl>
diff --git a/src/mainboard/google/volteer/variants/malefor/include/variant/acpi/dptf.asl b/src/mainboard/google/volteer/variants/malefor/include/variant/acpi/dptf.asl
deleted file mode 100644
index 189cafea4c..0000000000
--- a/src/mainboard/google/volteer/variants/malefor/include/variant/acpi/dptf.asl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <baseboard/acpi/dptf.asl>
diff --git a/src/mainboard/google/volteer/variants/trondo/include/variant/acpi/dptf.asl b/src/mainboard/google/volteer/variants/trondo/include/variant/acpi/dptf.asl
deleted file mode 100644
index 189cafea4c..0000000000
--- a/src/mainboard/google/volteer/variants/trondo/include/variant/acpi/dptf.asl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <baseboard/acpi/dptf.asl>
diff --git a/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/dptf.asl b/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/dptf.asl
deleted file mode 100644
index 726e381892..0000000000
--- a/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/dptf.asl
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- *
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#include <baseboard/acpi/dptf.asl>