From 39845ace124e973d2391e975ebaaa5c28bb8b517 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 24 Jun 2022 15:43:37 -0700 Subject: [PATCH 1/4] Revert "thermal: enable warm_reset on thermal shutdown" This reverts commit 5bba5fcf9d0fbe057324481eef8c178535a68683. Bug: 235765192 Test: Build and boot on device Signed-off-by: Sayanna Chandula Change-Id: Ia9c70409b6901d8a67bb50b6a5a517f194fee302 --- device-common.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-common.mk b/device-common.mk index 81590245..0ceb1242 100644 --- a/device-common.mk +++ b/device-common.mk @@ -43,7 +43,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ # ZramWriteback -include hardware/google/pixel/mm/device_gki.mk - -# Set thermal warm reset -PRODUCT_PRODUCT_PROPERTIES += \ - ro.thermal_warmreset = true From 4bdbbe6d70d2c59119257a44d63f5471b5f85b1e Mon Sep 17 00:00:00 2001 From: xiaofanj Date: Tue, 7 Jun 2022 03:00:26 +0000 Subject: [PATCH 2/4] ueventd: create oem test iodev Bug: 231380480 Signed-off-by: Xiaofan Jiang Change-Id: Ie96c8aec0897b97f5e65f02e57eeffa149805178 Merged-In: Ie96c8aec0897b97f5e65f02e57eeffa149805178 --- conf/ueventd.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc index 5a50b638..1db5072b 100644 --- a/conf/ueventd.gs201.rc +++ b/conf/ueventd.gs201.rc @@ -119,6 +119,7 @@ # IPC OEM /dev/oem_ipc* 0660 radio radio +/dev/oem_test 0660 radio radio # interactive governor parameters /sys/devices/system/cpu/cpu* cpufreq/interactive/timer_rate 0660 system system From 1cb6abcdc6fe02fdb6d489ae11ebf8d195239868 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 28 Jun 2022 16:27:31 +0800 Subject: [PATCH 3/4] init: disable dock-defend in charger mode Need to meet energy certification test requirement which needs to be able to charge FULL. Bug: 235437635 Test: can charge to full on dock in charger mode Signed-off-by: Jack Wu Change-Id: Ifc99a3c48c129c68bf69a9832c0df0cd14b796e0 --- conf/init.gs201.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index bca12af1..0500f7de 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -725,8 +725,6 @@ on property:sys.boot_completed=1 # Enable UFS powersaving write /dev/sys/block/bootdevice/clkgate_enable 1 - # Disable dock-defend in Off Mode Charger - write /sys/devices/platform/google,charger/dd_state -1 # Reset DDR frequency write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1 @@ -1017,6 +1015,8 @@ on property:persist.vendor.softmaxfreq.cl2=* on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running # Enable UFS powersaving in Off Mode Charger write /dev/sys/block/bootdevice/clkgate_enable 1 + # Disable dock-defend in Off Mode Charger + write /sys/devices/platform/google,charger/dd_state -1 # Cpuset experiment on property:persist.device_config.vendor_system_native.top-app_cpuset=* From 9ff57b81b89f513e62db187c5f761b5744c7f190 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 27 Jun 2022 09:43:42 -0700 Subject: [PATCH 4/4] logger: Ensure captured log not overwritten Add additional file path to make copy of captured log. Bug: 237282212 Test: Verified lastmeal.txt and thismeal.txt existence. Signed-off-by: George Lee Change-Id: I77606bf679c3eb1c55f2b135a6265e0e0e837c77 --- battery_mitigation/battery_mitigation.cpp | 2 +- battery_mitigation/battery_mitigation.rc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index ac887ab0..06f739c2 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -59,7 +59,7 @@ const struct MitigationConfig::Config cfg = { "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", "NPU", "voltage_now", "current_now", }, - .LogFilePath = "/data/vendor/mitigation/lastmeal.txt", + .LogFilePath = "/data/vendor/mitigation/thismeal.txt", }; int main(int /*argc*/, char ** /*argv*/) { diff --git a/battery_mitigation/battery_mitigation.rc b/battery_mitigation/battery_mitigation.rc index 7b9ef4f2..4cdbbf6e 100644 --- a/battery_mitigation/battery_mitigation.rc +++ b/battery_mitigation/battery_mitigation.rc @@ -1,3 +1,15 @@ +on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,ocp + copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt + +on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,if + copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt + +on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,main + copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt + +on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,sub + copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt + on property:vendor.thermal.link_ready=1 mkdir /data/vendor/mitigation 0755 system system chown system system /data/vendor/mitigation