From e3f2c1238c79a7d7ac3d98f42006cfa386b566f6 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Tue, 27 Feb 2024 09:29:46 +0000 Subject: [PATCH 1/5] Disable MTE on certain system processes that have it enabled by default A bunch of stuff in build/make/target/product/memtag-common.mk is specified has having MTE by default, in order to ensure that OEMs that have MTE-capable devices get a default level of MTE on security sensitive processes. For now, on these devices, ensure that devices that enable MTE through the developer toggle (or the bootloader cmdline) only have the zygote with MTE. Bug: 327060622 Change-Id: Ibb6d4fba7915c8556ebe9a303d38f7c642ad8fe9 Test: I do not have a device to test with - but follow the instructions at b/327060622 --- device-ripcurrent24.mk | 11 +++++++++++ device-ripcurrentpro.mk | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index 37d67c53..f6970e68 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -241,3 +241,14 @@ PRODUCT_VENDOR_PROPERTIES += \ # PKVM Memory Reclaim PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 + +# Indicate that the bootloader supports the MTE developer option switch +# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that +# force enable MTE. +ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) +PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off +endif diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 26a9120d..4c927241 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -241,3 +241,15 @@ PRODUCT_VENDOR_PROPERTIES += \ # PKVM Memory Reclaim PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 + +# Indicate that the bootloader supports the MTE developer option switch +# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that +# force enable MTE. +ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) +PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off +endif + From 879af0e284b3ecf6424258d4c1a6c0cb86926ec4 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Thu, 22 Feb 2024 12:23:42 -0800 Subject: [PATCH 2/5] thermal: update vt model with 3 prev samples Bug: 326130588 Test: Build and boot on device Change-Id: If08449d01fc3c70ef68ba2900ab0ea0d6840a9c4 Signed-off-by: Sayanna Chandula --- thermal/thermal_info_config_komodo.json | 2 +- thermal/thermal_info_config_komodo_proto.json | 2 +- thermal/vt_estimation_model_komodo.tflite | Bin 4887 -> 3917 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 63890f56..82bac28f 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -227,7 +227,7 @@ "Coefficient": [1.0], "Multiplier": 0.001, "Offset": 500, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index d752040a..01113165 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -226,7 +226,7 @@ "Coefficient": [1.0], "Multiplier": 0.001, "Offset": 500, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", diff --git a/thermal/vt_estimation_model_komodo.tflite b/thermal/vt_estimation_model_komodo.tflite index 1f3b7b19d3f411f087c98d34151e7579b016c526..0792305d6edd28a8f962b9b70d64ed14e821e103 100644 GIT binary patch delta 1404 zcmY+Edo)#f6vxlKUGG;3V^FS)$3%@9sm49ObG*vqj-&^vX{m`R-D%_z>2WWiBJwJg z4DuKnc|CE z1R;_mRZq1GR!U#NnaiD=s0!q?bGfaP>EG}+a~DpfpWzvZ z*$J8KrX24nnT$segr%I#bJ~%zWQuW~AApAUj*$VElTof|D~WWsA*=nT?3?qSAZBWS zjQ=;YOdf18^+B#tEUHc|WVe(swK9w2A`IIo=MJyCU)PhxY873?=rZxdXNneNOWa zX&`IoFyz}IVEknf$kBiczjOSdzdjVP-oJpL;v(>do-+JCHD=yQJ7_%=2SLt9kbdVi z^8KAc2u@;1&0|a9!?J9IpPYvE^>;w^-c2Nmy2$Xv1ty4_=nK2-N>O8jA9Q!*L28f? z9=)iC{N*AT{=$SzJ|2(m@(WRJ_*sTuwvurjzC!Xt%9+;X`S5_xCF8f0Bez2(Fl?!V zdN&l+?#*|GV7C)!)haKrzN7~>vywsdHWBFc!B9L}&Dcv0LRf)1vYva35{GxluOBZ5 z4Y4L2bVHjSv|5Kt=QvX)HA3oTg9SV4KT6)8P^AqsRdAHi5Tzt3pj;MtcRLDa&J$i?#*+d7m%*LbH;HA5DHe3z3H zU)Ph88Mun+XKe?m$gdr7|DX=rM@gx?D`NboX?v}rmj-el>j9yGHf@!?hhm!CaL9!p z+4xHzYsbrGuvWG+AT_4}Jfhy>jXS!iDur4ywpta(Jj!7kVy)S;f^S*daxL_Fo(Ze1 z--@jlDI5J_V^La zi_1it4Sm?)A7ZGTuO{%elcuoXK@t^wC6tQh3 zTX0X;22b=!G5RYMmnGk(52y*K#DY_-Fk1pURv$&~X+8E6e$m)8-IVpcHbQMI>Z9XA zswu<9UF_Aw5#;W%69Q}U*5UBB$N1_%4sMeD_kiR-h>$YI*Qfh*)#>w`W($p+WDb^2 z0gYbx{N>78@0>|Tf>0!s37%XDxqhOuQ_ZQ$OFfLsF-))5oRVvu)>66tp|wEMMPa?K ynsiQ61cx9ZI90YYQ#saN9vrUD44vsU#Q%MQ_%!{;A|xE4M*16VbH#DZ>A~MAK#HLN delta 2390 zcmZXVdo-08ZrnO3`e}2HJxodSh<7M%4U!LDYhK%#&#PPXOEvEdiOyp z{U9THSSlSadv7SCADe-2VLWLTK7#aP`qolE$)*4P zQIIEy!Q%wnHO!_2{&FaTOJICk3HceC!{GQ-sI@{Jc=q3iYQz%EpL`7d=yVb}vZArw z?|Vd8diFBVUKR`8RUeR7G!-Gfz{PGVny_Rk8(CYY;Ir?Q@YEgqiOC0F7!92VGm!kbWvA`@j5|-Fq15+!j!TCNh9`&3IxA)nB-1b^LPtc6g zHyP5(R(Wtk_k55tivqqbB6+4*yn!0Xw&k78Amo&qU-`f`hKblyIaE z@6Irxtm|A+ONu(Yx`IzWdT7RUs;V){v-IKcid|IEEeE`O&k)=m%Ak`SdN{$%2F}yh zWrWgxEat6&XGa%O)h`}cWf0{s)xDXf&#@VDNDZzRwQDdB!d~Nz`;Nj)*Oze7tTL!K zbO5&1s$xKHXTn;~z*T8;nftmdrn=}VR2#eq4G$TUZ@0#y=((Tio|l#gt)B>zN{dlY zRSJE_){XXvawl`yrXU^dMWrhPfb+d=Ag)x5T#|cf)k7Kl12w8-r~Dx#ki;O7!d6qd z)HxEhzqg@zYP-Rd<>%p zdrSbl9+JcGR-P4Mw&fN0e)tmXwGM>0OdrCT!cEX7DGb-HS_OHJa+#LqI9z3pU~F9? zG}kc!lxY?8)YF08ihg)zuM&J&>BXeSt;J?N<#2^w0`$o`K~wW{;BU3_$+t8Imls9> zA6*kBD{&E)Ydr#P81#D3>+)z7E z(zbw-OI?rstnOg$Y%VO2>QKX_Ezl$II`rs@gUhBr#;{`q)>P->9Zj8huTBT}sQnNg zHjROuU0QIoWEWf>+=*+HnqgsNBW67zm~kD(ATzB7Djao#8lngHz=bqEEY#@2Zl7#n zU)w{Re&YickZx9Aw6kDHiV3iPE}=iIHHR9Ja*WfBBgm?;7Wa0}VZ3fSkosLbpgE4f z3XOhrupJwIRBpu=w5-v2g=#CS1CIRaY4!9@X&rg0*ciCx`k;==Lh^L19^mEX&shPrD+~HvVQ18s$xv-d#;5 z4*wy^eIAE)gk_+KR<1~KSq3O@x1=X|oB*2Fy68HPgmNAQp_y2lEcbRqO{;ZCb+_Y4 zTU<_i=S-u|eKAFvf2JUJgF+EnvvHJ`cO0bsZ+{}wcVn{HNsP|D&6C6(93j&ZXV6{e zMQC)O1Py!MB(HcR&?EPRptP=>lor*JvEEMLC;6kud7d*+DqoBWHw@94;>Dm~x*Euf z$ma7c3PFP)3aySQLq8W4BcA?AP;|=zVTlrHAKOjaX^D8WdU+Tao~n!#xk%t-L| z2QC_?6Ac7U+>zohM!;v# zp1hB5s9P|e?APderWsZ6*szc4#p!*q?pQnvFUo4`OLMMU=-JS4NVj(D)1ab2|1>AY3 zAMe*~!nRevl4f}tRHc3y>G^sHGVYgPk>nZL%*10!&2cO=v_U_9V1w=xy3}yFDQ5nd zK&3^r!0h&|RKp?zEL!&JTK%(i2F#ta_c52qNAZs{p~Hkyv@7ZYjEvkwWl4A9lr1{Q zGixFmuNG;bLr4odgg5ypmGhFbCVuX)TKr?s?*(KVB-hVu6HSn2*c-yYi zpQ@wDbZ>LA|9J&^sx73OLfF8|^e8Q#n@V@gEC8pfw7|?Km+8LW4+7J!MZm*LlmcEX z2}jZK-E{Pfp89upl~Bj$X~0Q%gTHnl4op_FK%@TYpr(Bb*!-* z#gQyhyitQZ?RNxaPE7^T!+X#a+ieJbJV)j|El0-Zz0eKmx2?*_-Po|(@rAW)!4jON zI}NiNT^kIkMo_K$N6UGasJoN<2bBgu?;oGX?&eG Y@&7aW`}*&QWa+5NCT1`Jt9|W%0oA}mXaE2J From 361c057f61b048f60a9c291c9b5906de7542d405 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Tue, 20 Feb 2024 16:31:22 -0800 Subject: [PATCH 3/5] powerhint: port changes from p23 - Add DISPLAY_CHANGE powerhint - Add more boosts to LAUNCH_EXTEND - Remove unused idle target residency settings Test: boot Change-Id: Iadaf2c57ce2e85c72bff9fbf4891300caa3eb469 --- perf/powerhint-caiman.json | 165 ++++++++++++++++++++++----- perf/powerhint-komodo.json | 169 ++++++++++++++++++++++------ perf/powerhint-ripcurrentpro.json | 181 ++++++++++++++++++++++++------ perf/powerhint-tokay.json | 169 ++++++++++++++++++++++------ 4 files changed, 558 insertions(+), 126 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 50f1951b..236827d3 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -213,24 +213,6 @@ ], "ResetOnInit": true }, - { - "Name": "BigClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "MidClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl1_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", @@ -283,6 +265,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", @@ -1007,6 +999,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", @@ -1043,6 +1053,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1096,18 +1213,6 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "MidClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 50f1951b..19746f63 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -213,25 +213,7 @@ ], "ResetOnInit": true }, - { - "Name": "BigClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "MidClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl1_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -283,6 +265,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", @@ -1007,6 +999,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", @@ -1043,6 +1053,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1096,19 +1213,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "MidClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 78d58883..96c881e3 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -213,25 +213,7 @@ ], "ResetOnInit": true }, - { - "Name": "BigClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "MidClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl1_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -283,6 +265,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", @@ -971,6 +963,18 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskHigh", + "Duration": 5000, + "Value": "0xff" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0xff" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -1007,6 +1011,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", @@ -1043,6 +1065,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1096,19 +1225,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "MidClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 50f1951b..19746f63 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -213,25 +213,7 @@ ], "ResetOnInit": true }, - { - "Name": "BigClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "MidClusterPowerDownTargetResidency", - "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl1_target_residency", - "Values": [ - "10000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -283,6 +265,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", @@ -1007,6 +999,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", @@ -1043,6 +1053,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1096,19 +1213,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "BigClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "MidClusterPowerDownTargetResidency", - "Duration": 0, - "Value": "10000" - }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, From 443a642059770c8f5379df2598dfe01b2c44d083 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 27 Feb 2024 14:26:16 -0800 Subject: [PATCH 4/5] Add AOSP support for caiman/komodo/tokay We will have a 'vendor' project containing proprietary blobs to be able to build and flash Pixel device when vendor source is not available. The project names are platform/vendor/aosp/google_devices/caiman platform/vendor/aosp/google_devices/komodo platform/vendor/aosp/google_devices/tokay and the path is vendor/google_devices/caiman vendor/google_devices/komodo vendor/google_devices/tokay BUG: 325612343 Change-Id: I881994da5b81e963f5427af1642e29bffdca9c97 --- caiman/BoardConfig.mk | 1 + device-caiman.mk | 1 + device-komodo.mk | 1 + device-tokay.mk | 1 + komodo/BoardConfig.mk | 1 + tokay/BoardConfig.mk | 1 + 6 files changed, 6 insertions(+) diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk index b03eae47..ca29fa5b 100644 --- a/caiman/BoardConfig.mk +++ b/caiman/BoardConfig.mk @@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk include device/google/caimito-sepolicy/caiman-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk diff --git a/device-caiman.mk b/device-caiman.mk index 67fcf9ac..5f6f302b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -29,6 +29,7 @@ endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-caiman.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/caiman/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/caiman/device-vendor-caiman.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) diff --git a/device-komodo.mk b/device-komodo.mk index 4411ce5e..6ddaf743 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -29,6 +29,7 @@ endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-komodo.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/komodo/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/komodo/device-vendor-komodo.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) diff --git a/device-tokay.mk b/device-tokay.mk index e4aaac46..f4ca04c2 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -20,6 +20,7 @@ TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/tokay/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/tokay/device-vendor-tokay.mk) ifeq ($(filter factory_tokay, $(TARGET_PRODUCT)),) diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk index 5af5ff64..7ec39a22 100644 --- a/komodo/BoardConfig.mk +++ b/komodo/BoardConfig.mk @@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk include device/google/caimito-sepolicy/komodo-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk index 9e5de46f..d09779b9 100644 --- a/tokay/BoardConfig.mk +++ b/tokay/BoardConfig.mk @@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk include device/google/caimito-sepolicy/tokay-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk From f2a7aba99e486000c5903c818604c219cbe8e57b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 28 Feb 2024 00:54:21 +0000 Subject: [PATCH 5/5] thermal: reading the thermistor temperature from upstream sysfs tz_temp callback will invoke thermal_zone_device_update and return the cached temp from thermal core. However, during device resume, the cached temp may be reset to INVALID number before being returned. So, change the reading path to upstream temp_show which will return the temperature from thermistor driver directly. Bug: 326252555 Test: adb shell dumpsys thermalservice Change-Id: I82cf81d940585c4827256804bc9c9397f4b54ccf --- thermal/thermal_info_config_caiman.json | 8 -------- thermal/thermal_info_config_charge_caiman.json | 8 -------- thermal/thermal_info_config_charge_komodo.json | 8 -------- thermal/thermal_info_config_charge_tokay.json | 8 -------- thermal/thermal_info_config_komodo.json | 8 -------- thermal/thermal_info_config_tokay.json | 8 -------- 6 files changed, 48 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 85be17a4..baaa93c9 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index 8f30d1d8..a47ae730 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 04daff57..1cdad975 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index e3acabd4..fc053d08 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 82bac28f..882378b5 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index dbeb42ec..e190afdd 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000