From 13e063511a659cbd8037ae125fd235ff95a65efe Mon Sep 17 00:00:00 2001 From: Labib Date: Mon, 21 Feb 2022 05:10:41 +0800 Subject: [PATCH 1/5] Upgrade RadioExt HAL Version Bug: 220493359 Test: Manual Change-Id: I1703c9ae65e232a5268cb2d9900031402fb225ee --- device.mk | 3 +++ device_framework_matrix_product.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f9558751..3f1c67a9 100644 --- a/device.mk +++ b/device.mk @@ -1074,6 +1074,9 @@ include hardware/google/pixel/PixelLogger/PixelLogger.mk # sscoredump include hardware/google/pixel/sscoredump/device.mk +# RadioExt Version +USES_RADIOEXT_V1_4 = true + # Wifi ext include hardware/google/pixel/wifi_ext/device.mk diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 22d32202..05159c81 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -204,7 +204,7 @@ vendor.google.radioext - 1.3 + 1.4 IRadioExt default From 7260497897a7b3c2bed9b7dfd4e65a2ad23c34b4 Mon Sep 17 00:00:00 2001 From: "Chung-Kai (Michael) Mei" Date: Tue, 19 Apr 2022 11:46:18 +0000 Subject: [PATCH 2/5] Revert "Enable load kernel modules in parallel" Revert "fix path for i2c peripheral device" Revert submission 17338969-gs201_parallel_load_enable Reason for revert: b/229241620 RamdumpTest failed Reverted Changes: Ib0b4f19f4:Enable load kernel modules in parallel Change-Id: I1dfea73fc9cd1549721201916fbf6e1184d56e56 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 93f3f0aa..afcb1f51 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -404,8 +404,5 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100 # Enable larger logbuf BOARD_KERNEL_CMDLINE += log_buf_len=1024K -# Enable load module in parallel -BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true - # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 From 3d30f2e370fbcdf6306693ad493b7066cf6d9331 Mon Sep 17 00:00:00 2001 From: Jinting Lin Date: Tue, 19 Apr 2022 09:09:13 +0000 Subject: [PATCH 3/5] Copy the pixel default logging mask to target folder Bug: 214351205 Change-Id: I6a8890cb4a6af53f6906dfb4af23359c721883ce --- device.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/device.mk b/device.mk index 3f1c67a9..1fd96d29 100644 --- a/device.mk +++ b/device.mk @@ -900,10 +900,13 @@ PRODUCT_PACKAGES += modem_logging_control # modem logging configs PRODUCT_COPY_FILES += \ - device/google/gs201/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \ - device/google/gs201/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ - device/google/gs201/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ - device/google/gs201/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default.cfg \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default.nprf \ + device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default_metrics.xml \ # ARM NN files ARM_COMPUTE_CL_ENABLE := 1 From d9b7c62fd11df4e7934efd05f75e665cd1140f47 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Mon, 7 Feb 2022 10:37:08 +0800 Subject: [PATCH 4/5] ADPF: deprecate the reporting rate from property Use powerhint.json profile to define reporting rate. Bug: 198379880 Test: build & manual test Change-Id: Ia72845feac0b221034ab716240be2929dc449eac --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index 1fd96d29..63595d97 100644 --- a/device.mk +++ b/device.mk @@ -404,9 +404,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.usb.usbradio.config=dm endif -# adpf 16ms update rate -PRODUCT_PRODUCT_PROPERTIES += \ - vendor.powerhal.adpf.rate=16666666 PRODUCT_COPY_FILES += \ device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json From 51bffd23711006a9bd7799a221327a16893a0273 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Sat, 19 Feb 2022 16:26:13 +0800 Subject: [PATCH 5/5] thermal: Apply thermalhal PID 2.0 Bug: 196478280 Test: build Change-Id: I59efbf09ee9a8584f0083db9f15924470f253479 --- conf/init.gs201.rc | 3 +++ device.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 5a2ff6b8..220ba139 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -906,6 +906,9 @@ on post-fs-data mkdir /data/vendor/powerstats 0771 system system chown system system /data/vendor/powerstats +on late-init && property:ro.boot.hw.soc.rev=0 + setprop vendor.thermal.config "thermal_info_config_A0.json" + on property:vendor.thermal.link_ready=1 # BCL write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS diff --git a/device.mk b/device.mk index 656ffd43..e4be22b5 100644 --- a/device.mk +++ b/device.mk @@ -1026,8 +1026,9 @@ PRODUCT_PACKAGES += \ include device/google/gs101/telephony/pktrouter.mk # Thermal HAL -include hardware/google/pixel/thermal/device.mk PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true +include hardware/google/pixel/thermal/device.mk +$(call soong_config_set,thermal_hal_feature,pid,apply_2_0) ## TPU packages include device/google/gs201/edgetpu/edgetpu.mk