From 7d1a95ce146f9d80adb1c369335ce596548dcf1b Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Thu, 20 Oct 2022 10:03:15 -0700 Subject: [PATCH] thermal: enable thermal engine Remove tpu_cooling as it is not yet available Bug: 254108562 Test: Build and boot on device. Check thermal service Signed-off-by: Sayanna Chandula Change-Id: If89ba01d1d2a2280b4c3bb26b97124e8e1e53fcc --- device-husky.mk | 1 - device-ripcurrent.mk | 1 - device-shiba.mk | 1 - thermal_info_config_husky.json | 739 +++++++++------------------------ thermal_info_config_shiba.json | 739 +++++++++------------------------ 5 files changed, 400 insertions(+), 1081 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 2878c33..8fdf414 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -186,7 +186,6 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g \ - vendor.disable.thermal.control=1 \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 550bfd1..41b8e78 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -191,7 +191,6 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g \ - vendor.disable.thermal.control=1 \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL diff --git a/device-shiba.mk b/device-shiba.mk index f69dda6..e6ab95e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -187,7 +187,6 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g \ - vendor.disable.thermal.control=1 \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json index cf069aa..4eba292 100644 --- a/thermal_info_config_husky.json +++ b/thermal_info_config_husky.json @@ -3,550 +3,201 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "Multiplier":0.001 }, + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"north_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN", + "Type":"SKIN", + "Version":"1.1", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + }, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + }, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"WEIGHTED_AVG", + "Combination":["charge_therm", "quiet_therm"], + "Coefficient":[0.282, 0.718], + "Offset":-448, + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + + }, + "ExcludedPowerInfo": [ + ], + "BindedCdevInfo": [ + ] + }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], + "Multiplier":0.001, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "Multiplier":0.001 + }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - 80, - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 10, 11, 11] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":[ - "battery", - "soc" - ], - "Coefficient":[ - "-25000", - "80" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 2.0, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 15, 15, 15] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 13, 13, 13] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 } ], @@ -554,20 +205,17 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", @@ -575,9 +223,13 @@ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { - "Name":"tpu_cooling", + "Name":"usbc-port", + "Type":"BATTERY" + }, + { + "Name":"gxp-cooling", "Type":"NPU", - "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ @@ -589,19 +241,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -611,7 +263,16 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "PowerSampleDelay":7000, "PowerSampleCount":5 } ] diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json index cf069aa..4eba292 100644 --- a/thermal_info_config_shiba.json +++ b/thermal_info_config_shiba.json @@ -3,550 +3,201 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "Multiplier":0.001 }, + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"north_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN", + "Type":"SKIN", + "Version":"1.1", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + }, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + }, + "BindedCdevInfo": [ + ] + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"WEIGHTED_AVG", + "Combination":["charge_therm", "quiet_therm"], + "Coefficient":[0.282, 0.718], + "Offset":-448, + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + + }, + "ExcludedPowerInfo": [ + ], + "BindedCdevInfo": [ + ] + }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], + "Multiplier":0.001, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "Multiplier":0.001 + }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - 80, - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 10, 11, 11] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":[ - "battery", - "soc" - ], - "Coefficient":[ - "-25000", - "80" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 2.0, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 15, 15, 15] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 13, 13, 13] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 } ], @@ -554,20 +205,17 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", @@ -575,9 +223,13 @@ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { - "Name":"tpu_cooling", + "Name":"usbc-port", + "Type":"BATTERY" + }, + { + "Name":"gxp-cooling", "Type":"NPU", - "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ @@ -589,19 +241,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -611,7 +263,16 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "PowerSampleDelay":7000, "PowerSampleCount":5 } ]