Snap for 8964747 from f6c62eaafe to udc-release

Change-Id: I9ec4a39dce4267b7a0eff6e0edffe3a776da0aa4
This commit is contained in:
Android Build Coastguard Worker 2022-08-19 01:02:46 +00:00
commit 769863afb3

View file

@ -62,34 +62,54 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-QUIET-SKIN2-USB2", "Name":"VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2"], "Combination":["neutral_therm", "quiet_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.4, 0.3, 0.3], "Coefficient":[0.1, 0.4, 0.15, 0.1, 0.1, 0.15],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN2-SKIN1-GNSS-BATT", "Name":"VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "skin_therm1", "gnss_tcxo_therm", "battery"], "Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.2, 0.2, 0.1, 0.5], "Coefficient":[0.2, 0.26, 0.1, 0.19, 0.25],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN2-USB2-DISP-BATT",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm", "battery"],
"Coefficient":[0.28, 0.21, 0.3, 0.21],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUT-SKIN2-USB2-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.35, 0.25, 0.2, 0.2],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.1", "Version":"0.4",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm1", "TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -107,13 +127,14 @@
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm1", "TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 40.0, 41.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
@ -123,11 +144,12 @@
"K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"],
"E_Integral_Default": 50 "I_Default": 1000,
"TranCycle": 5
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -136,6 +158,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0", "BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 8, 8, 8, 8, 10, 10],
"LimitInfo": [0, 0, 0, 0, 8, 10, 10] "LimitInfo": [0, 0, 0, 0, 8, 10, 10]
}, },
{ {
@ -144,6 +167,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S3M_VDD_CPUCL1", "BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14] "LimitInfo": [0, 0, 0, 0, 12, 14, 14]
}, },
{ {
@ -152,6 +176,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S2M_VDD_CPUCL2", "BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 15, 15, 15, 15, 17, 17],
"LimitInfo": [0, 0, 0, 0, 15, 17, 17] "LimitInfo": [0, 0, 0, 0, 15, 17, 17]
}, },
{ {
@ -160,42 +185,92 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"LimitInfo": [0, 0, 0, 0, 10, 11, 11] "CdevCeiling": [0, 8, 8, 8, 8, 11, 11],
"LimitInfo": [0, 0, 0, 0, 8, 11, 11]
} }
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm1", "TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 35.0, 39.0, 43.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, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"Monitor":true,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
}
],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "fcc", "CdevRequest": "fcc",
"LimitInfo": [0, 3, 6, 6, 8, 8, 8], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"BindedPowerRail": "PARTIAL_SYSTEM_POWER", "MaxReleaseStep": 1,
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "MaxThrottleStep": 1,
"CdevFloorWithPowerLink": [0, 0, 3, 3, 8 ,8 ,8], "CdevCeiling": [0, 9, 10, 11, 12, 12, 12],
"ReleaseLogic": "RELEASE_TO_FLOOR", "LimitInfo": [0, 0, 0, 0, 0, 12, 12]
"ThrottlingWithPowerLink":true }
]
}, },
{
"Name":"VIRTUAL-SKIN-CHARGE-WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.51, 0.25, 0.24],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
}
],
"BindedCdevInfo": [
{ {
"CdevRequest": "dc_icl", "CdevRequest": "dc_icl",
"LimitInfo": [0, 1, 2, 3, 4, 4, 4], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"BindedPowerRail": "PARTIAL_SYSTEM_POWER", "MaxReleaseStep": 1,
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "MaxThrottleStep": 1,
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], "CdevCeiling": [0, 5, 10, 11, 12, 12, 12],
"ReleaseLogic": "RELEASE_TO_FLOOR", "LimitInfo": [0, 0, 0, 0, 0, 12, 12]
"ThrottlingWithPowerLink":true
} }
] ]
}, },
@ -205,12 +280,12 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm1", "TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"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,
"Monitor":true, "SendCallback":true,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
@ -218,10 +293,20 @@
"Name":"USB-MINUS-SKIN2", "Name":"USB-MINUS-SKIN2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor": "usb_pwr_therm",
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["usb_pwr_therm", "skin_therm2"], "Combination":["usb_pwr_therm", "skin_therm2"],
"Coefficient":[1.0, -1.0], "Coefficient":[1.0, -1.0],
"Multiplier":0.001 "HotThreshold":["NAN", "7.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"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",
@ -651,7 +736,10 @@
], ],
"PowerRails":[ "PowerRails":[
{ {
"Name":"PPVAR_VSYS_PWR_DISP" "Name":"VSYS_PWR_WLAN_BT"
},
{
"Name":"VSYS_PWR_DISPLAY"
}, },
{ {
"Name":"VSYS_PWR_MODEM" "Name":"VSYS_PWR_MODEM"
@ -687,8 +775,8 @@
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D", "VSYS_PWR_WLAN_BT", "VSYS_PWR_DISPLAY"],
"Coefficient":[1.0, 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, 1.0, 1.0, 1.0],
"PowerSampleDelay":14000, "PowerSampleDelay":14000,
"PowerSampleCount":5 "PowerSampleCount":5
} }