From b8acf39ef013bc6bb27ebc1d7fc8a779bb8d7097 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:11:43 -0700 Subject: [PATCH 1/2] Revert "thermal: remove gxp cooling device dependency" This reverts commit 617f8719f5bd7268b74157ab23cc0bafcb4f2cfc. Re-enable gxp cooling device Bug: 238273184 Test: build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I3787c11e674b6781b81d01aad2abc88d99c1d1d0 Merged-In: I3787c11e674b6781b81d01aad2abc88d99c1d1d0 --- battery_mitigation/battery_mitigation.cpp | 1 + conf/init.gs201.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index 921436f5..faa59c10 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -44,6 +44,7 @@ const struct MitigationConfig::Config cfg = { "/dev/thermal/cdev-by-name/tpu_cooling/cur_state", "/dev/thermal/cdev-by-name/CAM/cur_state", "/dev/thermal/cdev-by-name/DISP/cur_state", + "/dev/thermal/cdev-by-name/gxp-cooling/cur_state", "/sys/class/power_supply/battery/voltage_now", "/sys/class/power_supply/battery/current_now", }, diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index cdc3a7f3..b24b14e7 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -965,6 +965,7 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote chown system system /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote + chown system system /dev/thermal/cdev-by-name/gxp-cooling/user_vote chown system system /dev/thermal/cdev-by-name/tpu_cooling/user_vote chown system system /dev/thermal/cdev-by-name/fcc/cur_state chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state From 45618a67230d9b5793cec57f101e62b93a7d0f49 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:10:36 -0700 Subject: [PATCH 2/2] Revert "thermal: Fix misalignment from removal of gxp cdev" This reverts commit baedb92abfa4f38738daec010b3ce357ff88f4ed. Re-enable gxp cooling device Bug: 238273184 Test: build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I341636bc5e7d8feced4593fdbd2638c244051499 Merged-In: I341636bc5e7d8feced4593fdbd2638c244051499 --- battery_mitigation/battery_mitigation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index faa59c10..5784b270 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -57,7 +57,7 @@ const struct MitigationConfig::Config cfg = { .SystemName = { "batoilo", "smpl_gm", "soc", "vdroop1", "vdroop2", "ocp_gpu", "ocp_tpu", "soft_ocp_cpu2", "soft_ocp_cpu1", "battery", "battery_cycle", - "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", + "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", "NPU", "voltage_now", "current_now", }, .LogFilePath = "/data/vendor/mitigation/thismeal.txt",