From 3c9226acc7e539b2bec19aa7107c54826afefe26 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Sun, 27 Mar 2022 17:56:51 +0800 Subject: [PATCH 1/6] Change file permission for perfer_idle Sync permission to other nodes. Bug: 224637637 Test: build pass Change-Id: I5e9d4dab6bdb94ad2ca8dd4bb6e52bff72f8b6ee --- conf/init.gs201.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index c0351a46..ff7cf3bc 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -41,6 +41,8 @@ on init chown system system /proc/vendor_sched/set_proc_group_dex2oat chown system system /proc/vendor_sched/set_proc_group_cam_power chown system system /proc/vendor_sched/set_proc_group_ota + chown system system /proc/vendor_sched/prefer_idle_set + chown system system /proc/vendor_sched/prefer_idle_clear chmod 0220 /proc/vendor_sched/set_task_group_bg chmod 0220 /proc/vendor_sched/set_task_group_cam @@ -66,6 +68,8 @@ on init chmod 0220 /proc/vendor_sched/set_proc_group_dex2oat chmod 0220 /proc/vendor_sched/set_proc_group_cam_power chmod 0220 /proc/vendor_sched/set_proc_group_ota + chmod 0220 /proc/vendor_sched/prefer_idle_set + chmod 0220 /proc/vendor_sched/prefer_idle_clear wait /dev/block/platform/${ro.boot.boot_devices} symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice From 1a05b6dc70520753e63d9002e95ffd069ac6b653 Mon Sep 17 00:00:00 2001 From: chungkai Date: Tue, 29 Mar 2022 10:23:31 +0000 Subject: [PATCH 2/6] init: add uclamp threshold setting To filter tiny task, add uclamp threshold setting Test: build and boot pass Bug: 214098855 Signed-off-by: chungkai Change-Id: Ib8f20a8d0134eff972084cd72a2975d7f778d539 --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index ff7cf3bc..417e207c 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -703,6 +703,7 @@ on property:sys.boot_completed=1 setprop vendor.powerhal.init 1 # Setup final cpu.uclamp + write /proc/vendor_sched/uclamp_threshold 8 write /proc/vendor_sched/ta_uclamp_min 1 write /proc/vendor_sched/fg_uclamp_min 0 write /proc/vendor_sched/sys_prefer_idle 0 From 7be02c070822a5055d7a09647a805dda4612467d Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Tue, 29 Mar 2022 15:40:24 +0800 Subject: [PATCH 3/6] usb: remove set_usb_irq script for irq change Since the dwc3 irq is moved by USB gadget hal now, the script is not needed. Bug: 225789036 Test: build pass Change-Id: I42299d30df5343f06be810870c61c5cff3e41df2 --- conf/init.gs201.usb.rc | 6 ------ device.mk | 1 - set_usb_irq.sh | 16 ---------------- 3 files changed, 23 deletions(-) delete mode 100644 set_usb_irq.sh diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index 87245709..d8f89965 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -165,12 +165,6 @@ on property:vendor.usb.config=* on property:persist.vendor.usb.usbradio.config=* start usbd -on property:vendor.usb.dwc3_irq=medium - exec /vendor/bin/hw/set_usb_irq.sh medium - -on property:vendor.usb.dwc3_irq=big - exec /vendor/bin/hw/set_usb_irq.sh big - on charger mkdir /config/usb_gadget/g1 mkdir /config/usb_gadget/g1/strings/0x409 diff --git a/device.mk b/device.mk index 6ba0a8e4..629f8407 100644 --- a/device.mk +++ b/device.mk @@ -269,7 +269,6 @@ PRODUCT_COPY_FILES += \ # Shell scripts PRODUCT_COPY_FILES += \ device/google/gs201/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \ - device/google/$(TARGET_BOARD_PLATFORM)/set_usb_irq.sh:$(TARGET_COPY_OUT_VENDOR)/bin/hw/set_usb_irq.sh # insmod files PRODUCT_COPY_FILES += \ diff --git a/set_usb_irq.sh b/set_usb_irq.sh deleted file mode 100644 index 29d37812..00000000 --- a/set_usb_irq.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/vendor/bin/sh - -# Switch into /proc/irq/$IRQ for the dwc3 usb controller -cd /proc/irq/*/dwc3/.. || exit 7 - -# Move the USB Controller (DWC3) interrupt as requested -# Modem and DIT are on 0/2/5 depending on throughput, so avoid those. -# 0-3 small, 4-5 medium, 6-7 big -case "$1" in - medium) core=4;; - big) core=6;; - *) core=0;; -esac - -# This can sometimes fail due to smp_affinity_list no longer existing... -echo "${core}" > smp_affinity_list From 6f00cd7be1ccddc61a9d584d6153d62023699cdb Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 30 Mar 2022 09:42:00 +0800 Subject: [PATCH 4/6] bcl: modify batoilo trip_point_0 permission for thermalHAL Bug: 222017625 Test: adb shell ls -al dev/thermal/tz-by-name/batoilo/trip_point_0* Change-Id: Ie8d122a8b70bd4f975e586733f5f2a74c46cdaa9 --- conf/init.gs201.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 417e207c..3ad3fede 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -907,6 +907,8 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst + chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp + chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst # Thermal chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst From 6f41cc87c833443725186a5831dc043604c391a9 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 28 Mar 2022 16:11:19 +0800 Subject: [PATCH 5/6] powerstats: set time limit as timeout for AoC Bug: 219630658 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Iaf5af43ebcda4edb0ff5f88e3ba82dda2d0c51a5 Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 6232a6e0..599874d1 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -102,6 +102,7 @@ void addPlaceholderEnergyConsumers(std::shared_ptr p) { } void addAoC(std::shared_ptr p) { + static const uint64_t TIMEOUT_MILLIS = 120; std::string prefix = "/sys/devices/platform/19000000.aoc/control/"; // Add AoC cores (a32, ff1, hf0, and hf1) @@ -114,7 +115,7 @@ void addAoC(std::shared_ptr p) { std::vector> coreStates = { {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}}; p->addStateResidencyDataProvider(std::make_unique(coreIds, - coreStates)); + coreStates, TIMEOUT_MILLIS)); // Add AoC voltage stats std::vector> voltageIds = { @@ -125,7 +126,8 @@ void addAoC(std::shared_ptr p) { {"UUD", "ultra_underdrive"}, {"UD", "underdrive"}}; p->addStateResidencyDataProvider( - std::make_unique(voltageIds, voltageStates)); + std::make_unique(voltageIds, voltageStates, + TIMEOUT_MILLIS)); // Add AoC monitor mode std::vector> monitorIds = { @@ -135,7 +137,8 @@ void addAoC(std::shared_ptr p) { {"MON", "mode"}, }; p->addStateResidencyDataProvider( - std::make_unique(monitorIds, monitorStates)); + std::make_unique(monitorIds, monitorStates, + TIMEOUT_MILLIS)); // Add AoC restart count const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { From 0500c761c92e9ee77f2544439f4feb23f4977058 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 28 Mar 2022 21:19:39 +0800 Subject: [PATCH 6/6] Revert "powerstats: disable AoC power stats reporting" This reverts commit 8c4f8807fd31f730bb26fb23cf7367b196c44c35. Bug: 220032540 Test: dumpsys android.hardware.power.stats.IPowerStats/default Reason for revert: the timeout mechanism is ready Change-Id: Ied599054c4b3eda125c71b927dbab0e6bdb99ef9 Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 599874d1..b7985f0c 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -645,9 +645,7 @@ void addGs201CommonDataProviders(std::shared_ptr p) { setEnergyMeter(p); addPixelStateResidencyDataProvider(p); - // TODO(b/220032540): Re-enable AoC reporting when AoC long latency issue is fixed or - // the timeout mechanism is merged. - //addAoC(p); + addAoC(p); addDvfsStats(p); addSoC(p); addCPUclusters(p);