thermal: update thermal config

Algin with latest device setting

1. Update cdevceiling and hardlimit with frequency
2. Update TPU thermal throttle policy
3. Release thermal throttle in camera and game mode

Bug: 317750833
Test: Build and flash on device
Change-Id: If51183f72822febb3b3cf0cac33d03b33a4fb270
Signed-off-by: Peter (YM) <peterym@google.com>
This commit is contained in:
Peter (YM) 2024-05-07 02:54:18 +00:00
parent 7de12294a2
commit 605307f729

View file

@ -291,10 +291,6 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{ {
"CdevRequest": "gxp-cooling", "CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6] "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -349,23 +345,48 @@
"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",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2", "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",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1", "BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8] "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
}
],
"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,21 +421,21 @@
"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, 6, 6, 6, 6, 6, 6] "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, 9, 9, 9, 9, 9, 9] "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, 12, 12, 12, 12, 12, 12] "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
} }
], ],
"Profile": [ "Profile": [
@ -437,6 +458,26 @@
"Disabled":true "Disabled":true
} }
] ]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
} }
] ]
}, },
@ -471,21 +512,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, 8, 8, 8, 8, 8, 8] "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, 11, 11, 11, 11, 11, 11] "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 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, 13, 13, 13, 13, 13, 13] "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
} }
], ],
"Profile": [ "Profile": [
@ -513,26 +554,32 @@
"Mode": "camera", "Mode": "camera",
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"Disabled":true "MaxReleaseStep": 1,
}, "MaxThrottleStep": 1,
{ "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
"CdevRequest": "thermal-cpufreq-1", },
"MaxReleaseStep": 1, {
"Disabled":true "CdevRequest": "thermal-cpufreq-1",
}, "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
{ "MaxReleaseStep": 1,
"CdevRequest": "thermal-cpufreq-2", "MaxThrottleStep": 2,
"MaxReleaseStep": 1, "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
"Disabled":true },
} {
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
}
] ]
} }
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -552,7 +599,7 @@
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
}, },
@ -563,26 +610,26 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0", "BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 8, 8, 8, 8, 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",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL2", "BindedPowerRail": "S2M_VDD_CPUCL1",
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14], "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14] "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 2, "MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL1", "BindedPowerRail": "S3M_VDD_CPUCL2",
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14] "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
@ -590,8 +637,17 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11], "CdevCeilingFrequency": [940000, 419000, 419000, 419000, 376000, 302000, 302000],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11] "LimitInfoFrequency": [940000, 940000, 940000, 940000, 940000, 302000, 302000]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
} }
] ]
}, },
@ -624,7 +680,7 @@
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"CdevCeiling": [0, 8, 8, 9, 11, 11, 11] "CdevCeilingFrequency": [940000, 419000, 419000, 376000, 302000, 302000, 302000]
} }
] ]
}, },
@ -862,22 +918,26 @@
{ {
"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",
"Type":"GPU", "Type":"GPU",
"WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
"ScalingAvailableFrequenciesPath": "/sys/devices/platform/1f000000.mali/available_frequencies"
}, },
{ {
"Name":"fcc", "Name":"fcc",
@ -923,6 +983,11 @@
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":1 "PowerSampleCount":1
}, },
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{ {
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,