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

Merge "thermal: adjust CPU cdev_ceiling" into 24D1-dev am: f7df63d4f9

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

Change-Id: I79158b005a234ce91f588b30d581135d86eb1458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Wang 2024-04-12 21:15:03 +00:00 • committed by Automerger Merge Worker
commit 9065c261cb
6 changed files with 137 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

22
thermal/thermal_info_config_caiman.json
View file

@ -335,7 +335,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -343,7 +343,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -351,7 +351,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
@ -411,21 +411,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -509,7 +509,7 @@
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -548,21 +548,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
]
}
@ -609,7 +609,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"CdevCeiling": [0, 13, 13, 13, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{

48
thermal/thermal_info_config_caiman_wingboard.json
View file

@ -353,6 +353,31 @@
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
{
"Mode": "game",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"BindedPowerRail": "S4M_VDD_CPUCL0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"BindedPowerRail": "S2M_VDD_CPUCL1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"BindedPowerRail": "S3M_VDD_CPUCL2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
{
@ -400,7 +425,7 @@
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -575,8 +600,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -769,21 +794,6 @@
"Coefficient": [1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
"Name":"thb_hda",
"Type":"UNKNOWN",
"Multiplier":1
},
{
"Name":"IS_WIRED_CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"],
"Coefficient":[-1],
"Multiplier":1
},
{
"Name": "VIRTUAL-USB-THROTTLING",
"Type": "UNKNOWN",
@ -979,7 +989,7 @@
},
{
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
"TempRange": [-12000, 12000]
"TempRange": [-10000, 10000]
}
]
}

56
thermal/thermal_info_config_komodo.json
View file

@ -344,7 +344,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -352,7 +352,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -360,7 +360,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
@ -420,21 +420,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -518,7 +518,7 @@
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -553,26 +553,26 @@
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
}
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
]
}
]
@ -618,7 +618,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"CdevCeiling": [0, 13, 13, 13, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{

48
thermal/thermal_info_config_komodo_wingboard.json
View file

@ -362,6 +362,31 @@
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
{
"Mode": "game",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"BindedPowerRail": "S4M_VDD_CPUCL0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"BindedPowerRail": "S2M_VDD_CPUCL1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"BindedPowerRail": "S3M_VDD_CPUCL2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
{
@ -409,7 +434,7 @@
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -584,8 +609,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -767,21 +792,6 @@
"Coefficient": [1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
"Name":"thb_hda",
"Type":"UNKNOWN",
"Multiplier":1
},
{
"Name":"IS_WIRED_CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"],
"Coefficient":[-1],
"Multiplier":1
},
{
"Name": "VIRTUAL-USB-THROTTLING",
"Type": "UNKNOWN",
@ -985,7 +995,7 @@
},
{
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
"TempRange": [-12000, 12000]
"TempRange": [-10000, 10000]
}
]
}

22
thermal/thermal_info_config_tokay.json
View file

@ -327,7 +327,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -335,7 +335,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -343,7 +343,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
@ -403,21 +403,21 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11]
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -501,7 +501,7 @@
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 14, 14, 14, 14, 14, 14]
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -540,21 +540,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 4, 4, 4, 4, 4, 4]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
]
}
@ -601,7 +601,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"CdevCeiling": [0, 13, 13, 13, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
},
{

48
thermal/thermal_info_config_tokay_wingboard.json
View file

@ -345,6 +345,31 @@
"BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
}
],
"Profile": [
{
"Mode": "game",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"BindedPowerRail": "S4M_VDD_CPUCL0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"BindedPowerRail": "S2M_VDD_CPUCL1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"BindedPowerRail": "S3M_VDD_CPUCL2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
}
]
},
{
@ -392,7 +417,7 @@
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 16, 16, 16, 16, 16, 16]
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
}
],
"Profile": [
@ -567,8 +592,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-1",
@ -827,21 +852,6 @@
"Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
"Name":"thb_hda",
"Type":"UNKNOWN",
"Multiplier":1
},
{
"Name":"IS_WIRED_CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"],
"Coefficient":[-1],
"Multiplier":1
},
{
"Name": "VIRTUAL-USB-THROTTLING",
"Type": "UNKNOWN",
@ -1033,7 +1043,7 @@
},
{
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
"TempRange": [-12000, 12000]
"TempRange": [-10000, 10000]
}
]
}