Skip to content

Commit 1c2f2a4

Browse files
geo9leeTreeHugger Robot
geo9lee
authored and
TreeHugger Robot
committed
Revert "thermal: remove userspace throttling for BCL tzone"
This reverts commit 7e2cc1e. Reason for revert: Move throttling back to userspace Bug: 239887528 Signed-off-by: George Lee <[email protected]> Change-Id: I4ef3851a7163e50ed95862ba99330046634e032c
1 parent 0a7819c commit 1c2f2a4

4 files changed

+256
-16
lines changed

‎thermal_info_config_cheetah.json

+64-4
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,22 @@
511511
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
512512
"Multiplier":1,
513513
"Monitor":true,
514-
"PassiveDelay":7000
514+
"PollingDelay":0,
515+
"PassiveDelay":1000,
516+
"BindedCdevInfo": [
517+
{
518+
"CdevRequest": "thermal-cpufreq-2",
519+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
520+
},
521+
{
522+
"CdevRequest": "thermal-gpufreq-0",
523+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
524+
},
525+
{
526+
"CdevRequest": "tpu_cooling",
527+
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
528+
}
529+
]
515530
},
516531
{
517532
"Name":"BCL_AUDIO_BAACL",
@@ -532,7 +547,22 @@
532547
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
533548
"Multiplier":1,
534549
"Monitor":true,
535-
"PassiveDelay":7000
550+
"PollingDelay":0,
551+
"PassiveDelay":1000,
552+
"BindedCdevInfo": [
553+
{
554+
"CdevRequest": "thermal-cpufreq-2",
555+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
556+
},
557+
{
558+
"CdevRequest": "thermal-gpufreq-0",
559+
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
560+
},
561+
{
562+
"CdevRequest": "tpu_cooling",
563+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
564+
}
565+
]
536566
},
537567
{
538568
"Name":"vdroop2",
@@ -541,7 +571,22 @@
541571
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
542572
"Multiplier":1,
543573
"Monitor":true,
544-
"PassiveDelay":7000
574+
"PollingDelay":0,
575+
"PassiveDelay":1000,
576+
"BindedCdevInfo": [
577+
{
578+
"CdevRequest": "thermal-cpufreq-2",
579+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
580+
},
581+
{
582+
"CdevRequest": "thermal-gpufreq-0",
583+
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
584+
},
585+
{
586+
"CdevRequest": "tpu_cooling",
587+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
588+
}
589+
]
545590
},
546591
{
547592
"Name":"smpl_gm",
@@ -550,7 +595,22 @@
550595
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
551596
"Multiplier":1,
552597
"Monitor":true,
553-
"PassiveDelay":7000
598+
"PollingDelay":0,
599+
"PassiveDelay":1000,
600+
"BindedCdevInfo": [
601+
{
602+
"CdevRequest": "thermal-cpufreq-2",
603+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
604+
},
605+
{
606+
"CdevRequest": "thermal-gpufreq-0",
607+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
608+
},
609+
{
610+
"CdevRequest": "tpu_cooling",
611+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
612+
}
613+
]
554614
},
555615
{
556616
"Name":"ocp_cpu1",

‎thermal_info_config_cloudripper.json

+64-4
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,22 @@
174174
"VrThreshold":"NAN",
175175
"Multiplier":1,
176176
"Monitor":true,
177-
"PassiveDelay":7000
177+
"PollingDelay":0,
178+
"PassiveDelay":1000,
179+
"BindedCdevInfo": [
180+
{
181+
"CdevRequest": "thermal-cpufreq-2",
182+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
183+
},
184+
{
185+
"CdevRequest": "thermal-gpufreq-0",
186+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
187+
},
188+
{
189+
"CdevRequest": "tpu_cooling",
190+
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
191+
}
192+
]
178193
},
179194
{
180195
"Name":"BCL_AUDIO_BAACL",
@@ -227,7 +242,22 @@
227242
"VrThreshold":"NAN",
228243
"Multiplier":1,
229244
"Monitor":true,
230-
"PassiveDelay":7000
245+
"PollingDelay":0,
246+
"PassiveDelay":1000,
247+
"BindedCdevInfo": [
248+
{
249+
"CdevRequest": "thermal-cpufreq-2",
250+
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
251+
},
252+
{
253+
"CdevRequest": "thermal-gpufreq-0",
254+
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
255+
},
256+
{
257+
"CdevRequest": "tpu_cooling",
258+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
259+
}
260+
]
231261
},
232262
{
233263
"Name":"vdroop2",
@@ -253,7 +283,22 @@
253283
"VrThreshold":"NAN",
254284
"Multiplier":1,
255285
"Monitor":true,
256-
"PassiveDelay":7000
286+
"PollingDelay":0,
287+
"PassiveDelay":1000,
288+
"BindedCdevInfo": [
289+
{
290+
"CdevRequest": "thermal-cpufreq-2",
291+
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
292+
},
293+
{
294+
"CdevRequest": "thermal-gpufreq-0",
295+
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
296+
},
297+
{
298+
"CdevRequest": "tpu_cooling",
299+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
300+
}
301+
]
257302
},
258303
{
259304
"Name":"smpl_gm",
@@ -279,7 +324,22 @@
279324
"VrThreshold":"NAN",
280325
"Multiplier":1,
281326
"Monitor":true,
282-
"PassiveDelay":7000
327+
"PollingDelay":0,
328+
"PassiveDelay":1000,
329+
"BindedCdevInfo": [
330+
{
331+
"CdevRequest": "thermal-cpufreq-2",
332+
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
333+
},
334+
{
335+
"CdevRequest": "thermal-gpufreq-0",
336+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
337+
},
338+
{
339+
"CdevRequest": "tpu_cooling",
340+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
341+
}
342+
]
283343
},
284344
{
285345
"Name":"ocp_cpu1",

‎thermal_info_config_panther.json

+64-4
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,22 @@
512512
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
513513
"Multiplier":1,
514514
"Monitor":true,
515-
"PassiveDelay":7000
515+
"PollingDelay":0,
516+
"PassiveDelay":1000,
517+
"BindedCdevInfo": [
518+
{
519+
"CdevRequest": "thermal-cpufreq-2",
520+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
521+
},
522+
{
523+
"CdevRequest": "thermal-gpufreq-0",
524+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
525+
},
526+
{
527+
"CdevRequest": "tpu_cooling",
528+
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
529+
}
530+
]
516531
},
517532
{
518533
"Name":"BCL_AUDIO_BAACL",
@@ -533,7 +548,22 @@
533548
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
534549
"Multiplier":1,
535550
"Monitor":true,
536-
"PassiveDelay":7000
551+
"PollingDelay":0,
552+
"PassiveDelay":1000,
553+
"BindedCdevInfo": [
554+
{
555+
"CdevRequest": "thermal-cpufreq-2",
556+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
557+
},
558+
{
559+
"CdevRequest": "thermal-gpufreq-0",
560+
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
561+
},
562+
{
563+
"CdevRequest": "tpu_cooling",
564+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
565+
}
566+
]
537567
},
538568
{
539569
"Name":"vdroop2",
@@ -542,7 +572,22 @@
542572
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
543573
"Multiplier":1,
544574
"Monitor":true,
545-
"PassiveDelay":7000
575+
"PollingDelay":0,
576+
"PassiveDelay":1000,
577+
"BindedCdevInfo": [
578+
{
579+
"CdevRequest": "thermal-cpufreq-2",
580+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
581+
},
582+
{
583+
"CdevRequest": "thermal-gpufreq-0",
584+
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
585+
},
586+
{
587+
"CdevRequest": "tpu_cooling",
588+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
589+
}
590+
]
546591
},
547592
{
548593
"Name":"smpl_gm",
@@ -551,7 +596,22 @@
551596
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
552597
"Multiplier":1,
553598
"Monitor":true,
554-
"PassiveDelay":7000
599+
"PollingDelay":0,
600+
"PassiveDelay":1000,
601+
"BindedCdevInfo": [
602+
{
603+
"CdevRequest": "thermal-cpufreq-2",
604+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
605+
},
606+
{
607+
"CdevRequest": "thermal-gpufreq-0",
608+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
609+
},
610+
{
611+
"CdevRequest": "tpu_cooling",
612+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
613+
}
614+
]
555615
},
556616
{
557617
"Name":"ocp_cpu1",

‎thermal_info_config_ravenclaw.json

+64-4
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,22 @@
376376
"VrThreshold":"NAN",
377377
"Multiplier":1,
378378
"Monitor":true,
379-
"PassiveDelay":7000
379+
"PollingDelay":0,
380+
"PassiveDelay":1000,
381+
"BindedCdevInfo": [
382+
{
383+
"CdevRequest": "thermal-cpufreq-2",
384+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
385+
},
386+
{
387+
"CdevRequest": "thermal-gpufreq-0",
388+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
389+
},
390+
{
391+
"CdevRequest": "tpu_cooling",
392+
"LimitInfo": [0, 0, 0, 0, 5, 5, 5]
393+
}
394+
]
380395
},
381396
{
382397
"Name":"BCL_AUDIO_BAACL",
@@ -429,7 +444,22 @@
429444
"VrThreshold":"NAN",
430445
"Multiplier":1,
431446
"Monitor":true,
432-
"PassiveDelay":7000
447+
"PollingDelay":0,
448+
"PassiveDelay":1000,
449+
"BindedCdevInfo": [
450+
{
451+
"CdevRequest": "thermal-cpufreq-2",
452+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
453+
},
454+
{
455+
"CdevRequest": "thermal-gpufreq-0",
456+
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
457+
},
458+
{
459+
"CdevRequest": "tpu_cooling",
460+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
461+
}
462+
]
433463
},
434464
{
435465
"Name":"vdroop2",
@@ -455,7 +485,22 @@
455485
"VrThreshold":"NAN",
456486
"Multiplier":1,
457487
"Monitor":true,
458-
"PassiveDelay":7000
488+
"PollingDelay":0,
489+
"PassiveDelay":1000,
490+
"BindedCdevInfo": [
491+
{
492+
"CdevRequest": "thermal-cpufreq-2",
493+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
494+
},
495+
{
496+
"CdevRequest": "thermal-gpufreq-0",
497+
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
498+
},
499+
{
500+
"CdevRequest": "tpu_cooling",
501+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
502+
}
503+
]
459504
},
460505
{
461506
"Name":"smpl_gm",
@@ -481,7 +526,22 @@
481526
"VrThreshold":"NAN",
482527
"Multiplier":1,
483528
"Monitor":true,
484-
"PassiveDelay":7000
529+
"PollingDelay":0,
530+
"PassiveDelay":1000,
531+
"BindedCdevInfo": [
532+
{
533+
"CdevRequest": "thermal-cpufreq-2",
534+
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
535+
},
536+
{
537+
"CdevRequest": "thermal-gpufreq-0",
538+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
539+
},
540+
{
541+
"CdevRequest": "tpu_cooling",
542+
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
543+
}
544+
]
485545
},
486546
{
487547
"Name":"ocp_cpu1",

0 commit comments

Comments
 (0)