thermal: update USBC throttling policy am: 37dc2b7dbd

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

Change-Id: I3b12055a3ed9f54de7b5b688147dfb1f5148efa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TeYuan Wang 2023-02-02 03:13:15 +00:00 committed by Automerger Merge Worker
commit 232eb294e0
2 changed files with 170 additions and 2 deletions

View file

@ -36,8 +36,11 @@
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"usb_pwr_therm2",
@ -66,12 +69,76 @@
"LimitInfo": [0, 1, 2, 3, 4, 5, 5]
}
]
},
{
"Name":"USB-MINUS-USB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":["1.0", "-1.0"],
"Multiplier":0.001
},
{
"Name":"NEUTRAL-MINUS-USB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm2"],
"Coefficient":["1.0", "-1.0"],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-USBC-THROTTLING-LOW-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2"],
"Coefficient":["38000", "5500"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USBC-THROTTLING-HIGH-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "NEUTRAL-MINUS-USB2"],
"Coefficient":["38000", "1000", "10000"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":["VIRTUAL-USBC-THROTTLING-LOW-SOC", "VIRTUAL-USBC-THROTTLING-HIGH-SOC"],
"Coefficient":["2.0", "3.0"],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "1.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
"LimitInfo": [0, 0, 0, 0, 1, 1, 1]
}
],
"Multiplier":1,
"PollingDelay":300000,
"PassiveDelay":7000
}
],
"CoolingDevices":[
{
"Name":"fcc",
"Type":"BATTERY"
},
{
"Name":"usbc-port",
"Type":"BATTERY"
}
]
}

View file

@ -41,8 +41,11 @@
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"usb_pwr_therm2",
@ -212,6 +215,100 @@
}
]
},
{
"Name":"USB-MINUS-USB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":["1.0", "-1.0"],
"Multiplier":0.001
},
{
"Name":"NEUTRAL-MINUS-USB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm2"],
"Coefficient":["1.0", "-1.0"],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-USBC-THROTTLING-LOW-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2"],
"Coefficient":["38000", "5500"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USBC-UI-LOW-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2"],
"Coefficient":["38000", "6000"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USBC-THROTTLING-HIGH-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "NEUTRAL-MINUS-USB2"],
"Coefficient":["38000", "1000", "10000"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USBC-UI-HIGH-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["usb_pwr_therm", "USB-MINUS-USB2", "NEUTRAL-MINUS-USB2"],
"Coefficient":["38000", "1500", "10000"],
"Multiplier":1
},
{
"Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":["VIRTUAL-USBC-THROTTLING-LOW-SOC", "VIRTUAL-USBC-THROTTLING-HIGH-SOC"],
"Coefficient":["2.0", "3.0"],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "1.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",
"LimitInfo": [0, 0, 0, 0, 1, 1, 1]
}
],
"Multiplier":1,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-USB-UI",
"Type":"USB_PORT",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":["VIRTUAL-USBC-UI-LOW-SOC", "VIRTUAL-USBC-UI-HIGH-SOC"],
"Coefficient":["2.0", "3.0"],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "1.0", "NAN"],
"Multiplier":1,
"SendCallback":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"cellular-emergency",
"Type":"POWER_AMPLIFIER",
@ -617,6 +714,10 @@
{
"Name":"fcc",
"Type":"BATTERY"
},
{
"Name":"usbc-port",
"Type":"BATTERY"
}
],
"PowerRails":[