From 549a853f8f50cb99098f7abec6e93efe7224ee82 Mon Sep 17 00:00:00 2001 From: Puthikorn Voravootivat Date: Wed, 10 Jun 2020 15:17:58 -0700 Subject: mb/google/hatch: mushu: Add F75303 temp sensor to dptf Update the following in dptf.asl - Add support for TSR3 - Change TSR0/TSR1/TSR2/TSR3 From: Charger, 5V, GPU , None To: Charger, GPU, F75303_GPU, F75303_GPU_POWER - Adjust fan/cpu trip point accordingly - Fix formating in dptf.asl - Throttle charger when TSR0 (charger) is hot instead of throttle CPU BUG=b:158676970 BRANCH=None TEST=grep . /sys/class/thermal/thermal_zone5/{type,temp} /sys/class/thermal/thermal_zone5/type:TSR3 /sys/class/thermal/thermal_zone5/temp:50800 Change-Id: Iedbb6bc7c1e59a027119c70791b9bc8a4d83ff87 Signed-off-by: Puthikorn Voravootivat Reviewed-on: https://review.coreboot.org/c/coreboot/+/42270 Reviewed-by: Shelley Chen Reviewed-by: Bob Moragues Tested-by: build bot (Jenkins) --- .../variants/mushu/include/variant/acpi/dptf.asl | 74 ++++++++++++++-------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/src/mainboard/google/hatch/variants/mushu/include/variant/acpi/dptf.asl b/src/mainboard/google/hatch/variants/mushu/include/variant/acpi/dptf.asl index eb23601191..f4d7ab5a0f 100644 --- a/src/mainboard/google/hatch/variants/mushu/include/variant/acpi/dptf.asl +++ b/src/mainboard/google/hatch/variants/mushu/include/variant/acpi/dptf.asl @@ -7,10 +7,10 @@ #define DPTF_CPU_ACTIVE_AC2 65 #define DPTF_CPU_ACTIVE_AC3 60 #define DPTF_CPU_ACTIVE_AC4 50 -#define DPTF_CPU_ACTIVE_AC5 40 +#define DPTF_CPU_ACTIVE_AC5 40 #define DPTF_TSR0_SENSOR_ID 0 -#define DPTF_TSR0_SENSOR_NAME "Thermal Sensor 1" +#define DPTF_TSR0_SENSOR_NAME "Charger" #define DPTF_TSR0_PASSIVE 90 #define DPTF_TSR0_CRITICAL 99 #define DPTF_TSR0_ACTIVE_AC0 80 @@ -18,29 +18,40 @@ #define DPTF_TSR0_ACTIVE_AC2 65 #define DPTF_TSR0_ACTIVE_AC3 60 #define DPTF_TSR0_ACTIVE_AC4 55 -#define DPTF_TSR0_ACTIVE_AC5 50 +#define DPTF_TSR0_ACTIVE_AC5 50 -#define DPTF_TSR1_SENSOR_ID 1 -#define DPTF_TSR1_SENSOR_NAME "Thermal Sensor 2" -#define DPTF_TSR1_PASSIVE 90 +#define DPTF_TSR1_SENSOR_ID 2 +#define DPTF_TSR1_SENSOR_NAME "GPU" +#define DPTF_TSR1_PASSIVE 93 #define DPTF_TSR1_CRITICAL 99 -#define DPTF_TSR1_ACTIVE_AC0 80 +#define DPTF_TSR1_ACTIVE_AC0 85 #define DPTF_TSR1_ACTIVE_AC1 70 #define DPTF_TSR1_ACTIVE_AC2 65 #define DPTF_TSR1_ACTIVE_AC3 60 -#define DPTF_TSR1_ACTIVE_AC4 55 -#define DPTF_TSR1_ACTIVE_AC5 50 +#define DPTF_TSR1_ACTIVE_AC4 50 +#define DPTF_TSR1_ACTIVE_AC5 40 -#define DPTF_TSR2_SENSOR_ID 2 -#define DPTF_TSR2_SENSOR_NAME "dGPU" -#define DPTF_TSR2_PASSIVE 93 -#define DPTF_TSR2_CRITICAL 99 -#define DPTF_TSR2_ACTIVE_AC0 85 -#define DPTF_TSR2_ACTIVE_AC1 70 -#define DPTF_TSR2_ACTIVE_AC2 65 -#define DPTF_TSR2_ACTIVE_AC3 60 -#define DPTF_TSR2_ACTIVE_AC4 50 -#define DPTF_TSR2_ACTIVE_AC5 40 +#define DPTF_TSR2_SENSOR_ID 4 +#define DPTF_TSR2_SENSOR_NAME "F75303_GPU" +#define DPTF_TSR2_PASSIVE 93 +#define DPTF_TSR2_CRITICAL 99 +#define DPTF_TSR2_ACTIVE_AC0 85 +#define DPTF_TSR2_ACTIVE_AC1 70 +#define DPTF_TSR2_ACTIVE_AC2 65 +#define DPTF_TSR2_ACTIVE_AC3 60 +#define DPTF_TSR2_ACTIVE_AC4 50 +#define DPTF_TSR2_ACTIVE_AC5 40 + +#define DPTF_TSR3_SENSOR_ID 5 +#define DPTF_TSR3_SENSOR_NAME "F75303_GPU_POWER" +#define DPTF_TSR3_PASSIVE 90 +#define DPTF_TSR3_CRITICAL 99 +#define DPTF_TSR3_ACTIVE_AC0 80 +#define DPTF_TSR3_ACTIVE_AC1 70 +#define DPTF_TSR3_ACTIVE_AC2 65 +#define DPTF_TSR3_ACTIVE_AC3 60 +#define DPTF_TSR3_ACTIVE_AC4 55 +#define DPTF_TSR3_ACTIVE_AC5 50 #define DPTF_ENABLE_CHARGER #define DPTF_ENABLE_FAN_CONTROL @@ -93,23 +104,30 @@ Name (DART, Package () { 0, 0, 0 }, Package () { - \_SB.DPTF.TFN1, \_SB.DPTF.TSR2, 100, 77, 71, 68, 65, 59, 55, 0, - 0, 0, 0 - } + \_SB.DPTF.TFN1, \_SB.DPTF.TSR2, 100, 77, 71, 68, 65, 59, 55, 0, + 0, 0, 0 + }, + Package () { + \_SB.DPTF.TFN1, \_SB.DPTF.TSR3, 100, 77, 71, 68, 65, 59, 55, 0, + 0, 0, 0 + } }) Name (DTRT, Package () { /* CPU Throttle Effect on CPU */ Package () { \_SB.PCI0.TCPU, \_SB.PCI0.TCPU, 100, 10, 0, 0, 0, 0 }, - /* CPU Throttle Effect on TSR0 */ - Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR0, 100, 10, 0, 0, 0, 0 }, - - /* CPU Throttle Effect on TSR1 */ + /* CPU Throttle Effect on GPU (TSR1) */ Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR1, 100, 10, 0, 0, 0, 0 }, - /* CPU Throttle Effect on dGPU (TSR2) */ - Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR2, 100, 10, 0, 0, 0, 0 }, + /* CPU Throttle Effect on F75303_GPU (TSR2) */ + Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR2, 100, 10, 0, 0, 0, 0 }, + + /* CPU Throttle Effect on F75303_GPU_POWER (TSR3) */ + Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR2, 100, 10, 0, 0, 0, 0 }, + + /* Charger Throttle Effect on Charger (TSR0) */ + Package () { \_SB.DPTF.TCHG, \_SB.DPTF.TSR0, 100, 10, 0, 0, 0, 0 } }) Name (MPPC, Package () -- cgit v1.2.3