Merge "thermal: update USBC throttling policy" into udc-d1-dev

This commit is contained in:
Treehugger Robot 2023-07-12 12:09:34 +00:00 committed by Android (Google) Code Review
commit 6fb1ebc622
4 changed files with 72 additions and 18 deletions

View file

@ -185,15 +185,24 @@
"Coefficient":[1, -6],
"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",
"Type":"USB_PORT",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[46000, 46000, 10000, 4000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",

View file

@ -200,15 +200,24 @@
"Coefficient":[1, -8],
"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",
"Type":"USB_PORT",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"],
"Coefficient":[46000, 46000, 10000, 5000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"],
"BindedCdevInfo": [
{
"CdevRequest": "usbc-port",

View file

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

View file

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