From 69bd3c07ab236dc8fd81b264cc110013bafd8d51 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 26 Aug 2024 16:03:18 +0000 Subject: [PATCH 1/8] The "messaging" package is being removed. Change-Id: Ibbd134ec0f695ac9fbdb2831e81a6502729c96db --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index bf8d170a..2505c63d 100644 --- a/device.mk +++ b/device.mk @@ -367,9 +367,6 @@ include device/google/gs-common/insmod/insmod.mk PRODUCT_HOST_PACKAGES += \ mkdtimg -PRODUCT_PACKAGES += \ - messaging - # CHRE ## tools ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From f13115f44c909e137aa8f1ff68d0c774759c83a2 Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Fri, 23 Aug 2024 01:28:38 +0000 Subject: [PATCH 2/8] usb: correct sys.usb.controller sysprop system/core/init/init.cpp SetUsbController picks the first udc device if there're multiple udc devices present on the system to populate sys.usb.controller system property. CONFIG_USB_DUMMY_HCD enabled in kernel-5.10 GKI would introduce a dummy udc device named "dummy_udc.0". Depends on timing, the dummy device might be picked up by the init process and incorrectly populate sys.usb.controller. This issue only applies to devices on kernel-5.10 GKI, the WAR is to overwrite the sysprop if it's incorrectly populated by the dummy udc. Bug: 333778731 Test: tested on Cheetah Flag: EXEMPT bugfix Change-Id: I7555dda7f0bb436200ef7cd8a46b785232187cfd --- conf/init.gs201.usb.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index 9ba9eb8a..7d017d31 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -417,3 +417,7 @@ on property:ro.bootmode=usbuwb on property:vendor.usb.contaminantdisable=true exec /vendor/bin/hw/disable_contaminant_detection.sh + +# WAR for kernel 5.10 with CONFIG_USB_DUMMY_HCD enabled +on property:sys.usb.controller=dummy_udc.0 + setprop sys.usb.controller "11210000.dwc3" From fe86e10394c354a0aa6d634a171e154fb1013e36 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:54:00 -0700 Subject: [PATCH 3/8] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: I828ee34e1de2fb0ac228688517d4be89e43247d1 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 34b0326d..8c6ed15e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,4 @@ - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.boot IBootControl/default From 646cc8fdcfeb9ab05244345dd5c1c4c7dd565e1a Mon Sep 17 00:00:00 2001 From: kellyhung Date: Fri, 23 Aug 2024 13:04:47 +0800 Subject: [PATCH 4/8] Add soong config use_google_qns in device/google/gs201/device.mk Bug: 360757079 Test: lunch r11-trunk_staging-userdebug; m grilservice Flag: EXEMPT bugfix Change-Id: Ia10d6d73f7349b6a5de5046236c8498f54962036 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 726de305..eeecde31 100644 --- a/device.mk +++ b/device.mk @@ -212,6 +212,7 @@ USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) + $(call soong_config_set,grilservice,use_google_qns,true) endif # Use for GRIL From fcc8f3875f5849b6abed2bced47292f64e15a243 Mon Sep 17 00:00:00 2001 From: Charlie Yang Date: Wed, 4 Sep 2024 11:02:52 +0000 Subject: [PATCH 5/8] Revert "Add soong config use_google_qns in device/google/gs201/d..." Revert submission 28947244-grilservice Reason for revert: b/363911795 Reverted changes: /q/submissionid:28947244-grilservice Change-Id: I81e58d0f1190a592f388ab1031275e6f2656217b --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index eeecde31..726de305 100644 --- a/device.mk +++ b/device.mk @@ -212,7 +212,6 @@ USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) - $(call soong_config_set,grilservice,use_google_qns,true) endif # Use for GRIL From 541efd2ce2ea8c041f841537723c7596cdae0c60 Mon Sep 17 00:00:00 2001 From: carmenyip Date: Tue, 27 Aug 2024 08:19:37 +0000 Subject: [PATCH 6/8] extended_log: update directory permissions for gs201 Bug: 336638376 Test: $ cd data/vendor/radio $ ls -la Flag: NONE changing directory permissions only Change-Id: I972634ab85eb8416b43183712394c27d4d0340ee --- conf/init.modem.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.modem.rc b/conf/init.modem.rc index 6c89e3b2..861f0a18 100644 --- a/conf/init.modem.rc +++ b/conf/init.modem.rc @@ -11,7 +11,7 @@ on post-fs-data mkdir /data/vendor/slog 0771 system system # Modem extended log folder - mkdir /data/vendor/radio/extended_logs 0770 radio system + mkdir /data/vendor/radio/extended_logs 0771 radio system # Modem MDS log folder mkdir /data/vendor/radio/mds 0771 radio system From a664dadaa8738f1a2ac91af8628777693587b0b9 Mon Sep 17 00:00:00 2001 From: Ocean Chen Date: Wed, 4 Sep 2024 15:40:17 +0800 Subject: [PATCH 7/8] Switch from the BFQ to the mq-deadline I/O scheduler The mq-deadline I/O scheduler is more stable than BFQ. Additionally, the boot time is shorter with the mq-deadline I/O scheduler. It only changes the scheduler on new kernel. Bug: 186902601 Test: forrest build Change-Id: I5d336b3f146ca673c83c03304773d0ccf4c01e77 Signed-off-by: Ocean Chen --- conf/init.gs201.rc | 1 + device.mk | 8 ++++++++ storage/5.10/init.gs201.storage.rc | 3 +++ storage/6.1/init.gs201.storage.rc | 2 ++ 4 files changed, 14 insertions(+) create mode 100644 storage/5.10/init.gs201.storage.rc create mode 100644 storage/6.1/init.gs201.storage.rc diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 15601204..028db4b6 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -1,3 +1,4 @@ +import /vendor/etc/init/hw/init.gs201.storage.rc import /vendor/etc/init/hw/init.gs201.usb.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc diff --git a/device.mk b/device.mk index 726de305..95b4fc28 100644 --- a/device.mk +++ b/device.mk @@ -356,6 +356,14 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc +ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION))) +PRODUCT_COPY_FILES += \ + device/google/gs201/storage/5.10/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc +else +PRODUCT_COPY_FILES += \ + device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc +endif + ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \ diff --git a/storage/5.10/init.gs201.storage.rc b/storage/5.10/init.gs201.storage.rc new file mode 100644 index 00000000..7df260de --- /dev/null +++ b/storage/5.10/init.gs201.storage.rc @@ -0,0 +1,3 @@ +on init + write /sys/block/sda/queue/scheduler bfq + write /sys/block/sda/queue/iosched/slice_idle 0 \ No newline at end of file diff --git a/storage/6.1/init.gs201.storage.rc b/storage/6.1/init.gs201.storage.rc new file mode 100644 index 00000000..3d88bb69 --- /dev/null +++ b/storage/6.1/init.gs201.storage.rc @@ -0,0 +1,2 @@ +on init + write /sys/block/sda/queue/scheduler mq-deadline \ No newline at end of file From 8d194cb38ce88f8087bdc7c8b0aad4e2b7ef9e27 Mon Sep 17 00:00:00 2001 From: samou Date: Wed, 4 Sep 2024 16:19:55 +0000 Subject: [PATCH 8/8] bcl: remove charging debugfs data logging Flag: EXEMPT refactor Bug: 362322242 Change-Id: Ibdd3df9c7a2dfeab36a43d32dc092fefdec9d77d Signed-off-by: samou --- dumpstate/dump_power.cpp | 49 ---------------------------------------- 1 file changed, 49 deletions(-) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 1841502b..adb6c9b5 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -117,7 +117,6 @@ void dumpAcpmStats() { void dumpPowerSupplyStats() { const char* dumpList[][2] = { {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"}, - {"GENPD summary", "/d/pm_genpd/pm_genpd_summary"}, {"Power supply property battery", "/sys/class/power_supply/battery/uevent"}, {"Power supply property dc", "/sys/class/power_supply/dc/uevent"}, {"Power supply property gcpm", "/sys/class/power_supply/gcpm/uevent"}, @@ -292,53 +291,6 @@ void dumpBatteryDefend() { files.clear(); } } -void dumpChgUserDebug() { - std::vector files; - struct dirent *entry; - std::string content; - const char *chgUserDebug [][2] { - {"DC_registers dump", "/sys/class/power_supply/dc-mains/device/registers_dump"}, - {"max77759_chg registers dump", "/d/max77759_chg/registers"}, - {"max77729_pmic registers dump", "/d/max77729_pmic/registers"}, - {"Charging table dump", "/d/google_battery/chg_raw_profile"}, - }; - const std::string debugfs = "/d/"; - const char *maxFgStrMatch = "maxfg"; - const char *fgInfo [][2] { - {"fg_model", "fg_model"}, - {"fg_alo_ver", "algo_ver"}, - {"fg_model_ok", "model_ok"}, - {"fg registers", "registers"}, - {"Maxim FG NV RAM", "nv_registers"}, - }; - if (!isUserBuild()) - return; - for (auto &row : chgUserDebug) { - dumpFileContent(row[0], row[1]); - } - for (auto &info : fgInfo) { - DIR *dir = opendir(debugfs.c_str()); - if (dir == NULL) - return; - printTitle(info[0]); - while ((entry = readdir(dir)) != NULL) - if (std::string(entry->d_name).find(maxFgStrMatch) != std::string::npos) - files.push_back(entry->d_name); - closedir(dir); - sort(files.begin(), files.end()); - for (auto &file : files) { - std::string fileDirectory = debugfs + file; - std::string fileLocation = fileDirectory + "/" + std::string(info[1]); - if (!android::base::ReadFileToString(fileLocation, &content)) { - content = "\n"; - } - printf("%s:\n%s", fileDirectory.c_str(), content.c_str()); - if (content.back() != '\n') - printf("\n"); - } - files.clear(); - } -} void dumpBatteryEeprom() { const char *title = "Battery EEPROM"; const char *files[] { @@ -710,7 +662,6 @@ int main() { dumpLn8411(); dumpBatteryHealth(); dumpBatteryDefend(); - dumpChgUserDebug(); dumpBatteryEeprom(); dumpChargerStats(); dumpWlcLogs();