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

Merge "thermal: use frequency to define hard limit and cdev ceiling" into 24D1-dev am: a4eeccb5b3

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

Change-Id: I727fb3900bcbe5afd72f5d8b4c33cf47707475b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Wang 2024-04-26 18:02:47 +00:00 • committed by Automerger Merge Worker
commit e85df79a1a
1 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

71
thermal/thermal_info_config_comet.json
View file

@ -319,7 +319,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0", "BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2] "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
@ -327,7 +327,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1", "BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6] "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -335,7 +335,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2", "BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15] "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
} }
], ],
"Profile": [ "Profile": [
@ -395,21 +395,22 @@
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7] "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 10, 10, 10, 10, 10, 10] "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17] "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
} }
], ],
"Profile": [ "Profile": [
@ -486,21 +487,21 @@
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9] "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13] "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17] "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
} }
], ],
"Profile": [ "Profile": [
@ -534,25 +535,21 @@
], ],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2] "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [ "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428
],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6] "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [ "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225
],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"CdevCeiling": [0, 15, 15, 15, 15, 15, 15] "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
} }
] ]
} }
@ -590,8 +587,8 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0", "BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9] "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
@ -599,8 +596,8 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1", "BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 13, 13, 13, 14, 16, 16], "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16] "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -608,8 +605,9 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2", "BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 17, 17, 17, 17, 17, 17], "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
"LimitInfo": [0, 0, 0, 0, 0, 17, 17] "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
@ -1032,17 +1030,20 @@
{ {
"Name": "thermal-cpufreq-0", "Name": "thermal-cpufreq-0",
"Type": "CPU", "Type": "CPU",
"WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
"ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies"
}, },
{ {
"Name": "thermal-cpufreq-1", "Name":"thermal-cpufreq-1",
"Type": "CPU", "Type":"CPU",
"WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
"ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies"
}, },
{ {
"Name": "thermal-cpufreq-2", "Name":"thermal-cpufreq-2",
"Type": "CPU", "Type":"CPU",
"WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
"ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies"
}, },
{ {
"Name": "thermal-gpufreq-0", "Name": "thermal-gpufreq-0",