Merge "thermal: Adjust throttling policy w/ 26 chg_mdis levels" into udc-d1-dev

This commit is contained in:
Treehugger Robot 2023-05-17 04:54:05 +00:00 committed by Android (Google) Code Review
commit bd0ae3ea01
4 changed files with 60 additions and 60 deletions

View file

@ -143,33 +143,33 @@
{ {
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Version":"2.0", "Version":"2.1",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":60000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2000 "I_Default":1302
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
"PowerRail": "PARTIAL_SYSTEM_POWER", "PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
} }
], ],
"BindedCdevInfo": [ "BindedCdevInfo": [
@ -178,8 +178,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9] "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
} }
] ]
}, },

View file

@ -154,33 +154,33 @@
{ {
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Version":"2.0", "Version":"2.1",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":60000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2000 "I_Default":1099
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
"PowerRail": "PARTIAL_SYSTEM_POWER", "PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
} }
], ],
"BindedCdevInfo": [ "BindedCdevInfo": [
@ -189,8 +189,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9] "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
} }
] ]
}, },

View file

@ -555,33 +555,33 @@
{ {
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Version":"2.0", "Version":"2.1",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":60000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2000 "I_Default":1302
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
"PowerRail": "PARTIAL_SYSTEM_POWER", "PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
} }
], ],
"BindedCdevInfo": [ "BindedCdevInfo": [
@ -590,8 +590,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9] "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
} }
] ]
}, },

View file

@ -532,33 +532,33 @@
{ {
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Version":"2.0", "Version":"2.1",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":60000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2000 "I_Default":1099
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
"PowerRail": "PARTIAL_SYSTEM_POWER", "PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
} }
], ],
"BindedCdevInfo": [ "BindedCdevInfo": [
@ -567,8 +567,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9] "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
} }
] ]
}, },