From 0fed30eb384c49f9f331230bc14deb2d5ac6618a Mon Sep 17 00:00:00 2001 From: jiabin Date: Fri, 25 May 2018 12:40:58 -0700 Subject: [PATCH 01/23] Remove valid mask of microphone characteristics. Bug: 79272216 Test: run cts Change-Id: I636fe7af8e3d26db66ea1729afb3ed2119211279 --- audio_platform_info_tavil.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 846e305..5bd1866 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -102,18 +102,24 @@ + + + + + + - - - Date: Thu, 21 Jun 2018 00:23:51 +0200 Subject: [PATCH 02/23] Update vsync configuration to match new system This isn't a semantic change, but rather a change how the configuration is set because we changed how SF interprets these offsets. Test: Boot, inspect offsets in regular + transition scenario Bug: 110112323 Change-Id: Iba61c1247328fc93abb068f59599872488c1e345 --- device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 6335298..f3a4787 100644 --- a/device.mk +++ b/device.mk @@ -132,5 +132,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ # Early phase offset for SurfaceFlinger (b/75985430) PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_phase_offset_ns=5000000 + debug.sf.early_phase_offset_ns=1000000 +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.early_gl_phase_offset_ns=1000000 From d787af0b2abe54007bc98b539cf1ab2bacd8db13 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 26 Jul 2018 13:45:10 -0700 Subject: [PATCH 03/23] Set runtime readahead to 128KiB Reduce readahead to 128KiB to reduce thrashing under memory pressure. Bug: 110908295 Bug: 111855179 Test: Boot Change-Id: Id46cf3675d27355e3cb494086d4d06923fe0989d --- init-taimen.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 14c5fc0..e80d49f 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -15,14 +15,14 @@ on late-fs on property:sys.boot_completed=1 # end boot time fs tune - write /sys/block/sda/queue/read_ahead_kb 1024 + write /sys/block/sda/queue/read_ahead_kb 128 write /sys/block/sda/queue/nr_requests 128 write /sys/block/sda/queue/iostats 1 - write /sys/block/sde/queue/read_ahead_kb 1024 + write /sys/block/sde/queue/read_ahead_kb 128 write /sys/block/sde/queue/nr_requests 128 write /sys/block/sde/queue/iostats 1 - write /sys/block/dm-0/queue/read_ahead_kb 512 - write /sys/block/dm-1/queue/read_ahead_kb 512 + write /sys/block/dm-0/queue/read_ahead_kb 128 + write /sys/block/dm-1/queue/read_ahead_kb 128 on boot # Allow ftm4 autotune from adb shell From 4ff26746a66c552a31d1b0d2caf3b199f2f5a81b Mon Sep 17 00:00:00 2001 From: Vinay Kalia Date: Mon, 13 Aug 2018 10:52:33 -0700 Subject: [PATCH 04/23] power profile: Add "ambient.on" to taimen power profile "ambient.on" is used to estimate the power consumption by always on display. BUG: 112538888 Test: Compile, flash, check Advanced battery usage. Change-Id: Ieaec0b0bc05939868ce602262325c9665151639f --- overlay/frameworks/base/core/res/res/xml/power_profile.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index b9ab9f3..6854eb7 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -151,6 +151,8 @@ 212.147 + + 19 152.118 28dp + 91px diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 1ade9bd..5088be4 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -16,6 +16,5 @@ */ --> - 26dp 8dp From e8ba1ac9750faf461628f22e11c74dd0cca225d9 Mon Sep 17 00:00:00 2001 From: Vincent Palomares Date: Wed, 28 Nov 2018 14:57:52 -0800 Subject: [PATCH 06/23] Upgrading Taimen's thermal HAL version to 2.0. Also increasing thermal-engine skin shutdown threshold to let the framework shutdown gracefully (see b/119221890). Bug: 118689758 Test: adb shell dumpsys hardware_properties adb shell su 0 lshal debug android.hardware.thermal@2.0::IThermal/default pts -m PtsThermalHalTestCases vts -m VtsHalThermalV1_0Target vts -m VtsHalThermalV2_0Target Change-Id: I3614e66df05844a048fb3f387c8fa0c9e0e67a68 Signed-off-by: Vincent Palomares --- device.mk | 5 + init-taimen.rc | 6 ++ thermal-engine.conf | 8 +- thermal_info_config.json | 204 +++++++++++++++++++++++++++++++++++ thermal_info_config_evt.json | 204 +++++++++++++++++++++++++++++++++++ 5 files changed, 423 insertions(+), 4 deletions(-) create mode 100644 thermal_info_config.json create mode 100644 thermal_info_config_evt.json diff --git a/device.mk b/device.mk index f3a4787..761a266 100644 --- a/device.mk +++ b/device.mk @@ -59,6 +59,11 @@ PRODUCT_COPY_FILES += \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/taimen/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf +# Thermal HAL +PRODUCT_COPY_FILES += \ + device/google/taimen/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/taimen/thermal_info_config_evt.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_evt.json + # Audio PRODUCT_COPY_FILES += \ device/google/taimen/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil_taimen.xml \ diff --git a/init-taimen.rc b/init-taimen.rc index e80d49f..4a70d9e 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -46,3 +46,9 @@ on property:persist.vendor.charge.stop.level=* && property:sys.all.modules.ready on property:persist.vendor.charge.start.level=* && property:sys.all.modules.ready=1 write /sys/module/lge_battery/parameters/charge_start_level ${persist.vendor.charge.start.level} + +on late-init && property:ro.boot.revision=rev_a + setprop vendor.thermal.config thermal_info_config_evt.json + +on late-init && property:ro.boot.revision=rev_b + setprop vendor.thermal.config thermal_info_config_evt.json diff --git a/thermal-engine.conf b/thermal-engine.conf index 80a0ffe..d88175e 100755 --- a/thermal-engine.conf +++ b/thermal-engine.conf @@ -70,8 +70,8 @@ action_info 3 algo_type monitor sampling 1000 sensor bd_therm2 -thresholds 54000 -thresholds_clr 53000 +thresholds 56000 +thresholds_clr 55000 actions shutdown action_info 1 @@ -137,8 +137,8 @@ action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+30000 algo_type monitor sampling 1000 sensor bd_therm -thresholds 66000 -thresholds_clr 65000 +thresholds 68000 +thresholds_clr 67000 actions shutdown action_info 1 diff --git a/thermal_info_config.json b/thermal_info_config.json new file mode 100644 index 0000000..86720d8 --- /dev/null +++ b/thermal_info_config.json @@ -0,0 +1,204 @@ +{ + "Sensors":[ + { + "Name":"tsens_tz_sensor1", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor2", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor4", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor3", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor7", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor8", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor9", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor10", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor13", + "Type":"GPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 60.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_port_temp", + "Type":"USB_PORT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"bd_therm2", + "Type":"SKIN", + "HotThreshold":[ + "NAN", + 38.0, + 45.0, + 48.0, + 50.0, + 52.0, + 54.0 + ], + "HotHysteresis":[ + 0.0, + 1.0, + 1.0, + 1.0, + 1.0, + 1.0, + 1.0 + ], + "VrThreshold":50.0, + "Multiplier":1.0, + "Monitor":true + } + ], + "CoolingDevices":[ + { + "Name":"thermal-cpufreq-0", + "Type":"CPU" + }, + { + "Name":"thermal-cpufreq-1", + "Type":"CPU" + } + ] +} diff --git a/thermal_info_config_evt.json b/thermal_info_config_evt.json new file mode 100644 index 0000000..24b2433 --- /dev/null +++ b/thermal_info_config_evt.json @@ -0,0 +1,204 @@ +{ + "Sensors":[ + { + "Name":"tsens_tz_sensor1", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor2", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor4", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor3", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor7", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor8", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor9", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor10", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor13", + "Type":"GPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 60.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_port_temp", + "Type":"USB_PORT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"bd_therm", + "Type":"SKIN", + "HotThreshold":[ + "NAN", + 49.0, + 51.0, + 58.0, + 60.0, + 64.0, + 66.0 + ], + "HotHysteresis":[ + 0.0, + 1.0, + 1.0, + 1.0, + 1.0, + 1.0, + 1.0 + ], + "VrThreshold":62.0, + "Multiplier":1.0, + "Monitor":true + } + ], + "CoolingDevices":[ + { + "Name":"thermal-cpufreq-0", + "Type":"CPU" + }, + { + "Name":"thermal-cpufreq-1", + "Type":"CPU" + } + ] +} From 3ea5a86956b17029beb9bdbeb10d033129698c58 Mon Sep 17 00:00:00 2001 From: Roger Wang Date: Wed, 16 Jan 2019 16:58:31 +0800 Subject: [PATCH 07/23] Taimen: wifi: set inactivity time Wait for 1 second to let wifi driver do complete clean reset of SW/HW. Bug: 121391366 Test: perform watchdog recovery and success Change-Id: I6db70e4061f0cd7dc1538666c706f83595f95756 Signed-off-by: Roger Wang --- WCNSS_qcom_cfg.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 9f945f1..71c184c 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -663,6 +663,9 @@ oce_wan_score_idx7_to_4=0 oce_wan_score_idx11_to_8=0 oce_enable_rssi_assoc_reject=0 +#Timer waiting for interface up from the upper layer +gInterfaceChangeWait=1000 + END # Note: Configuration parser would not read anything past the END marker From afdb0ea9d6c65690d7e2b81550fa62b77d49ec4f Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Mon, 4 Feb 2019 21:34:18 -0800 Subject: [PATCH 08/23] Remove unsupported gcc and kcfi kernel modules code Change-Id: I96b3d77be88950470f7f9d57b7d8adde9e1a18b0 --- BoardConfig.mk | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 6e39bd2..d7d2d1c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -27,15 +27,8 @@ BOARD_AVB_ENABLE := true # sepolicy BOARD_SEPOLICY_DIRS += device/google/taimen/sepolicy -ifeq (,$(filter-out taimen_gcc, $(TARGET_PRODUCT))) -# if TARGET_PRODUCT == taimen_gcc -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/gcc/touch_core_base.ko \ - device/google/wahoo-kernel/gcc/ftm4.ko \ - device/google/wahoo-kernel/gcc/sw49408.ko \ - device/google/wahoo-kernel/gcc/lge_battery.ko \ - device/google/wahoo-kernel/gcc/wlan.ko -else ifeq (,$(filter-out taimen_kasan, $(TARGET_PRODUCT))) +# Kernel modules +ifeq (,$(filter-out taimen_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == taimen_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/touch_core_base.ko \ @@ -43,14 +36,6 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/sw49408.ko \ device/google/wahoo-kernel/kasan/lge_battery.ko \ device/google/wahoo-kernel/kasan/wlan.ko -else ifeq (,$(filter-out taimen_kcfi, $(TARGET_PRODUCT))) -# if TARGET_PRODUCT == taimen_kcfi -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/kcfi/touch_core_base.ko \ - device/google/wahoo-kernel/kcfi/ftm4.ko \ - device/google/wahoo-kernel/kcfi/sw49408.ko \ - device/google/wahoo-kernel/kcfi/lge_battery.ko \ - device/google/wahoo-kernel/kcfi/wlan.ko else ifeq (,$(filter-out taimen_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ From b8c71b8caaa03d217610978aabbd4e797441cc85 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Tue, 8 Jan 2019 11:01:01 -0800 Subject: [PATCH 09/23] Boottime: remove all block-related tunes including readahead size With a request size fix, 2MB-sized readahead would not be a way to gain boottime. taimen - PVT - Hynix 128GB - boot_complete timestamp (avg of 100 loop) Base [1] : 10.943 New [2] : 10.7495 taimen - PVT - Hynix 128GB - boot_complete timestamp + fastboot -w (avg of 100 loop) Base [1] : 32.5857 New [2] : 31.7474 [1] w/o this CL, revert commit 7c37954411e9 ("mm: readahead back to 128KB") [2] w/ this CL, keep commit 7c37954411e9 ("mm: readahead back to 128KB") Bug: 122246531 Bug: 120757803 Change-Id: I2c3236b0b0cd4f2a8610a1af64de694f8a4d7997 Signed-off-by: Jaegeuk Kim --- init-taimen.rc | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 4a70d9e..be27341 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -1,29 +1,3 @@ -on late-fs - # boot time fs tune - write /sys/block/sda/queue/iostats 0 - write /sys/block/sda/queue/scheduler cfq - write /sys/block/sda/queue/iosched/slice_idle 0 - write /sys/block/sda/queue/read_ahead_kb 2048 - write /sys/block/sda/queue/nr_requests 256 - write /sys/block/sde/queue/iostats 0 - write /sys/block/sde/queue/scheduler cfq - write /sys/block/sde/queue/iosched/slice_idle 0 - write /sys/block/sde/queue/read_ahead_kb 2048 - write /sys/block/sde/queue/nr_requests 256 - write /sys/block/dm-0/queue/read_ahead_kb 2048 - write /sys/block/dm-1/queue/read_ahead_kb 2048 - -on property:sys.boot_completed=1 - # end boot time fs tune - write /sys/block/sda/queue/read_ahead_kb 128 - write /sys/block/sda/queue/nr_requests 128 - write /sys/block/sda/queue/iostats 1 - write /sys/block/sde/queue/read_ahead_kb 128 - write /sys/block/sde/queue/nr_requests 128 - write /sys/block/sde/queue/iostats 1 - write /sys/block/dm-0/queue/read_ahead_kb 128 - write /sys/block/dm-1/queue/read_ahead_kb 128 - on boot # Allow ftm4 autotune from adb shell chown system shell /sys/devices/virtual/input/ftm4_touch/autotune From a72bcd97b43baa2b616c39e633e32474f761373b Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 25 Feb 2019 12:00:35 -0800 Subject: [PATCH 10/23] Remove iperf libraries TEST: flashed taimen device Change-Id: Id5765f1ca5c71b366cf65f00309fd187c4f840d6 --- self-extractors/extract-lists.txt | 3 --- self-extractors/qcom/staging/device-partial.mk | 3 --- 2 files changed, 6 deletions(-) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index 099f866..4ec19ed 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -26,7 +26,6 @@ system/lib64/lib-imsvtextutils.so \ system/lib64/lib-imsvt.so \ system/lib64/lib-imsvtutils.so \ - system/lib64/libiperf.so \ system/lib64/librcc.so \ system/lib/com.qualcomm.qti.imsrtpservice@1.0.so \ system/lib/libdiag_system.so \ @@ -36,8 +35,6 @@ system/lib/lib-imsvtextutils.so \ system/lib/lib-imsvt.so \ system/lib/lib-imsvtutils.so \ - system/lib/libiperf.so \ system/lib/librcc.so \ - system/xbin/iperf3 \ " ;; diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 0f2a6b0..48e5ec6 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -35,7 +35,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ vendor/qcom/taimen/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ vendor/qcom/taimen/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \ vendor/qcom/taimen/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ vendor/qcom/taimen/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ vendor/qcom/taimen/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \ @@ -45,6 +44,4 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ vendor/qcom/taimen/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ vendor/qcom/taimen/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/libiperf.so:system/lib/libiperf.so:qcom \ vendor/qcom/taimen/proprietary/librcc.so:system/lib/librcc.so:qcom \ - vendor/qcom/taimen/proprietary/iperf3:system/xbin/iperf3:qcom \ From 23c3207239beb0d967896bece3eed6b1a4e1d90c Mon Sep 17 00:00:00 2001 From: Yiwen Chen Date: Tue, 5 Mar 2019 21:05:15 -0800 Subject: [PATCH 11/23] Enable ramping ringer by default for taimen devices. Bug: 120789399 Test: Tested on device Change-Id: I9c0f59ec22de38a0c437e6c774aae089b897691b --- .../SettingsProvider/res/values/defaults.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml new file mode 100644 index 0000000..79aec49 --- /dev/null +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -0,0 +1,22 @@ + + + + + true + From 69aa817141a31ca11d0787807f9f0ae64f1f22c2 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Mon, 11 Mar 2019 23:18:43 +0000 Subject: [PATCH 12/23] Revert "Boottime: remove all block-related tunes including readahead size" This reverts commit b8c71b8caaa03d217610978aabbd4e797441cc85. Reason for revert: boottime regression found by b/126431810 Change-Id: Ib040f8e9b26b12f0767b2e37edf5688a3ba0a85d --- init-taimen.rc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/init-taimen.rc b/init-taimen.rc index be27341..4a70d9e 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -1,3 +1,29 @@ +on late-fs + # boot time fs tune + write /sys/block/sda/queue/iostats 0 + write /sys/block/sda/queue/scheduler cfq + write /sys/block/sda/queue/iosched/slice_idle 0 + write /sys/block/sda/queue/read_ahead_kb 2048 + write /sys/block/sda/queue/nr_requests 256 + write /sys/block/sde/queue/iostats 0 + write /sys/block/sde/queue/scheduler cfq + write /sys/block/sde/queue/iosched/slice_idle 0 + write /sys/block/sde/queue/read_ahead_kb 2048 + write /sys/block/sde/queue/nr_requests 256 + write /sys/block/dm-0/queue/read_ahead_kb 2048 + write /sys/block/dm-1/queue/read_ahead_kb 2048 + +on property:sys.boot_completed=1 + # end boot time fs tune + write /sys/block/sda/queue/read_ahead_kb 128 + write /sys/block/sda/queue/nr_requests 128 + write /sys/block/sda/queue/iostats 1 + write /sys/block/sde/queue/read_ahead_kb 128 + write /sys/block/sde/queue/nr_requests 128 + write /sys/block/sde/queue/iostats 1 + write /sys/block/dm-0/queue/read_ahead_kb 128 + write /sys/block/dm-1/queue/read_ahead_kb 128 + on boot # Allow ftm4 autotune from adb shell chown system shell /sys/devices/virtual/input/ftm4_touch/autotune From 162fdc8b2a3a5a9219e4f3916fe28444210e70a6 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 14 Mar 2019 17:16:52 -0700 Subject: [PATCH 13/23] Taimen offsets for GPU composition Window animations now have rounded corners, meaning that the shader that we use is more expensive than it used to be. Because of this, we need to adjust the SF offsets, to make sure that we'll have enough time to finish the GPU composition without dropping frames. Fixes: 122347746 Test: systrace Change-Id: I81ff31344b5cae2d177fc94c0f649e3aabf73789 --- device.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 8e2f65a..7929afa 100644 --- a/device.mk +++ b/device.mk @@ -138,7 +138,10 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ # Early phase offset for SurfaceFlinger (b/75985430) PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_phase_offset_ns=1000000 + debug.sf.early_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_phase_offset_ns=1000000 - + debug.sf.early_app_phase_offset_ns=500000 +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.early_gl_phase_offset_ns=1500000 +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.early_gl_app_phase_offset_ns=15000000 \ No newline at end of file From 87aabdedda10391ec0b32c1e3a9caae1025f9d99 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Tue, 19 Mar 2019 16:15:33 +0000 Subject: [PATCH 14/23] Taimen: Enable ext4 share dup blocks Resolve system image build issues by enabling extra partition space. Bug: 120448575 Bug: 128876541 Test: lunch taimen-userdebug && m -j100 && flashall && boot Change-Id: I19f49a09f8105ee30606c4f0f1423a06a71deb73 --- BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index d7d2d1c..0181ba6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -23,6 +23,7 @@ include device/google/wahoo/BoardConfig.mk BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040 BOARD_AVB_ENABLE := true +BOARD_EXT4_SHARE_DUP_BLOCKS := true # sepolicy BOARD_SEPOLICY_DIRS += device/google/taimen/sepolicy From f8c6fee371f34b2dcb47435c0ad4f59132380e8f Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Mon, 8 Apr 2019 18:27:02 +0800 Subject: [PATCH 15/23] Adding GSI keys Bug:112293933 Test: tree hugger Change-Id: I112ece91566e6cea066cd637bfed5cae6761ae66 --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 805a929..3d997a4 100644 --- a/device.mk +++ b/device.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Installs gsi keys into ramdisk, to boot a GSI with verified boot. +$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) + PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := 560dpi PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi From 74c73ca007df19cb9cd4a1a5d48ad18b2e89937a Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 2 Apr 2019 08:48:43 +0800 Subject: [PATCH 16/23] thermal: adjust usb overheat warning threshold Bug: 128945620 Test: Verified usb overheat warning Change-Id: I3d2b66f0645eae5c2da5b3999b0f74be97669745 --- thermal_info_config.json | 14 ++++++++++++-- thermal_info_config_evt.json | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/thermal_info_config.json b/thermal_info_config.json index 86720d8..087b7eb 100644 --- a/thermal_info_config.json +++ b/thermal_info_config.json @@ -159,11 +159,21 @@ "NAN", "NAN", "NAN", - "NAN", + "70.0", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 5.0, + 0.0 + ], "VrThreshold":"NAN", - "Multiplier":0.1 + "Multiplier":0.1, + "Monitor":true }, { "Name":"bd_therm2", diff --git a/thermal_info_config_evt.json b/thermal_info_config_evt.json index 24b2433..39671b8 100644 --- a/thermal_info_config_evt.json +++ b/thermal_info_config_evt.json @@ -159,11 +159,21 @@ "NAN", "NAN", "NAN", - "NAN", + "70.0", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 5.0, + 0.0 + ], "VrThreshold":"NAN", - "Multiplier":0.1 + "Multiplier":0.1, + "Monitor":true }, { "Name":"bd_therm", From ea0b2be40169b8fc83c943cf00b093f4b574b36c Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Sat, 4 May 2019 21:43:56 +0800 Subject: [PATCH 17/23] PowerHal: taimen: Support VR reload thermal config Test: boot Bug: 129495482 Change-Id: I9c706ebf63eb59bd1559ee902f7c719c14454b16 --- device.mk | 5 +- powerhint.json | 532 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 536 insertions(+), 1 deletion(-) create mode 100644 powerhint.json diff --git a/device.mk b/device.mk index 3d997a4..d730ebd 100644 --- a/device.mk +++ b/device.mk @@ -58,6 +58,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/nfc/libnfc-nxp.taimen.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf +PRODUCT_COPY_FILES += \ + device/google/taimen/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + PRODUCT_COPY_FILES += \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/taimen/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf @@ -146,4 +149,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_app_phase_offset_ns=15000000 \ No newline at end of file + debug.sf.early_gl_app_phase_offset_ns=15000000 diff --git a/powerhint.json b/powerhint.json new file mode 100644 index 0000000..3e4a282 --- /dev/null +++ b/powerhint.json @@ -0,0 +1,532 @@ +{ + "Nodes": [ + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "1900800", + "1555200", + "1478400", + "1248000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "1900800", + "1555200", + "1512000", + "1478400", + "1134000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "2457600", + "1958400", + "1574400", + "1344000", + "1267200" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "2457600", + "1574400", + "1420800", + "1344000", + "1132800", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMaxFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", + "Values": [ + "342000000", + "414000000", + "515000000", + "710000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", + "Values": [ + "515000000", + "414000000", + "257000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUBusMinFreq", + "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq", + "Values": [ + "11863", + "7759", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TASchedtuneBoost", + "Path": "/dev/stune/top-app/schedtune.boost", + "Values": [ + "50", + "10" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBWHystTriggerCount", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_trigger_count", + "Values": [ + "0", + "3" + ] + }, + { + "Name": "CPUBWHistMemory", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hist_memory", + "Values": [ + "0", + "20" + ] + }, + { + "Name": "CPUBWHystLength", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_length", + "Values": [ + "0", + "10" + ] + }, + { + "Name": "CPUBWMinFreq", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/min_freq", + "Values": [ + "13763", + "5195", + "1525", + "762" + ], + "ResetOnInit": true + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "100" + ], + "HoldFd": true + }, + { + "Name": "PowerHALMainState", + "Path": "vendor.powerhal.state", + "Values": [ + "CAMERA_STREAMING", + "VR_SUSTAINED_PERFORMANCE", + "SUSTAINED_PERFORMANCE", + "VR_MODE", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALAudioState", + "Path": "vendor.powerhal.audio", + "Values": [ + "AUDIO_LOW_LATENCY", + "" + ], + "Type": "Property" + }, + { + "Name": "ThermalConfig", + "Path": "vendor.qcom.thermalcfg", + "Values": [ + "/vendor/etc/thermal-engine-vr.conf", + "/vendor/etc/thermal-engine.conf" + ], + "Type": "Property", + "ResetOnInit": true + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "FtmTouchMode", + "Path": "/sys/devices/virtual/input/ftm4_touch/vrmode", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "SUSTAINED_PERFORMANCE" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1267200" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1248000" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "342000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_MODE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "11863" + }, + { + "PowerHint": "VR_MODE", + "Node": "FtmTouchMode", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "7759" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1132800" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1134000" + }, + { + "PowerHint": "INTERACTION", + "Node": "TASchedtuneBoost", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystTriggerCount", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystLength", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHistMemory", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWMinFreq", + "Duration": 0, + "Value": "5195" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 5000, + "Value": "1900800" + }, + { + "PowerHint": "LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 5000, + "Value": "44" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystTriggerCount", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystLength", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHistMemory", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWMinFreq", + "Duration": 5000, + "Value": "13763" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "CAMERA_STREAMING" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1958400" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystTriggerCount", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystLength", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHistMemory", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWMinFreq", + "Duration": 1000, + "Value": "13763" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "CPUBigClusterMinFreq", + "Duration": 2000, + "Value": "1420800" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PowerHALAudioState", + "Duration": 0, + "Value": "AUDIO_LOW_LATENCY" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PMQoSCpuDmaLatency", + "Duration": 0, + "Value": "44" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "0" + } + ] +} From 24e6f134c7fc59802608effdb3286f1239ab39ee Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Tue, 7 May 2019 22:04:27 +0000 Subject: [PATCH 18/23] Revert "PowerHal: taimen: Support VR reload thermal config" This reverts commit ea0b2be40169b8fc83c943cf00b093f4b574b36c. Reason for revert: b/132193648 Change-Id: I0fe51a49781a7d2edd9ce13ef78c693b2c2b8472 --- device.mk | 5 +- powerhint.json | 532 ------------------------------------------------- 2 files changed, 1 insertion(+), 536 deletions(-) delete mode 100644 powerhint.json diff --git a/device.mk b/device.mk index d730ebd..3d997a4 100644 --- a/device.mk +++ b/device.mk @@ -58,9 +58,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/nfc/libnfc-nxp.taimen.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf -PRODUCT_COPY_FILES += \ - device/google/taimen/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json - PRODUCT_COPY_FILES += \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/taimen/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf @@ -149,4 +146,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_app_phase_offset_ns=15000000 + debug.sf.early_gl_app_phase_offset_ns=15000000 \ No newline at end of file diff --git a/powerhint.json b/powerhint.json deleted file mode 100644 index 3e4a282..0000000 --- a/powerhint.json +++ /dev/null @@ -1,532 +0,0 @@ -{ - "Nodes": [ - { - "Name": "CPULittleClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", - "Values": [ - "1900800", - "1555200", - "1478400", - "1248000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPULittleClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", - "Values": [ - "1900800", - "1555200", - "1512000", - "1478400", - "1134000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", - "Values": [ - "2457600", - "1958400", - "1574400", - "1344000", - "1267200" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", - "Values": [ - "2457600", - "1574400", - "1420800", - "1344000", - "1132800", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "GPUMaxFreq", - "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", - "Values": [ - "342000000", - "414000000", - "515000000", - "710000000" - ], - "ResetOnInit": true - }, - { - "Name": "GPUMinFreq", - "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", - "Values": [ - "515000000", - "414000000", - "257000000" - ], - "ResetOnInit": true - }, - { - "Name": "GPUBusMinFreq", - "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq", - "Values": [ - "11863", - "7759", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "TASchedtuneBoost", - "Path": "/dev/stune/top-app/schedtune.boost", - "Values": [ - "50", - "10" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBWHystTriggerCount", - "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_trigger_count", - "Values": [ - "0", - "3" - ] - }, - { - "Name": "CPUBWHistMemory", - "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hist_memory", - "Values": [ - "0", - "20" - ] - }, - { - "Name": "CPUBWHystLength", - "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_length", - "Values": [ - "0", - "10" - ] - }, - { - "Name": "CPUBWMinFreq", - "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/min_freq", - "Values": [ - "13763", - "5195", - "1525", - "762" - ], - "ResetOnInit": true - }, - { - "Name": "PMQoSCpuDmaLatency", - "Path": "/dev/cpu_dma_latency", - "Values": [ - "44", - "100" - ], - "HoldFd": true - }, - { - "Name": "PowerHALMainState", - "Path": "vendor.powerhal.state", - "Values": [ - "CAMERA_STREAMING", - "VR_SUSTAINED_PERFORMANCE", - "SUSTAINED_PERFORMANCE", - "VR_MODE", - "" - ], - "Type": "Property" - }, - { - "Name": "PowerHALAudioState", - "Path": "vendor.powerhal.audio", - "Values": [ - "AUDIO_LOW_LATENCY", - "" - ], - "Type": "Property" - }, - { - "Name": "ThermalConfig", - "Path": "vendor.qcom.thermalcfg", - "Values": [ - "/vendor/etc/thermal-engine-vr.conf", - "/vendor/etc/thermal-engine.conf" - ], - "Type": "Property", - "ResetOnInit": true - }, - { - "Name": "PowerHALRenderingState", - "Path": "vendor.powerhal.rendering", - "Values": [ - "EXPENSIVE_RENDERING", - "" - ], - "Type": "Property" - }, - { - "Name": "FtmTouchMode", - "Path": "/sys/devices/virtual/input/ftm4_touch/vrmode", - "Values": [ - "1", - "0" - ], - "ResetOnInit": true - } - ], - "Actions": [ - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "SUSTAINED_PERFORMANCE" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1267200" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1248000" - }, - { - "PowerHint": "SUSTAINED_PERFORMANCE", - "Node": "GPUMaxFreq", - "Duration": 0, - "Value": "342000000" - }, - { - "PowerHint": "VR_MODE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "VR_MODE" - }, - { - "PowerHint": "VR_MODE", - "Node": "ThermalConfig", - "Duration": 0, - "Value": "/vendor/etc/thermal-engine-vr.conf" - }, - { - "PowerHint": "VR_MODE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1574400" - }, - { - "PowerHint": "VR_MODE", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "1574400" - }, - { - "PowerHint": "VR_MODE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1555200" - }, - { - "PowerHint": "VR_MODE", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "1555200" - }, - { - "PowerHint": "VR_MODE", - "Node": "GPUMaxFreq", - "Duration": 0, - "Value": "515000000" - }, - { - "PowerHint": "VR_MODE", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "515000000" - }, - { - "PowerHint": "VR_MODE", - "Node": "GPUBusMinFreq", - "Duration": 0, - "Value": "11863" - }, - { - "PowerHint": "VR_MODE", - "Node": "FtmTouchMode", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "VR_MODE" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "ThermalConfig", - "Duration": 0, - "Value": "/vendor/etc/thermal-engine-vr.conf" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1344000" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "1344000" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1478400" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "1478400" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "GPUMaxFreq", - "Duration": 0, - "Value": "414000000" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "414000000" - }, - { - "PowerHint": "VR_SUSTAINED_PERFORMANCE", - "Node": "GPUBusMinFreq", - "Duration": 0, - "Value": "7759" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "1132800" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "1134000" - }, - { - "PowerHint": "INTERACTION", - "Node": "TASchedtuneBoost", - "Duration": 0, - "Value": "50" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBWHystTriggerCount", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBWHystLength", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBWHistMemory", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBWMinFreq", - "Duration": 0, - "Value": "5195" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 5000, - "Value": "2457600" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 5000, - "Value": "2457600" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 5000, - "Value": "1900800" - }, - { - "PowerHint": "LAUNCH", - "Node": "PMQoSCpuDmaLatency", - "Duration": 5000, - "Value": "44" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBWHystTriggerCount", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBWHystLength", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBWHistMemory", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBWMinFreq", - "Duration": 5000, - "Value": "13763" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "2457600" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "2457600" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "1900800" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PMQoSCpuDmaLatency", - "Duration": 1000, - "Value": "44" - }, - { - "PowerHint": "CAMERA_STREAMING", - "Node": "PowerHALMainState", - "Duration": 0, - "Value": "CAMERA_STREAMING" - }, - { - "PowerHint": "CAMERA_STREAMING", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1958400" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "2457600" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "2457600" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "1900800" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "PMQoSCpuDmaLatency", - "Duration": 1000, - "Value": "44" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBWHystTriggerCount", - "Duration": 1000, - "Value": "0" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBWHystLength", - "Duration": 1000, - "Value": "0" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBWHistMemory", - "Duration": 1000, - "Value": "0" - }, - { - "PowerHint": "CAMERA_SHOT", - "Node": "CPUBWMinFreq", - "Duration": 1000, - "Value": "13763" - }, - { - "PowerHint": "AUDIO_STREAMING", - "Node": "CPUBigClusterMinFreq", - "Duration": 2000, - "Value": "1420800" - }, - { - "PowerHint": "AUDIO_STREAMING", - "Node": "PMQoSCpuDmaLatency", - "Duration": 2000, - "Value": "44" - }, - { - "PowerHint": "AUDIO_LOW_LATENCY", - "Node": "PowerHALAudioState", - "Duration": 0, - "Value": "AUDIO_LOW_LATENCY" - }, - { - "PowerHint": "AUDIO_LOW_LATENCY", - "Node": "PMQoSCpuDmaLatency", - "Duration": 0, - "Value": "44" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "0" - } - ] -} From 678d0e2d7acbc548a4ef2446fc1662636c951df1 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Sat, 4 May 2019 21:43:56 +0800 Subject: [PATCH 19/23] PowerHal: taimen: Support VR reload thermal config Test: boot Bug: 129495482 Change-Id: I0ed23026c339245bdacdfdc56ca8f5b9930efd0b --- device.mk | 5 +- powerhint.json | 532 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 536 insertions(+), 1 deletion(-) create mode 100644 powerhint.json diff --git a/device.mk b/device.mk index 3d997a4..d730ebd 100644 --- a/device.mk +++ b/device.mk @@ -58,6 +58,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/nfc/libnfc-nxp.taimen.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf +PRODUCT_COPY_FILES += \ + device/google/taimen/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + PRODUCT_COPY_FILES += \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/taimen/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf @@ -146,4 +149,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_app_phase_offset_ns=15000000 \ No newline at end of file + debug.sf.early_gl_app_phase_offset_ns=15000000 diff --git a/powerhint.json b/powerhint.json new file mode 100644 index 0000000..3e4a282 --- /dev/null +++ b/powerhint.json @@ -0,0 +1,532 @@ +{ + "Nodes": [ + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "1900800", + "1555200", + "1478400", + "1248000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "1900800", + "1555200", + "1512000", + "1478400", + "1134000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "2457600", + "1958400", + "1574400", + "1344000", + "1267200" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "2457600", + "1574400", + "1420800", + "1344000", + "1132800", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMaxFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", + "Values": [ + "342000000", + "414000000", + "515000000", + "710000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", + "Values": [ + "515000000", + "414000000", + "257000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUBusMinFreq", + "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq", + "Values": [ + "11863", + "7759", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TASchedtuneBoost", + "Path": "/dev/stune/top-app/schedtune.boost", + "Values": [ + "50", + "10" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBWHystTriggerCount", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_trigger_count", + "Values": [ + "0", + "3" + ] + }, + { + "Name": "CPUBWHistMemory", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hist_memory", + "Values": [ + "0", + "20" + ] + }, + { + "Name": "CPUBWHystLength", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_length", + "Values": [ + "0", + "10" + ] + }, + { + "Name": "CPUBWMinFreq", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/min_freq", + "Values": [ + "13763", + "5195", + "1525", + "762" + ], + "ResetOnInit": true + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "100" + ], + "HoldFd": true + }, + { + "Name": "PowerHALMainState", + "Path": "vendor.powerhal.state", + "Values": [ + "CAMERA_STREAMING", + "VR_SUSTAINED_PERFORMANCE", + "SUSTAINED_PERFORMANCE", + "VR_MODE", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALAudioState", + "Path": "vendor.powerhal.audio", + "Values": [ + "AUDIO_LOW_LATENCY", + "" + ], + "Type": "Property" + }, + { + "Name": "ThermalConfig", + "Path": "vendor.qcom.thermalcfg", + "Values": [ + "/vendor/etc/thermal-engine-vr.conf", + "/vendor/etc/thermal-engine.conf" + ], + "Type": "Property", + "ResetOnInit": true + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "FtmTouchMode", + "Path": "/sys/devices/virtual/input/ftm4_touch/vrmode", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "SUSTAINED_PERFORMANCE" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1267200" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1248000" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "342000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_MODE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "11863" + }, + { + "PowerHint": "VR_MODE", + "Node": "FtmTouchMode", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "7759" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1132800" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1134000" + }, + { + "PowerHint": "INTERACTION", + "Node": "TASchedtuneBoost", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystTriggerCount", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystLength", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHistMemory", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWMinFreq", + "Duration": 0, + "Value": "5195" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 5000, + "Value": "1900800" + }, + { + "PowerHint": "LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 5000, + "Value": "44" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystTriggerCount", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystLength", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHistMemory", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWMinFreq", + "Duration": 5000, + "Value": "13763" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "CAMERA_STREAMING" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1958400" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystTriggerCount", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystLength", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHistMemory", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWMinFreq", + "Duration": 1000, + "Value": "13763" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "CPUBigClusterMinFreq", + "Duration": 2000, + "Value": "1420800" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PowerHALAudioState", + "Duration": 0, + "Value": "AUDIO_LOW_LATENCY" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PMQoSCpuDmaLatency", + "Duration": 0, + "Value": "44" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "0" + } + ] +} From 07c73b7a8f5301f93648e58a27dcc7509fa9d989 Mon Sep 17 00:00:00 2001 From: Yiwen Chen Date: Tue, 4 Jun 2019 23:07:19 -0700 Subject: [PATCH 20/23] Switch back default vibrate for calls setting for taimen devices Bug: 130741987 Test: Tested on device Change-Id: I997dfd76cf8a3d6c7459a51373434a9df7fa0d4f --- .../base/packages/SettingsProvider/res/values/defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index 79aec49..4114c28 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -18,5 +18,5 @@ --> - true + false From 131e79c48e26c5575e8600a33a4e90b6dd48ca9b Mon Sep 17 00:00:00 2001 From: Vincent Palomares Date: Mon, 19 Nov 2018 14:50:23 -0800 Subject: [PATCH 21/23] taimen: MNH mitigation monitor. Bug: 119689840 Test: Tested manually using a dummy cooling device Change-Id: Ib3b35ea73455174cb867fc2655721eb99c382c9e Signed-off-by: Vincent Palomares --- thermal-engine.conf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/thermal-engine.conf b/thermal-engine.conf index d88175e..51862a4 100755 --- a/thermal-engine.conf +++ b/thermal-engine.conf @@ -57,6 +57,15 @@ thresholds_clr 47000 49000 51000 actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1 +[MNH-MONITOR2] +algo_type monitor +sampling 2000 +sensor bd_therm2 +thresholds 48000 50000 +thresholds_clr 47000 49000 +actions mnh mnh +action_info 3 4 + [BATTERY-MONITOR2] algo_type monitor sampling 2000 @@ -133,6 +142,15 @@ thresholds_clr 57000 59000 63000 actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1 +[MNH-MONITOR] +algo_type monitor +sampling 2000 +sensor bd_therm +thresholds 58000 60000 +thresholds_clr 57000 59000 +actions mnh mnh +action_info 3 4 + [SKIN-SHUTDOWN] algo_type monitor sampling 1000 From 4898043a6ecb22d86b82bf7dbb84dccf6a0ea13b Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Fri, 14 Jun 2019 13:08:46 -0700 Subject: [PATCH 22/23] wifi - Include Extended Supported Rates (50) IE in scan Updates g_probe_req_ie_bitmap_1 so that Extended Supported Rates (50) IE is included in Probe Request (Scanning). This is needed to solve IOT issues with certain APs. Bug: 122378191 Test: basic function test (sta, hotspot, p2p) pass Test: Check sniffer, probe request has Extended Supported Rates (50) Change-Id: Ib5cb53cb16f93ace5ca05c47e03b01f783deb4d3 --- WCNSS_qcom_cfg.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 71c184c..8a924a6 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -313,7 +313,7 @@ g_enable_probereq_whitelist_ies=1 # g_probe_req_ie_bitmap_0=0x00000000 #[] (default) # g_probe_req_ie_bitmap_1=0x80000009 #[32, 35, 63] g_probe_req_ie_bitmap_0=0x0000000B -# g_probe_req_ie_bitmap_1=0x00000000 +g_probe_req_ie_bitmap_1=0x00040000 # g_probe_req_ie_bitmap_2=0x00000000 # g_probe_req_ie_bitmap_3=0x00000000 # g_probe_req_ie_bitmap_4=0x00000000 From f3e4b070a1bb5aea99280cfed03578ddd4821003 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 3 Jun 2019 15:30:17 -0700 Subject: [PATCH 23/23] Dark boot on dark theme. Bug: 113028175 Bug: 134430124 Test: Build and flash taimen with the matching bootloader change. Toggle dark mode in Settings. Check serial log regarding the start of vendor.theme_{set,clear} services. Also read the value via `dd bs=1 skip=2048 if=/dev/block/sda5 count=32 | xxd` to confirm the change. Test: Trigger a factory reset via Settings. Check the value in /misc after the reset. Change-Id: I3ae9ac41d689a4d0a9d5e0275de92c35dda068b7 --- BoardConfig.mk | 5 ++++ init-taimen.rc | 24 +++++++++++++++++ recovery/Android.bp | 38 +++++++++++++++++++++++++++ recovery/recovery_ui.cpp | 57 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100644 recovery/Android.bp create mode 100644 recovery/recovery_ui.cpp diff --git a/BoardConfig.mk b/BoardConfig.mk index 0181ba6..fdd04a5 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -89,6 +89,11 @@ BOARD_LISA_TARGET_SCRIPTS := device/google/wahoo/lisa/ # rounded_corner_radius in overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml. TARGET_RECOVERY_UI_MARGIN_HEIGHT := 105 +TARGET_RECOVERY_UI_LIB := \ + librecovery_ui_taimen \ + libbootloader_message \ + libfstab + # VTS DTBO Verification. This kernel cmdline parameter should be added by the bootloader # for all future devices. BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=12 diff --git a/init-taimen.rc b/init-taimen.rc index 4a70d9e..78d48d8 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -52,3 +52,27 @@ on late-init && property:ro.boot.revision=rev_a on late-init && property:ro.boot.revision=rev_b setprop vendor.thermal.config thermal_info_config_evt.json + +# Write the dark theme magic (`theme-dark`, or 0x7468656d652d6461726b in hex string) to /misc +# partition. Offset 0 in vendor space is effectively offset 2048 in /misc partition. +service vendor.theme_set /vendor/bin/misc_writer --vendor-space-offset 0 --hex-string 0x7468656d652d6461726b + disabled + oneshot + +# Clear the 10-byte dark theme magic in /misc partition. Offset 0 in vendor space is effectively +# offset 2048 in /misc partition. +service vendor.theme_clear /vendor/bin/misc_writer --vendor-space-offset 0 --hex-string 0x00000000000000000000 + disabled + oneshot + +# Set the dark boot flag on dark mode (UiModeManager.MODE_NIGHT_YES == 2). +on property:persist.sys.theme=2 + start vendor.theme_set + +# Clear the dark theme flag on light mode (UiModeManager.MODE_NIGHT_NO == 1) or auto mode +# (UiModeManager.MODE_NIGHT_AUTO == 0). +on property:persist.sys.theme=1 + start vendor.theme_clear + +on property:persist.sys.theme=0 + start vendor.theme_clear diff --git a/recovery/Android.bp b/recovery/Android.bp new file mode 100644 index 0000000..0df54eb --- /dev/null +++ b/recovery/Android.bp @@ -0,0 +1,38 @@ +// +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_library_static { + name: "librecovery_ui_taimen", + owner: "google", + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-pedantic", + ], + srcs: [ + "recovery_ui.cpp", + ], + + static_libs: [ + "libbootloader_message", + ], + + shared_libs: [ + "libbase", + "librecovery_ui", + ], +} diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp new file mode 100644 index 0000000..2998b2a --- /dev/null +++ b/recovery/recovery_ui.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include +#include +#include +#include + +// Wipes the provisioned flag as part of data wipe. +static bool WipeProvisionedFlag() { + // Must be consistent with the one in init.hardware.rc (10-byte `theme-dark`). + const std::string wipe_str(10, '\x00'); + constexpr size_t kProvisionedFlagOffsetInVendorSpace = 0; + if (std::string err; !WriteMiscPartitionVendorSpace( + wipe_str.data(), wipe_str.size(), kProvisionedFlagOffsetInVendorSpace, &err)) { + LOG(ERROR) << "Failed to write wipe string: " << err; + return false; + } + LOG(INFO) << "Provisioned flag wiped successful"; + return true; +} + +class TaimenDevice : public Device { + public: + TaimenDevice(ScreenRecoveryUI* ui) : Device(ui) {} + + // Hook to wipe user data not stored in /data. + bool PostWipeData() override { + // Try to do everything but report a failure if anything wasn't successful. + bool total_success = true; + auto ui = GetUI(); + ui->Print("Wiping provisioned flag...\n"); + if (!WipeProvisionedFlag()) { + total_success = false; + } + return total_success; + } +}; + +Device* make_device() { + return new TaimenDevice(new ScreenRecoveryUI); +}