From 8a2a6b6435543cd5e0791e2a15e998d18168c2e4 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Mon, 24 Apr 2023 06:56:43 +0000 Subject: [PATCH 1/4] audio: add smartfeature table for chre tuning note: add smartfeature.gstf that only used for Hotword pipeline in AoC which is sharing to chre usage too. On ZUMA CHRE PDM Gain(gain=10) CHRE AEC Gain(gain=-22) CHRE SRC AEC Timeout(timeout=300000) This table also contains hotword gain control as Non Eraser gain (gain=220) Eraser Post Gain (gain=220) Test: end-to-end verify by CHRE using aoc_audio_cfg to query gain as below adb shell aoc_audio_cfg hotword_get_non_eraser_gain adb shell aoc_audio_cfg hotword_get_eraser_post_gain Bug: 271078701 Change-Id: I8355563141b86c59e0c9115a64b787ac92f5aadd --- audio/husky/audio-tables.mk | 1 + audio/husky/tuning/bluenote/smartfeature.gstf | Bin 0 -> 236 bytes audio/shiba/audio-tables.mk | 1 + audio/shiba/tuning/bluenote/smartfeature.gstf | Bin 0 -> 236 bytes 4 files changed, 2 insertions(+) create mode 100644 audio/husky/tuning/bluenote/smartfeature.gstf create mode 100644 audio/shiba/tuning/bluenote/smartfeature.gstf diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 8736e09..0248b04 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -55,6 +55,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) # Audio tuning PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \ diff --git a/audio/husky/tuning/bluenote/smartfeature.gstf b/audio/husky/tuning/bluenote/smartfeature.gstf new file mode 100644 index 0000000000000000000000000000000000000000..f669a071a8b1ee001ab1322b419afa13bd1f96af GIT binary patch literal 236 zcmXRZ%}aj5z`#(JT9n5Eq#1#@q%<%60+3EENlaG&()XAPH9j1*y87vmPfPmy84DSA z@E&@Tc>lbp$%lI}&+nyWr&bno0M$W(LrP*v;shY)1v3Lf2Uw7qK|q~>0mx-g0b*gG zB_O*%KorWp17wRMu?2zZL2lszVr?Y#LO^klUIQT3L=umLvL8%lVTgjVxqxb-q3l=x H|NjR7qV_7i literal 0 HcmV?d00001 diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index b4e4270..508e15a 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -55,6 +55,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) # Audio tuning PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \ diff --git a/audio/shiba/tuning/bluenote/smartfeature.gstf b/audio/shiba/tuning/bluenote/smartfeature.gstf new file mode 100644 index 0000000000000000000000000000000000000000..f669a071a8b1ee001ab1322b419afa13bd1f96af GIT binary patch literal 236 zcmXRZ%}aj5z`#(JT9n5Eq#1#@q%<%60+3EENlaG&()XAPH9j1*y87vmPfPmy84DSA z@E&@Tc>lbp$%lI}&+nyWr&bno0M$W(LrP*v;shY)1v3Lf2Uw7qK|q~>0mx-g0b*gG zB_O*%KorWp17wRMu?2zZL2lszVr?Y#LO^klUIQT3L=umLvL8%lVTgjVxqxb-q3l=x H|NjR7qV_7i literal 0 HcmV?d00001 From 455a5c9c544709d2520812958bc79b2c6dc77d04 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Tue, 18 Apr 2023 04:17:12 +0000 Subject: [PATCH 2/4] shusky: adjust zram swap size to 50% of total memory - 8 GB -> 3.62 GB - 12 GB -> 5.57 GB Bug: 249179924 Test: Boot Change-Id: I8c9a3ce05893564878fc395579ae962a2fbe53ca --- device-husky.mk | 2 +- device-ripcurrent.mk | 2 +- device-shiba.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 12788bd..731e823 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -237,7 +237,7 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=3g \ + vendor.zram.size=50p \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 162ea4a..68e4219 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -226,7 +226,7 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=3g \ + vendor.zram.size=50p \ persist.device_config.configuration.disable_rescue_party=true PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 84a7cd9..3fa2d65 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -223,7 +223,7 @@ endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=3g \ + vendor.zram.size=50p \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL From 70af6960a07b12100405746efb696250a89d044e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 27 Apr 2023 12:11:09 +0800 Subject: [PATCH 3/4] thermal: reduce VSYS_PWR_RFFE window to 14s Bug: 278948544 Test: emul_temp Change-Id: Idb4d3179594bb20946fe4e23bceaef9db2c7b494 --- thermal_info_config_charge_husky.json | 2 +- thermal_info_config_charge_shiba.json | 2 +- thermal_info_config_husky.json | 2 +- thermal_info_config_shiba.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thermal_info_config_charge_husky.json b/thermal_info_config_charge_husky.json index ea9bd66..13a8c62 100644 --- a/thermal_info_config_charge_husky.json +++ b/thermal_info_config_charge_husky.json @@ -245,7 +245,7 @@ { "Name":"VSYS_PWR_RFFE", "PowerSampleDelay":7000, - "PowerSampleCount":4 + "PowerSampleCount":2 }, { "Name":"S2M_VDD_CPUCL2", diff --git a/thermal_info_config_charge_shiba.json b/thermal_info_config_charge_shiba.json index 54bb0bd..4fb6451 100644 --- a/thermal_info_config_charge_shiba.json +++ b/thermal_info_config_charge_shiba.json @@ -256,7 +256,7 @@ { "Name":"VSYS_PWR_RFFE", "PowerSampleDelay":7000, - "PowerSampleCount":4 + "PowerSampleCount":2 }, { "Name":"S2M_VDD_CPUCL2", diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json index 5e57d88..ac05ce1 100644 --- a/thermal_info_config_husky.json +++ b/thermal_info_config_husky.json @@ -710,7 +710,7 @@ { "Name":"VSYS_PWR_RFFE", "PowerSampleDelay":7000, - "PowerSampleCount":4 + "PowerSampleCount":2 }, { "Name":"S2M_VDD_CPUCL2", diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json index 9a81b03..fe47c5a 100644 --- a/thermal_info_config_shiba.json +++ b/thermal_info_config_shiba.json @@ -687,7 +687,7 @@ { "Name":"VSYS_PWR_RFFE", "PowerSampleDelay":7000, - "PowerSampleCount":4 + "PowerSampleCount":2 }, { "Name":"S2M_VDD_CPUCL2", From ca1a96d3bdb00152dcfa4bf4e20adde05e237f0a Mon Sep 17 00:00:00 2001 From: "Chung-Kai (Michael) Mei" Date: Mon, 20 Feb 2023 05:41:15 +0000 Subject: [PATCH 4/4] Revert "shusky: disable parallel module loading" This reverts commit efaeac87c2d2764e4252ecc0c6609ec5900c285c. Reason for revert: the patch for iommu has been merged Test: shiba rebooted 1000 times without failure and https://android-build.googleplex.com/builds/abtd/run/L49300000960255489 run device-boot-health-check-extra for husky Bug: 271931921 Change-Id: I4dcbc1e2028facd8531c94c03d0b28cbd6769b06 --- husky/BoardConfig.mk | 6 ++++++ ripcurrent/BoardConfig.mk | 6 ++++++ shiba/BoardConfig.mk | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 205ca79..a88a5c6 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -14,6 +14,12 @@ # limitations under the License. # +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky TARGET_SCREEN_DENSITY := 520 diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 1b5c405..9950fca 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -14,6 +14,12 @@ # limitations under the License. # +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ripcurrent TARGET_SCREEN_DENSITY := 440 diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 2acc2a4..92ab17c 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -14,6 +14,12 @@ # limitations under the License. # +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba TARGET_SCREEN_DENSITY := 420