Change in coreboot[master]: mb/google/dedede: Convert static DPTF ASL into devicetree entries
Tim Wawrzynczak has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
mb/google/dedede: Convert static DPTF ASL into devicetree entries
Since there is now a mechanism to generate DPTF ACPI tables and methods at runtime, dedede should switch to using that instead of raw ASL files. This patch converts the existing .asl files into devicetree entries.
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: I6bb6e6e15f50a1e510080e16bbca09dfc5f16b1a --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/variants/baseboard/devicetree.cb D src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl D src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/dedede/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/drawcia/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledee/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl 10 files changed, 32 insertions(+), 76 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/43422/1
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index dcea3fa..e8b7cf5 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -1,8 +1,10 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE def_bool n select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 + select DPTF_USE_EISA_HID select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID + select DRIVERS_INTEL_DPTF select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI select EC_GOOGLE_CHROMEEC @@ -17,6 +19,7 @@ select MAINBOARD_HAS_SPI_TPM_CR50 select MAINBOARD_HAS_TPM2 select SOC_INTEL_JASPERLAKE + select SOC_INTEL_COMMON_BLOCK_DTT
if BOARD_GOOGLE_BASEBOARD_DEDEDE
diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index e064d9b..933ca1a 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -55,13 +55,4 @@ /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> } - - /* Dynamic Platform Thermal Framework */ - Scope (_SB) - { - /* Per board variant specific definitions. */ - #include <variant/acpi/dptf.asl> - /* Include common dptf ASL files */ - #include <soc/intel/common/acpi/dptf/dptf.asl> - } } diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index 32f6690..7868e0a 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -166,7 +166,35 @@ device domain 0 on device pci 00.0 on end # Host Bridge device pci 02.0 on end # Integrated Graphics Device - device pci 04.0 on end # SA Thermal device + device pci 04.0 on + chip drivers/intel/dptf + register "policies.passive[0]" = "DPTF_PASSIVE(CPU, CPU, 90, 1000)" + register "policies.passive[1]" = "DPTF_PASSIVE(CPU, TEMP_SENSOR_0, 80, 6000)" + register "policies.passive[2]" = "DPTF_PASSIVE(CPU, TEMP_SENSOR_1, 55, 1500)" + + register "policies.critical[0]" = "DPTF_CRITICAL(CPU, 99, SHUTDOWN)" + register "policies.critical[1]" = "DPTF_CRITICAL(TEMP_SENSOR_0, 90, SHUTDOWN)" + register "policies.critical[2]" = "DPTF_CRITICAL(TEMP_SENSOR_1, 80, SHUTDOWN)" + + register "controls.power_limits.pl1" = "{ + .min_power = 3000, + .max_power = 6000, + .time_window_min = 1 * MSECS_PER_SEC, + .time_window_max = 1 * MSECS_PER_SEC, + .granularity = 200,}" + register "controls.power_limits.pl2" = "{ + .min_power = 6000, + .max_power = 20000, + .time_window_min = 1 * MSECS_PER_SEC, + .time_window_max = 1 * MSECS_PER_SEC, + .granularity = 1000,}" + + register "options.tsr[0].desc" = ""Memory"" + register "options.tsr[1].desc" = ""Ambient"" + + device generic 0 on end + end + end # SA Thermal device device pci 05.0 off end # IPU device pci 09.0 off end # Intel Trace Hub device pci 12.6 off end # GSPI 2 diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl deleted file mode 100644 index f6b16b4..0000000 --- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl +++ /dev/null @@ -1,48 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Below values might change after Thermal Tuning. */ -#define DPTF_CPU_PASSIVE 90 -#define DPTF_CPU_CRITICAL 99 - -#define DPTF_TSR0_SENSOR_ID 0 -#define DPTF_TSR0_SENSOR_NAME "Memory" -#define DPTF_TSR0_PASSIVE 80 -#define DPTF_TSR0_CRITICAL 90 - -#define DPTF_TSR1_SENSOR_ID 1 -#define DPTF_TSR1_SENSOR_NAME "Ambient" -#define DPTF_TSR1_PASSIVE 55 -#define DPTF_TSR1_CRITICAL 80 - -Name (DTRT, Package () { - /* CPU Throttle Effect on CPU */ - Package () { _SB.PCI0.TCPU, _SB.PCI0.TCPU, 100, 100, 0, 0, 0, 0 }, - - /* CPU Effect on Temp Sensor 0 */ - Package () { _SB.PCI0.TCPU, _SB.DPTF.TSR0, 100, 600, 0, 0, 0, 0 }, - - /* CPU Effect on Temp Sensor 1 */ - Package () { _SB.PCI0.TCPU, _SB.DPTF.TSR1, 100, 150, 0, 0, 0, 0 }, -}) - -Name (MPPC, Package () -{ - 0x2, /* Revision */ - Package () { /* Power Limit 1 */ - 0, /* PowerLimitIndex, 0 for Power Limit 1 */ - 3000, /* PowerLimitMinimum */ - 6000, /* PowerLimitMaximum */ - 1000, /* TimeWindowMinimum */ - 1000, /* TimeWindowMaximum */ - 200 /* StepSize */ - }, - - Package () { /* Power Limit 2 */ - 1, /* PowerLimitIndex, 1 for Power Limit 2 */ - 6000, /* PowerLimitMinimum */ - 20000, /* PowerLimitMaximum */ - 1000, /* TimeWindowMinimum */ - 1000, /* TimeWindowMaximum */ - 1000 /* StepSize */ - } -}) diff --git a/src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/boten/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/dedede/variants/dedede/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/dedede/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/dedede/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/dedede/variants/drawcia/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/drawcia/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/drawcia/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/dedede/variants/waddledee/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/waddledee/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/waddledee/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/dedede/variants/waddledoo/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/waddledoo/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/dedede/variants/wheelie/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/dptf.asl>
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3: Code-Review+1
We need this for create new variant of dedede. @Karthik, would you like to help review it.
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })
DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })
IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { _SB.PCI0.LPCB.EC0.FAND = 0xFF }
Return (Arg3) }
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }
Thanks Karthik! Working on fixing those. the _TRT numers being off is my failure to do arithmetic !
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }
The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific }
If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific }
If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific } If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific } If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }
Will fix.
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
Argh, another 10x error, silly units
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
Good catch, thanks.
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Nope, that is an omission, and that is being addressed in a patch I'm working on now.
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
All of _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL seem to be unused for newer generations of SoCs, so I have dropped these. The missing _AC methods are b/c of an implicit definition of them in the static ASL approach. I will add those into dedede's devicetree definition in the next patchset.
Thank you Karthik!
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific } If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific } If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }Will fix.
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
Argh, another 10x error, silly units
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
Oh, actually this is because I declared TSRD not to take any parameters, the 'Zero' on the second line is supposed to be the argument (for TSR0, it's an index into the array of temperature sensors the EC knows about).
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Nope, that is an omission, and that is being addressed in a patch I'm working on now.
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
All of _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL seem to be unused for newer generations of SoCs, so I have dropped these. The missing _AC methods are b/c of an implicit definition of them in the static ASL approach. I will add those into dedede's devicetree definition in the next patchset.
Thank you Karthik!
Also I'm rewriting the way _OSC works, thank you for that pointer. Yes, that UUID is the for the active policy. With the change in _OSC, there shouldn't be any more mixups; instead I'm having it search through IDSP to see if it can find a match, so no unsafe indexing.
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific } If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific } If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }Will fix.
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
Argh, another 10x error, silly units
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
Oh, actually this is because I declared TSRD not to take any parameters, the 'Zero' on the second line is supposed to be the argument (for TSR0, it's an index into the array of temperature sensors the EC knows about).
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Nope, that is an omission, and that is being addressed in a patch I'm working on now.
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
All of _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL seem to be unused for newer generations of SoCs, so I have dropped these. The missing _AC methods are b/c of an implicit definition of them in the static ASL approach. I will add those into dedede's devicetree definition in the next patchset.
Thank you Karthik!
Also I'm rewriting the way _OSC works, thank you for that pointer. Yes, that UUID is the for the active policy. With the change in _OSC, there shouldn't be any more mixups; instead I'm having it search through IDSP to see if it can find a match, so no unsafe indexing.
One last thing, if the active cooling temps are added to the TCPU object, then it implicitly adds in the active policy support for those.
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific } If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific } If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }Will fix.
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
Argh, another 10x error, silly units
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
Oh, actually this is because I declared TSRD not to take any parameters, the 'Zero' on the second line is supposed to be the argument (for TSR0, it's an index into the array of temperature sensors the EC knows about).
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Nope, that is an omission, and that is being addressed in a patch I'm working on now.
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
All of _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL seem to be unused for newer generations of SoCs, so I have dropped these. The missing _AC methods are b/c of an implicit definition of them in the static ASL approach. I will add those into dedede's devicetree definition in the next patchset.
Thank you Karthik!
Also I'm rewriting the way _OSC works, thank you for that pointer. Yes, that UUID is the for the active policy. With the change in _OSC, there shouldn't be any more mixups; instead I'm having it search through IDSP to see if it can find a match, so no unsafe indexing.
One last thing, if the active cooling temps are added to the TCPU object, then it implicitly adds in the active policy support for those.
Good to know. I am not sure why we were adding active cooling temps in the past when there is no active cooling support.
Hello build bot (Jenkins), Sumeet R Pawnikar, Karthik Ramasubramanian, EricR Lai,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/43422
to look at the new patch set (#4).
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
mb/google/dedede: Convert static DPTF ASL into devicetree entries
Since there is now a mechanism to generate DPTF ACPI tables and methods at runtime, dedede should switch to using that instead of raw ASL files. This patch converts the existing .asl files into devicetree entries.
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: I6bb6e6e15f50a1e510080e16bbca09dfc5f16b1a --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/variants/baseboard/devicetree.cb D src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl D src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/dedede/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/drawcia/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledee/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl 10 files changed, 32 insertions(+), 76 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/43422/4
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 4:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Patch Set 3:
Thanks Tim for uploading the CL. I am observing some minor differences between raw ASL and run-time generation.
DTRT raw ASL (4th element in each package differs): Name (DTRT, Package (0x03) { Package (0x08) { PCI0.TCPU, PCI0.TCPU, 0x64, 0x64, Zero, Zero, Zero, Zero },
Package (0x08) { PCI0.TCPU, DPTF.TSR0, 0x64, 0x0258, Zero, Zero, Zero, Zero }, Package (0x08) { PCI0.TCPU, DPTF.TSR1, 0x64, 0x96, Zero, Zero, Zero, Zero } })DTRT run-time: Name (TRTR, One) Method (_TRT, 0, NotSerialized) // _TRT: Thermal Relationship Table { Return (Package (0x03) { Package (0x08) { TCPU, TCPU, 0x64, 0x0A, Zero, Zero, Zero, Zero },
Package (0x08) { TCPU, TSR0, 0x64, 0x3C, Zero, Zero, Zero, Zero }, Package (0x08) { TCPU, TSR1, 0x64, 0x0F, Zero, Zero, Zero, Zero } })IDSP does not support this UUID: ToUUID ("16caf1b7-dd38-40ed-b1c1-1b8a1913d531"). I am not sure if it is related to any of the active policies and hence not required. Can you please confirm?
_OSC method in run-time generation seems to de-reference package indices 0 and 2. But IDSP has only 2 packages in it. So I am not sure if there is an out-of-bounds de-referencing?
Method (_OSC, 4, Serialized) // _OSC: Operating System Capabilities { If (((DerefOf (IDSP [Zero]) == Arg0) && (Arg1 == One))) { ^TSR0.PATD () ^TSR1.PATD () ^TSR2.PATD () ^TSR3.PATD () _SB.PCI0.LPCB.EC0.CHGD () }
If (((DerefOf (IDSP [0x02]) == Arg0) && (Arg1 == Zero))) { \_SB.PCI0.LPCB.EC0.FAND = 0xFF } Return (Arg3) }The method TEVT is constructed as having 0 arguments, but it is taking one argument - Arg0. Method (TEVT, 0, NotSerialized) { ToInteger (Arg0, Local0) If ((Local0 == Zero)) { Notify (^TSR0, 0x90) // Device-Specific }
If ((Local0 == One)) { Notify (^TSR1, 0x90) // Device-Specific } If ((Local0 == 0x02)) { Notify (^TSR2, 0x90) // Device-Specific } If ((Local0 == 0x03)) { Notify (^TSR3, 0x90) // Device-Specific } }Will fix.
GTSH seems to have some arithmetic issue Raw ASL: Name (GTSH, 0x14) <- Value 20 Run-time: Name (GTSH, 0x02) <- Value 2
Argh, another 10x error, silly units
TSRD Method takes one argument. But the temperature method for each TSR sensor don't pass any argument. Earlier in raw ASL, these methods used to pass Instantaneous temperature set to 0. Method (_TMP, 0, Serialized) // _TMP: Temperature { Return (_SB.PCI0.LPCB.EC0.TSRD) /* External reference */ Zero }
Oh, actually this is because I declared TSRD not to take any parameters, the 'Zero' on the second line is supposed to be the argument (for TSR0, it's an index into the array of temperature sensors the EC knows about).
In Raw ASL TCPU device is added under scope _SB.PCI0. In the run-time approach it is added directly under _SB. Is that an intentional decision?
Nope, that is an omission, and that is being addressed in a patch I'm working on now.
Some methods missing in TCPU device: _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL, _AC[0-4] Most of these missing methods used to return zero filled packages in raw ASL.
All of _TSS, _TPC, _PTC, _TSD, _TDL, _PPC, SPPC, _PSS, _PDL seem to be unused for newer generations of SoCs, so I have dropped these. The missing _AC methods are b/c of an implicit definition of them in the static ASL approach. I will add those into dedede's devicetree definition in the next patchset.
Thank you Karthik!
Also I'm rewriting the way _OSC works, thank you for that pointer. Yes, that UUID is the for the active policy. With the change in _OSC, there shouldn't be any more mixups; instead I'm having it search through IDSP to see if it can find a match, so no unsafe indexing.
One last thing, if the active cooling temps are added to the TCPU object, then it implicitly adds in the active policy support for those.
Good to know. I am not sure why we were adding active cooling temps in the past when there is no active cooling support.
They are added, but not used, because the Active Policy UUID is not exposed in that case. see DPTF_ENABLE_FAN_CONTROL
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 5: Code-Review+2
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
Patch Set 5: Code-Review+2
Tim Wawrzynczak has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43422 )
Change subject: mb/google/dedede: Convert static DPTF ASL into devicetree entries ......................................................................
mb/google/dedede: Convert static DPTF ASL into devicetree entries
Since there is now a mechanism to generate DPTF ACPI tables and methods at runtime, dedede should switch to using that instead of raw ASL files. This patch converts the existing .asl files into devicetree entries.
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: I6bb6e6e15f50a1e510080e16bbca09dfc5f16b1a Reviewed-on: https://review.coreboot.org/c/coreboot/+/43422 Reviewed-by: Karthik Ramasubramanian kramasub@google.com Reviewed-by: EricR Lai ericr_lai@compal.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/variants/baseboard/devicetree.cb D src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl D src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/dedede/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/drawcia/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledee/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/dptf.asl D src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl 10 files changed, 32 insertions(+), 76 deletions(-)
Approvals: build bot (Jenkins): Verified Karthik Ramasubramanian: Looks good to me, approved EricR Lai: Looks good to me, approved
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index dcea3fa..e8b7cf5 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -1,8 +1,10 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE def_bool n select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 + select DPTF_USE_EISA_HID select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID + select DRIVERS_INTEL_DPTF select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI select EC_GOOGLE_CHROMEEC @@ -17,6 +19,7 @@ select MAINBOARD_HAS_SPI_TPM_CR50 select MAINBOARD_HAS_TPM2 select SOC_INTEL_JASPERLAKE + select SOC_INTEL_COMMON_BLOCK_DTT
if BOARD_GOOGLE_BASEBOARD_DEDEDE
diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index e064d9b..933ca1a 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -55,13 +55,4 @@ /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> } - - /* Dynamic Platform Thermal Framework */ - Scope (_SB) - { - /* Per board variant specific definitions. */ - #include <variant/acpi/dptf.asl> - /* Include common dptf ASL files */ - #include <soc/intel/common/acpi/dptf/dptf.asl> - } } diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index 32f6690..e126129 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -166,7 +166,35 @@ device domain 0 on device pci 00.0 on end # Host Bridge device pci 02.0 on end # Integrated Graphics Device - device pci 04.0 on end # SA Thermal device + device pci 04.0 on + chip drivers/intel/dptf + register "policies.passive[0]" = "DPTF_PASSIVE(CPU, CPU, 90, 10000)" + register "policies.passive[1]" = "DPTF_PASSIVE(CPU, TEMP_SENSOR_0, 80, 60000)" + register "policies.passive[2]" = "DPTF_PASSIVE(CPU, TEMP_SENSOR_1, 55, 15000)" + + register "policies.critical[0]" = "DPTF_CRITICAL(CPU, 99, SHUTDOWN)" + register "policies.critical[1]" = "DPTF_CRITICAL(TEMP_SENSOR_0, 90, SHUTDOWN)" + register "policies.critical[2]" = "DPTF_CRITICAL(TEMP_SENSOR_1, 80, SHUTDOWN)" + + register "controls.power_limits.pl1" = "{ + .min_power = 3000, + .max_power = 6000, + .time_window_min = 1 * MSECS_PER_SEC, + .time_window_max = 1 * MSECS_PER_SEC, + .granularity = 200,}" + register "controls.power_limits.pl2" = "{ + .min_power = 6000, + .max_power = 20000, + .time_window_min = 1 * MSECS_PER_SEC, + .time_window_max = 1 * MSECS_PER_SEC, + .granularity = 1000,}" + + register "options.tsr[0].desc" = ""Memory"" + register "options.tsr[1].desc" = ""Ambient"" + + device generic 0 on end + end + end # SA Thermal device device pci 05.0 off end # IPU device pci 09.0 off end # Intel Trace Hub device pci 12.6 off end # GSPI 2 diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl deleted file mode 100644 index f6b16b4..0000000 --- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/acpi/dptf.asl +++ /dev/null @@ -1,48 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Below values might change after Thermal Tuning. */ -#define DPTF_CPU_PASSIVE 90 -#define DPTF_CPU_CRITICAL 99 - -#define DPTF_TSR0_SENSOR_ID 0 -#define DPTF_TSR0_SENSOR_NAME "Memory" -#define DPTF_TSR0_PASSIVE 80 -#define DPTF_TSR0_CRITICAL 90 - -#define DPTF_TSR1_SENSOR_ID 1 -#define DPTF_TSR1_SENSOR_NAME "Ambient" -#define DPTF_TSR1_PASSIVE 55 -#define DPTF_TSR1_CRITICAL 80 - -Name (DTRT, Package () { - /* CPU Throttle Effect on CPU */ - Package () { _SB.PCI0.TCPU, _SB.PCI0.TCPU, 100, 100, 0, 0, 0, 0 }, - - /* CPU Effect on Temp Sensor 0 */ - Package () { _SB.PCI0.TCPU, _SB.DPTF.TSR0, 100, 600, 0, 0, 0, 0 }, - - /* CPU Effect on Temp Sensor 1 */ - Package () { _SB.PCI0.TCPU, _SB.DPTF.TSR1, 100, 150, 0, 0, 0, 0 }, -}) - -Name (MPPC, Package () -{ - 0x2, /* Revision */ - Package () { /* Power Limit 1 */ - 0, /* PowerLimitIndex, 0 for Power Limit 1 */ - 3000, /* PowerLimitMinimum */ - 6000, /* PowerLimitMaximum */ - 1000, /* TimeWindowMinimum */ - 1000, /* TimeWindowMaximum */ - 200 /* StepSize */ - }, - - Package () { /* Power Limit 2 */ - 1, /* PowerLimitIndex, 1 for Power Limit 2 */ - 6000, /* PowerLimitMinimum */ - 20000, /* PowerLimitMaximum */ - 1000, /* TimeWindowMinimum */ - 1000, /* TimeWindowMaximum */ - 1000 /* StepSize */ - } -}) diff --git a/src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/boten/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/boten/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/dedede/variants/dedede/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/dedede/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/dedede/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/dedede/variants/drawcia/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/drawcia/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/drawcia/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/dedede/variants/waddledee/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/waddledee/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/waddledee/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/dedede/variants/waddledoo/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/waddledoo/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/dedede/variants/wheelie/include/variant/acpi/dptf.asl b/src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl deleted file mode 100644 index 189cafe..0000000 --- a/src/mainboard/google/dedede/variants/wheelie/include/variant/acpi/dptf.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/dptf.asl>
-
EricR Lai (Code Review) -
Karthik Ramasubramanian (Code Review)
-
Tim Wawrzynczak (Code Review)