From 828c32a88df31235611292cdf0d0cabda750a459 Mon Sep 17 00:00:00 2001 From: David Chao Date: Thu, 19 May 2022 17:50:25 +0800 Subject: [PATCH 1/4] Revert "thermal: disable SKIN thermal throttling" This reverts commit bf8693dd6dc5af7a751c066dc916e0d07c2c7ded. Reason for revert: re-enable thermal throttling protection with the virtual sensor formula. Bug: 231404311 Test: thermal throttling worked properly. Change-Id: I99020b5b30a6a9ada0f51974161d262b9d37667c --- conf/init.lynx.rc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc index e6edec1..ffaec61 100644 --- a/conf/init.lynx.rc +++ b/conf/init.lynx.rc @@ -57,8 +57,3 @@ service vendor.loc_launcher /system/vendor/bin/loc_launcher user wifi group wifi disabled - - -# Thermal -on late-init - setprop persist.vendor.disable.thermal.control 1 From c3ea2b16cf2081b0685483169d6b9d4151767d8d Mon Sep 17 00:00:00 2001 From: David Chao Date: Thu, 26 May 2022 15:58:42 +0800 Subject: [PATCH 2/4] thermal: update thermal config 1) add usbc overheat mitigation v0.1. 2) add VIRTUAL-SKIN formula v0.1. 3) enable thermal throttling as P10 device. Bug: 231404311 Bug: 229581307 Test: Build and boot on device. Change-Id: I6d2f3c4860112df43aef9eedaef121a1f47365d4 Signed-off-by: David Chao --- thermal_info_config_lynx.json | 775 +++++++++++++++++++++++----------- 1 file changed, 531 insertions(+), 244 deletions(-) diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index dba54ac..13a59b1 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -3,76 +3,296 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" + "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":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 40.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":"usb_pwr_therm2", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"skin_therm1", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 29.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/skin_therm1/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"skin_therm2", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-SKIN2-USB2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2"], + "Coefficient":[0.4, 0.3, 0.3], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN2-SKIN1-GNSS-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["skin_therm2", "skin_therm1", "gnss_tcxo_therm", "battery"], + "Coefficient":[0.2, 0.2, 0.1, 0.5], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN", + "Type":"SKIN", + "Version":"0.1", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"], + "E_Integral_Default": 50 + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "LimitInfo": [0, 0, 0, 0, 12, 14, 14] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "LimitInfo": [0, 0, 0, 0, 15, 17, 17] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2S_VDD_G3D", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 3, 6, 6, 8, 8, 8], + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 3, 3, 8 ,8 ,8], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"USB-MINUS-SKIN2", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["usb_pwr_therm", "skin_therm2"], + "Coefficient":[1.0, -1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Version":"0.1", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm", + "Combination":["usb_pwr_therm", "USB-MINUS-SKIN2"], + "Coefficient":[40000, 10000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "2.0", "NAN", "NAN"], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-USB-UI", + "Type":"USB_PORT", + "Version":"0.1", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm", + "Combination":["usb_pwr_therm", "USB-MINUS-SKIN2"], + "Coefficient":[40000, 13000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "2.0", "NAN"], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "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", 115.0], + "Multiplier":0.001 + }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "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", 115.0], + "Multiplier":0.001 + }, + { + "Name":"TPU", + "Type":"NPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "Multiplier":0.001 }, { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -82,26 +302,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1150" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":[-10000, 400, 1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -111,26 +314,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1150" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":[-10000, 400, 1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -138,217 +324,286 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - 93, - 96, - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], + "Multiplier":1, + "Monitor":true + }, + { + "Name":"BCL_TPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "TriggerSensor": "ocp_tpu", + "Combination":["ocp_tpu", "battery"], + "Coefficient":[1, -10], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PollingDelay":300000, - "PassiveDelay":5000, + "PassiveDelay":500, "BindedCdevInfo": [ { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] } ] }, { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1150, - "NAN", - "NAN" + "Name":"BCL_GPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "TriggerSensor": "ocp_gpu", + "Combination":["ocp_gpu", "battery"], + "Coefficient":[1, -10], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 9, 9, 9] + } + ] + }, + { + "Name":"BCL_BATOILO_GPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_gpu", "battery"], + "Coefficient":[5000, 12000, -1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 9, 9, 9] + } + ] + }, + { + "Name":"BCL_BATOILO_TPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_tpu", "battery"], + "Coefficient":[5000, 12000, -1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + } + ] + }, + { + "Name":"BCL_BATOILO_GPU", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_gpu"], + "Coefficient":[5000, 12000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] + }, + { + "Name":"BCL_BATOILO_TPU", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":[ + "batoilo", + "ocp_tpu" ], - "VrThreshold":"NAN", + "Coefficient":[5000, 12000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 6, 6, 6] + } + ] + }, + { + "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], + "Multiplier":1, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] + }, + { + "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"], "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], + "Multiplier":1, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] + }, { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1350, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true - }, - { - "Name":"TPU", - "Type":"NPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", - "Multiplier":0.001 + "Hidden":true } ], "CoolingDevices":[ @@ -356,19 +611,42 @@ "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"] + "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600] }, { "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"] + "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] }, { "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"] + "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] + }, + { + "Name":"thermal-gpufreq-0", + "Type":"GPU", + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", + "State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452] + }, + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + }, + { + "Name":"tpu_cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" } ], "PowerRails":[ @@ -380,19 +658,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" @@ -402,6 +680,15 @@ }, { "Name":"S2S_VDD_G3D", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, + { + "Name":"PARTIAL_SYSTEM_POWER", + "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":14000, "PowerSampleCount":5 } From 8a2868771daabe63cfe1a4b1c05e596cfefb648b Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Wed, 8 Jun 2022 14:32:13 +0800 Subject: [PATCH 3/4] audio: update speaker fw and bins Change list: L10 proto 1.1 tuning with 0520 FIR filter Test: manual Bug: 223513454 Signed-off-by: Yung Ti Su Change-Id: Iad5c01a9e2593abe764e9e996073783127b60a8a --- audio/lynx/config/mixer_paths.xml | 38 +++++++++++++++++- .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin | Bin 4488 -> 5172 bytes .../lynx/cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 4536 -> 5216 bytes audio/lynx/cs35l41/fw/fast_switch1.txt | 1 + audio/lynx/cs35l41/fw/fast_switch2.txt | 1 + audio/lynx/cs35l41/fw/fast_switch3.txt | 1 + audio/lynx/cs35l41/fw/fast_switch4.txt | 1 + 7 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 audio/lynx/cs35l41/fw/fast_switch1.txt create mode 100644 audio/lynx/cs35l41/fw/fast_switch2.txt create mode 100644 audio/lynx/cs35l41/fw/fast_switch3.txt create mode 100644 audio/lynx/cs35l41/fw/fast_switch4.txt diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml index 4485362..47f6898 100644 --- a/audio/lynx/config/mixer_paths.xml +++ b/audio/lynx/config/mixer_paths.xml @@ -105,6 +105,12 @@ + + + + + + @@ -624,12 +630,36 @@ + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -637,6 +667,12 @@ + + + + + + diff --git a/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/lynx/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin index 95f4f405b4ce45d5b02b9ad04c8a54703dcb94b8..6ed69e865bb2205645ba3817f3e7df6a632289b6 100644 GIT binary patch delta 892 zcmXw2drVVj96h%W3$*m1mhzBM>r4=FUg%(`*;7Y!VvR~nj7F5rVWX)d(*!nL758w? zB^nm@&_y%+!zfI}M|>|cXcY0mf@2dz16ey66)%cFd+$BF{lnjv{F2}I{c=unzH_!u zI+?x8EiB(Xak9Q3U#vS~P4kJ~yuyu}0&B`d?WTC%;)K^k=#+R~xGp)N)uiwryLQ zejQgdaTb1lkQU%Hj#jXeAGu2RaSw0rLWrH_*6-nGb0V`azocO;+wgiNTiN&bl*c^F zyBTO;qtqA1Bp!aBDopzi{L6OW5B|s&^KgNN)1Aui_)GeYU<*Uso6gnjyK?Xp+ZhTo z%#IwXl8p@4@Gws=>l)w_9^K2Sd}6<_mH$!tf?qSzJlMu_94zG_HXj^m|JbEfP$yjG_r+1akmMFxlh9{jC;5hMD?oJ=5;>yQLmvXAFUOc%;9xXinKt-AV1J6vi cN30U_>Pj5Bj%j&?qL}X$i@b%Nq|F-2|4ZtwUjP6A delta 200 zcmdm@(V;v+fiY~NqN=d5k!gHDQGQ8&e1NC3PmF=Fq1ohUL0L1sq|7`91`|dhhO-PH z;3x|sXYevGurRQ6FoQTOR~Q@^_?Dy@FfcL*Ft9c#F^g^7;Kj(r#K6D-lven`uz3TE z3Xf?0|NkKVACMjx@S6NmAfFj%InXjm7Le7Oiv@F-B!Jc{>2N8Pl;&mTrN?KcC|M~e d8B`b;O#UvcBVcG`Y;109Xl!Dn#8nG42>=%GE2#hg diff --git a/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/lynx/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index 0d0c8222853c7cb7a06553a75a3a1ffba8dd9fa6..4ce54a47bb87eff072895cfa95f04dc735ed4567 100644 GIT binary patch delta 868 zcmXw2YfO`86n?(1H+rF5K2h=7Rm^0;?E_I!6QhYZC4xE))3}X90jZaoB{jN;*2E?I zV-zhhF@|Nsc#9;$6ho+U8;eAid6}Z~f`+8Uf`ZU$gDqeC?B&PaA1CLWJa3+J@|>q_ zR_~lThqUFyN3(VF3sm28dv=*RFMok&ue+*36`hrIz@!4NZ#SCImC%<8Iy*`Im z`1l4Iclf3S;^Mir{1lMviT&Zv9G-)$omWp zu!_Okq4V_fMU^1FSr@G2AUmS`fkUghRK8_o4#zm$I@ra(IWnE!@zLkea>4Ux2Ny6L zds4*r93J2`jw)dfd-!1&uk)pGw3%V{{=>VBTnt$GfsrhFPcs&aG%~>0WxCn7A=blp zd{xcO3`hEAGS0|JdKfPXf5i~vSNWPDCH^Hx7_x~CM$U#h1ZHFfUoiG~c$EE&PZb3H zp%?{b$j2Sf9gput7SO?VWY-zngeEyFQHlwTGj70ZK~^I)SUpM;roeg>Ze+JuFG0cN zZ*dRG?~}@5g%ZFP*lH9rCc=6PX~>dolE5fqxQ&cJ=0aGIk%0kNYSVg=4)bi(Bh8qS z4LeeE&UehyO4N_p-jSDaxGOU9P<1v&#HXBZeNu??= zgzjquL@w9E1%0OUK%A3q6Fwo6@^6sHGx!*&=Th+(1`a~{QD~KfG>xfDHsEIpWEt{A zo=gFloGY|tTf)x-mv9-^GqESxC5nWD>!<~_yG&B^a32%hnu!_{Hc>_xZ z52NQ~Nx^((phZA~C0Rh$Y+fvw!z2N;N=b)HsiZV7GcP?pGeyZtLCK)Pz+kevh>n1z Rv5A?fg_*Ij5?3wAG60A!C)fZ0 diff --git a/audio/lynx/cs35l41/fw/fast_switch1.txt b/audio/lynx/cs35l41/fw/fast_switch1.txt new file mode 100644 index 0000000..67171cc --- /dev/null +++ b/audio/lynx/cs35l41/fw/fast_switch1.txt @@ -0,0 +1 @@ +11,4,768,1236,353840,65536,2229536,1,7,0,256012610 \ No newline at end of file diff --git a/audio/lynx/cs35l41/fw/fast_switch2.txt b/audio/lynx/cs35l41/fw/fast_switch2.txt new file mode 100644 index 0000000..dcddba7 --- /dev/null +++ b/audio/lynx/cs35l41/fw/fast_switch2.txt @@ -0,0 +1 @@ +11,4,768,1236,353840,69632,2229536,1,7,0,469781064 \ No newline at end of file diff --git a/audio/lynx/cs35l41/fw/fast_switch3.txt b/audio/lynx/cs35l41/fw/fast_switch3.txt new file mode 100644 index 0000000..f84de60 --- /dev/null +++ b/audio/lynx/cs35l41/fw/fast_switch3.txt @@ -0,0 +1 @@ +11,4,768,1236,353840,65536,2229536,1,7,4194304,-12894649 \ No newline at end of file diff --git a/audio/lynx/cs35l41/fw/fast_switch4.txt b/audio/lynx/cs35l41/fw/fast_switch4.txt new file mode 100644 index 0000000..443697a --- /dev/null +++ b/audio/lynx/cs35l41/fw/fast_switch4.txt @@ -0,0 +1 @@ +11,4,768,1236,353840,69632,2229536,1,7,4194304,-327613107 \ No newline at end of file From 0049c388b8ad721e5d2527d97d4b483bcc914da8 Mon Sep 17 00:00:00 2001 From: Shanmuga Pandi M Date: Thu, 9 Jun 2022 07:44:47 +0000 Subject: [PATCH 4/4] [L10] Camera: Enable the product properties. 1. Raise buffer allocation priority 2. Extended cpu boost Bug: 235442093 Test: GCA Change-Id: I5bb05e32f0cd79e9fd91a9ae2998cf29da65a7b0 --- device-lynx.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 39eb5a9..0fbd158 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -178,3 +178,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay + +# Camera +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.camera.extended_launch_boost=1 \ + persist.vendor.camera.raise_buf_allocation_priority=1