Merge "thermal: optimize thermal config" into tm-qpr-dev am: 01ba447f0d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20742969

Change-Id: Ibc13b31ad6f3a5310f36f312da0feabe482f5849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-12-16 16:03:17 +00:00 committed by Automerger Merge Worker
commit 322a82d74c
2 changed files with 17 additions and 31 deletions

View file

@ -17,7 +17,9 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
}, },
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
@ -31,7 +33,7 @@
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
@ -284,20 +286,11 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["usb_pwr_therm2", "usb_pwr_therm"], "Combination":["usb_pwr_therm2", "usb_pwr_therm"],
"Coefficient":[1.0, -1.0], "Coefficient":[1.0, -1.0],
"HotThreshold":["NAN", "7.0", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
}
],
"Multiplier":0.001,
"PollingDelay":0,
"PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
@ -312,7 +305,7 @@
} }
], ],
"Multiplier":1, "Multiplier":1,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
} }
], ],

View file

@ -23,7 +23,9 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/skin_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
}, },
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
@ -37,7 +39,7 @@
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
@ -250,7 +252,7 @@
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 60.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"SendCallback":true, "SendCallback":true,
"BindedCdevInfo": [ "BindedCdevInfo": [
@ -287,7 +289,7 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"SendCallback":true "SendCallback":true
}, },
@ -468,20 +470,11 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["usb_pwr_therm2", "usb_pwr_therm"], "Combination":["usb_pwr_therm2", "usb_pwr_therm"],
"Coefficient":[1.0, -1.0], "Coefficient":[1.0, -1.0],
"HotThreshold":["NAN", "7.0", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
"LimitInfo": [0, 0, 0, 0, 0, 0, 0]
}
],
"Multiplier":0.001,
"PollingDelay":0,
"PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
@ -496,7 +489,7 @@
} }
], ],
"Multiplier":1, "Multiplier":1,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
@ -510,7 +503,7 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "2.0", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "2.0", "NAN"],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
"PollingDelay":60000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {