From 1c2f2a4cf2fae635e83e90695675263a17288ac7 Mon Sep 17 00:00:00 2001 From: George Lee Date: Fri, 19 Aug 2022 05:10:47 +0000 Subject: [PATCH 1/5] Revert "thermal: remove userspace throttling for BCL tzone" This reverts commit 7e2cc1ebbe6958d59bf7bc40628a07f02ac86f9f. Reason for revert: Move throttling back to userspace Bug: 239887528 Signed-off-by: George Lee Change-Id: I4ef3851a7163e50ed95862ba99330046634e032c --- thermal_info_config_cheetah.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_cloudripper.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_panther.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_ravenclaw.json | 68 ++++++++++++++++++++++++++-- 4 files changed, 256 insertions(+), 16 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 5a134bd..b848b8a 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -511,7 +511,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -532,7 +547,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -541,7 +571,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -550,7 +595,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index 95bde43..a597fac 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -174,7 +174,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -227,7 +242,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -253,7 +283,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -279,7 +324,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 0ea1598..7597ae5 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -512,7 +512,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -533,7 +548,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -542,7 +572,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -551,7 +596,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index f417914..26e5dbd 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -376,7 +376,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -429,7 +444,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -455,7 +485,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -481,7 +526,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", From 35505777666ef29aee2bacd370c17f0bbe76d5b7 Mon Sep 17 00:00:00 2001 From: ahujapalash Date: Tue, 23 Aug 2022 13:27:49 -0700 Subject: [PATCH 2/5] Revert "p2p: fix p2p configuration" DroidMonitor-triggered revert due to breakage - https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-qpr-dev&target=aosp_felix-userdebug&lkgb=8982522&lkbb=8982848&fkbb=8982848 BUG: b/243544635 This reverts commit 09c7a1c14475fe4e14eaf6a189654ea9f32638a5. Change-Id: Ib4b9b99d709f9a169fd1f3f081545c9220271605 --- conf/init.cloudripper.rc | 10 ++++++++++ conf/init.pantah.rc | 10 ++++++++++ conf/init.ravenclaw.rc | 10 ++++++++++ wifi/BoardConfig-wifi.mk | 3 +-- ...p2p_supplicant_overlay.conf => p2p_supplicant.conf} | 0 5 files changed, 31 insertions(+), 2 deletions(-) rename wifi/{p2p_supplicant_overlay.conf => p2p_supplicant.conf} (100%) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 8fe9268..76a8309 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -51,3 +51,13 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ + -m/vendor/etc/wifi/p2p_supplicant.conf \ + -g@android:wpa_wlan0 -dd + interface aidl android.hardware.wifi.supplicant.ISupplicant/default + socket wpa_wlan0 dgram 660 wifi wifi + class main + disabled + oneshot + diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index e14b913..1abbf21 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -63,6 +63,16 @@ on post-fs-data chown system system /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg chmod 600 /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ + -m/vendor/etc/wifi/p2p_supplicant.conf \ + -g@android:wpa_wlan0 -dd + interface aidl android.hardware.wifi.supplicant.ISupplicant/default + socket wpa_wlan0 dgram 660 wifi wifi + class main + disabled + oneshot + # NFC on property:ro.boot.hardware.revision=PROTO1.0 setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index 70bae17..d2ce3d8 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -43,3 +43,13 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ + -m/vendor/etc/wifi/p2p_supplicant.conf \ + -g@android:wpa_wlan0 -dd + interface aidl android.hardware.wifi.supplicant.ISupplicant/default + socket wpa_wlan0 dgram 660 wifi wifi + class main + disabled + oneshot + diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index bc0cb80..64a6fb5 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -30,9 +30,8 @@ WIFI_FEATURE_IMU_DETECTION := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true -WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true PRODUCT_COPY_FILES += \ - device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant.conf similarity index 100% rename from wifi/p2p_supplicant_overlay.conf rename to wifi/p2p_supplicant.conf From 8a419466b86ab07a25fc18d7d6a2a9ee154f6839 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Wed, 3 Aug 2022 21:40:12 +0000 Subject: [PATCH 3/5] Enable ADPF CPU hints for SF Allow these devices to send CPU hints to PowerHAL from SF to reduce drops and save power. Bug: 195990840 Test: manual Change-Id: Idb7dad41852c71bff9b3c63d2d75849128288080 (cherry picked from commit 2dd1a62ca49c88a01654b4af424949d32fb4ea73) --- conf/init.pantah.rc | 8 ++++++++ device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ powerhint-cheetah-a0.json | 28 ---------------------------- powerhint-cheetah.json | 28 ---------------------------- powerhint-panther-a0.json | 22 ---------------------- powerhint-panther.json | 22 ---------------------- 7 files changed, 16 insertions(+), 100 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 1abbf21..b087d95 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -117,3 +117,11 @@ on property:vendor.device.modules.ready=1 chown system system /proc/focaltech_touch/selftest/Scap_Rawdata chown system system /proc/focaltech_touch/selftest/Short chown system system /proc/focaltech_touch/selftest/Strength + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/device-cheetah.mk b/device-cheetah.mk index 84af1e1..e153cac 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -331,3 +331,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/device-panther.mk b/device-panther.mk index 37c438d..cef2824 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -317,3 +317,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 79588d9..ec24509 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -162,16 +162,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -530,18 +520,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "159" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -553,12 +531,6 @@ "Type": "DoHint", "Value": "LAUNCH_120FPS" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index a42dc48..772b4e8 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -188,16 +188,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -536,12 +526,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -560,12 +544,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "159" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -582,12 +560,6 @@ "Type": "DoHint", "Value": "LAUNCH_GPU" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 98883cb..f26e9be 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -151,16 +151,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -519,24 +509,12 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 800376c..e037835 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -168,16 +168,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -516,12 +506,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -540,12 +524,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 16d4e31f10f604d1ed693c06b657b54686e7632e Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Mon, 8 Aug 2022 11:34:35 +0800 Subject: [PATCH 4/5] p2p: fix p2p configuration The correct path should be under /data, or it is not writable. wpa_supplicant now support p2p overlay configuration, a unified wpa_supplicant init entry can be used. Bug: 238601241 Test: create a group and check this group is persisted after reboot Change-Id: I6f471aed60b56862ba9a8b0bb12d50ef6305faba --- conf/init.cloudripper.rc | 10 ---------- conf/init.pantah.rc | 10 ---------- conf/init.ravenclaw.rc | 10 ---------- wifi/BoardConfig-wifi.mk | 3 ++- ...p2p_supplicant.conf => p2p_supplicant_overlay.conf} | 0 5 files changed, 2 insertions(+), 31 deletions(-) rename wifi/{p2p_supplicant.conf => p2p_supplicant_overlay.conf} (100%) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 76a8309..8fe9268 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -51,13 +51,3 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ - -m/vendor/etc/wifi/p2p_supplicant.conf \ - -g@android:wpa_wlan0 -dd - interface aidl android.hardware.wifi.supplicant.ISupplicant/default - socket wpa_wlan0 dgram 660 wifi wifi - class main - disabled - oneshot - diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index b087d95..48abe65 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -63,16 +63,6 @@ on post-fs-data chown system system /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg chmod 600 /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ - -m/vendor/etc/wifi/p2p_supplicant.conf \ - -g@android:wpa_wlan0 -dd - interface aidl android.hardware.wifi.supplicant.ISupplicant/default - socket wpa_wlan0 dgram 660 wifi wifi - class main - disabled - oneshot - # NFC on property:ro.boot.hardware.revision=PROTO1.0 setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index d2ce3d8..70bae17 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -43,13 +43,3 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ - -m/vendor/etc/wifi/p2p_supplicant.conf \ - -g@android:wpa_wlan0 -dd - interface aidl android.hardware.wifi.supplicant.ISupplicant/default - socket wpa_wlan0 dgram 660 wifi wifi - class main - disabled - oneshot - diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 64a6fb5..bc0cb80 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -30,8 +30,9 @@ WIFI_FEATURE_IMU_DETECTION := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true PRODUCT_COPY_FILES += \ - device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ + device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant_overlay.conf similarity index 100% rename from wifi/p2p_supplicant.conf rename to wifi/p2p_supplicant_overlay.conf From 9262b7b493031c0a5aeb1b746a311b96c80e6f95 Mon Sep 17 00:00:00 2001 From: Cyan Hsieh Date: Fri, 19 Aug 2022 02:18:33 +0000 Subject: [PATCH 5/5] Update SVN to 2 Bug: 243005982 Change-Id: I7b6c5cf0a62e3f7b8a459adc94501313e11d648a Signed-off-by: Cyan Hsieh --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3a93639..abc2a8f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -244,7 +244,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 100af5e..a676854 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -231,7 +231,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \