Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "thermal: update USBC throttling policy" into udc-d1-dev am: 6fb1ebc622 am: 066dd1cee9

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23766945

Change-Id: I49817f71851f5abdc402558a3bed9a8209541681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-07-12 13:21:55 +00:00 • committed by Automerger Merge Worker
commit 6e43bbb29e
4 changed files with 72 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
thermal/thermal_info_config_charge_husky.json
View file

@ -185,15 +185,24 @@
"Coefficient":[1, -6], "Coefficient":[1, -6],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"VIRTUAL-USB-THROTTLING-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[10000, 4000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 46000, 10000, 4000], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",

15
thermal/thermal_info_config_charge_shiba.json
View file

@ -200,15 +200,24 @@
"Coefficient":[1, -8], "Coefficient":[1, -8],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"VIRTUAL-USB-THROTTLING-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[10000, 5000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 46000, 10000, 5000], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",

30
thermal/thermal_info_config_husky.json
View file

@ -851,15 +851,24 @@
"Coefficient":[1, -6], "Coefficient":[1, -6],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"VIRTUAL-USB-THROTTLING-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[10000, 4000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 46000, 10000, 4000], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -870,15 +879,24 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{
"Name":"VIRTUAL-USB-UI-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[11000, 5000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-UI", "Name":"VIRTUAL-USB-UI",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"],
"Coefficient":[48000, 48000, 11000, 5000], "Coefficient":[48000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "4.0", "NAN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,

30
thermal/thermal_info_config_shiba.json
View file

@ -843,15 +843,24 @@
"Coefficient":[1, -8], "Coefficient":[1, -8],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"VIRTUAL-USB-THROTTLING-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[10000, 5000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-THROTTLING", "Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 46000, 10000, 5000], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -862,15 +871,24 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{
"Name":"VIRTUAL-USB-UI-SUB0",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[11000, 6000],
"Multiplier":1
},
{ {
"Name":"VIRTUAL-USB-UI", "Name":"VIRTUAL-USB-UI",
"Type":"USB_PORT", "Type":"USB_PORT",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"],
"Coefficient":[48000, 48000, 11000, 6000], "Coefficient":[48000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "4.0", "NAN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,