commit 1201db75a1bcdc97c2d9a3e2c8538dcb593b0a07
author George Lee <geolee@google.com> Thu Nov 09 01:17:09 2023 +0000
committer George Lee <geolee@google.com> Tue Nov 14 22:00:33 2023 +0000
tree dc76895c8d43d30fa28aeeadb08022b6dc7c11ba
parent f382fb25df1c6ec58f5a1195e12da2442725d495

bm: Add triggered event thread

Add thread to handle triggered event.
Remove pcieModem, Wifi and last_triggered_mode stats.

Bug: 299700579
Test: Flash and boot
Change-Id: I9d4877be71e64ad0ee53bccb705fca8bbc4d5ad8
Signed-off-by: George Lee <geolee@google.com>

battery_mitigation/battery_mitigation.cpp

diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp
index 101be13..cb33205 100644
--- a/battery_mitigation/battery_mitigation.cpp
+++ b/battery_mitigation/battery_mitigation.cpp
@@ -83,10 +83,17 @@
         {"voltage_now", "/sys/class/power_supply/battery/voltage_now"},
         {"current_now", "/sys/class/power_supply/battery/current_now"},
     },
-    .NumericSysfsStatDirs = {
-        {"last_triggered_mode", "/sys/devices/virtual/pmic/mitigation/last_triggered_mode/"},
-    },
     .TriggeredIdxPath = "/sys/devices/virtual/pmic/mitigation/br_stats/triggered_idx",
+    .triggeredStatePath[android::hardware::google::pixel::UVLO1] =
+        "/sys/devices/virtual/pmic/mitigation/triggered_state/uvlo1_triggered",
+    .triggeredStatePath[android::hardware::google::pixel::UVLO2] =
+        "/sys/devices/virtual/pmic/mitigation/triggered_state/uvlo2_triggered",
+    .triggeredStatePath[android::hardware::google::pixel::OILO1] =
+        "/sys/devices/virtual/pmic/mitigation/triggered_state/oilo1_triggered",
+    .triggeredStatePath[android::hardware::google::pixel::OILO2] =
+        "/sys/devices/virtual/pmic/mitigation/triggered_state/oilo2_triggered",
+    .triggeredStatePath[android::hardware::google::pixel::SMPL] =
+        "/sys/devices/virtual/pmic/mitigation/triggered_state/smpl_triggered",
     .BrownoutStatsPath = "/sys/devices/virtual/pmic/mitigation/br_stats/stats",
     .StoringPath = "/data/vendor/mitigation/thismeal.bin",
     .ParsedThismealPath = "/data/vendor/mitigation/thismeal.txt",
@@ -112,27 +119,19 @@
                 {
                     .MainPmicName = "s2mpg10-odpm\n",
                     .SubPmicName = "s2mpg11-odpm\n",
-                    .PcieModemPath = "/sys/devices/platform/11920000.pcie/power_stats",
-                    .PcieWifiPath = "/sys/devices/platform/14520000.pcie/power_stats",
                 },
                 {
                     .MainPmicName = "s2mpg12-odpm\n",
                     .SubPmicName = "s2mpg13-odpm\n",
-                    .PcieModemPath = "/sys/devices/platform/11920000.pcie/power_stats",
-                    .PcieWifiPath = "/sys/devices/platform/14520000.pcie/power_stats",
                 },
                 {
                     .MainPmicName = "s2mpg14-odpm\n",
                     .SubPmicName = "s2mpg15-odpm\n",
-                    .PcieModemPath = "/sys/devices/platform/12100000.pcie/power_stats",
-                    .PcieWifiPath = "/sys/devices/platform/13120000.pcie/power_stats",
                 },
                 /* MAX_SUPPORTED_PLATFORM */
                 {
                     .MainPmicName = "s2mpg14-odpm\n",
                     .SubPmicName = "s2mpg15-odpm\n",
-                    .PcieModemPath = "/sys/devices/platform/12100000.pcie/power_stats",
-                    .PcieWifiPath = "/sys/devices/platform/13120000.pcie/power_stats",
                 },
 
     },
@@ -188,8 +187,6 @@
             batteryMitigationService->genLastmealCSV(eventThreadCfg.ParsedLastmealCSVPath)) {
             android::base::SetProperty(kLastMealProperty, "1");
         }
-        /* Start BrownoutEventThread to poll brownout event from kernel */
-        batteryMitigationService->startBrownoutEventThread();
     } else{
         bmSp = new BatteryMitigation(cfg);
         if (!bmSp) {
@@ -226,6 +223,10 @@
     if (isBatteryMitigationReady) {
         android::base::SetProperty(kReadyProperty, "1");
     }
+    if (isBatteryMitigationReady && brownoutStatsBinarySupported) {
+        /* Start BrownoutEventThread to poll brownout event from kernel */
+        batteryMitigationService->startBrownoutEventThread();
+    }
     while (true) {
         pause();
     }