From e8f5a4cefc70cd24eab0325383fb7569266c4bd7 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 28 Apr 2023 04:12:55 +0000 Subject: [PATCH 1/3] zuma: Disable kmem cgroup accounting Disable cgroup kernel memory accounting to avoid unnecessary overhead Bug: 258100733 Test: Boot Change-Id: I9e3ce7b4ae93531aeb12ca11a40d0445ba41b2cc --- BoardConfig-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3d11fc03..454dc341 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -38,6 +38,7 @@ BOARD_KERNEL_CMDLINE += cgroup_disable=memory BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on BOARD_KERNEL_CMDLINE += swiotlb=1024 +BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs TARGET_NO_BOOTLOADER := true From 8ec448aac5f758e21a165719abfd8fb91ca2701e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 29 Apr 2023 09:28:41 +0000 Subject: [PATCH 2/3] Update SoC-specific Lyric config. Bug: 280124102 Test: presubmit Change-Id: Ia6baa649a546cf90fdf995b2a928638f05c5ec74 --- device.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/device.mk b/device.mk index 09894dfd..19aa78f4 100644 --- a/device.mk +++ b/device.mk @@ -550,19 +550,11 @@ else LOCAL_TARGET_PRODUCT := slider endif -$(call soong_config_set,google3a_config,soc,zuma) -$(call soong_config_set,google3a_config,gcam_awb,true) -$(call soong_config_set,google3a_config,ghawb_truetone,true) - -ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) +# Lyric Camera HAL settings +include device/google/gs-common/camera/lyric.mk $(call soong_config_set,lyric,soc,zuma) -$(call soong_config_set,lyric,use_lyric_camera_hal,true) $(call soong_config_set,lyric,kernel_version,v515) -# lyric::tuning_product is set in device-specific makefiles, -# such as device/google/${DEVICE}/device-${DEVICE}.mk - -$(call soong_config_set,gch,hwl_library,lyric) -endif +$(call soong_config_set,google3a_config,soc,zuma) # WiFi PRODUCT_PACKAGES += \ @@ -942,8 +934,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) include device/google/gs-common/sensors/sensors.mk -$(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk) PRODUCT_COPY_FILES += \ device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ From 3aea8063d32dd857397ed25575dab70739dded73 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Wed, 3 May 2023 15:59:03 +0800 Subject: [PATCH 3/3] init: fix incorrect dc sysfs node path also add thermal stats permissions for clearing Bug: 262520811 Test: can parse pca stats in pixelstats-uevent Change-Id: I1fadae8f5ee80279222313d0408ba21421e4c4a7 Signed-off-by: Jack Wu --- conf/init.zuma.rc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 84b424e5..549ef294 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -211,10 +211,6 @@ on init chown system system /sys/class/power_supply/maxfg/m5_model_state chown system system /sys/class/power_supply/maxfg_base/m5_model_state - # pca9468 : slider+77729: 6-0057; slider+MW A1: 5-0057 - chown system system /d/regmap/5-0057-pca9468-mains/registers - chown system system /d/regmap/6-0057-pca9468-mains/registers - # Dump eeprom chown system system /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom chown system system /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom @@ -230,11 +226,17 @@ on init chown system system /sys/class/power_supply/battery/charge_stats # Pca Charge stats (write 0) - chown system system /sys/class/power_supply/pca9468-mains/device/chg_stats + chown system system /sys/class/power_supply/dc-mains/device/chg_stats # Wireless Charge stats (write 0) chown system system /sys/class/power_supply/wireless/device/charge_stats + # Thermal Charge stats (write 0) + chown system system /sys/devices/platform/google,charger/thermal_stats + + # Google Charger stats (write 0) + chown system system /sys/devices/platform/google,charger/charge_stats + # Permission for wireless charging chown system system /sys/class/power_supply/wireless/capacity chown system system /sys/class/power_supply/wireless/device/rtx