From c0cf226818258a9d6a562660e2443307e860f29f Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Thu, 2 Feb 2023 19:49:42 +0800 Subject: [PATCH 1/6] init: add permission for charging_policy access Bug: 251425963 Test: write charging_policy sysfs node successfully Change-Id: I3f387cbd80aa9bdcb483d0c6435cb382a7a847c7 Signed-off-by: Jack Wu --- conf/init.gs201.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 1ddd722c..6d8c5f45 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -274,6 +274,9 @@ on init # Adaptive charge chown system system /sys/class/power_supply/battery/charge_deadline + # Charging policy + chown system system /sys/class/power_supply/battery/charging_policy + # Battery Defender chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_cnt chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_dry_run From fd2a8ca06b7fd36da9c87a1425b3ea33c162abc6 Mon Sep 17 00:00:00 2001 From: Sajid Dalvi Date: Tue, 24 Jan 2023 12:22:08 -0600 Subject: [PATCH 2/6] dumpstate: Add logbuffer support for pcie driver [DO NOT MERGE] Add logbuffer support to pcie driver to reduce dmesg spam. Bug: 267495494 Change-Id: Ic70dfd696d084c1ab7f55872b69ca86856720592 Signed-off-by: Sajid Dalvi --- conf/init.gs201.rc | 2 ++ dumpstate/Dumpstate.cpp | 6 ++++++ dumpstate/Dumpstate.h | 1 + 3 files changed, 9 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index af2dac6b..2e6ca3c0 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -482,6 +482,8 @@ on early-boot chown system system /dev/logbuffer_cpm chown system system /dev/logbuffer_bd chown system system /dev/logbuffer_dual_batt + chown system system /dev/logbuffer_pcie0 + chown system system /dev/logbuffer_pcie1 on boot diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 41292eab..65f774aa 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -244,6 +244,7 @@ Dumpstate::Dumpstate() { "led", [this](int fd) { dumpLEDSection(fd); } }, { "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } }, { "perf-metrics", [this](int fd) { dumpPerfMetricsSection(fd); } }, + { "pcie", [this](int fd) { dumpPCIeSection(fd); } }, }, mLogSections{ { "modem", [this](int fd, const std::string &destDir) { dumpModemLogs(fd, destDir); } }, @@ -1197,6 +1198,11 @@ void Dumpstate::dumpLEDSection(int fd) { } } +void Dumpstate::dumpPCIeSection(int fd) { + DumpFileToFd(fd, "PCIe0 Logs", "/dev/logbuffer_pcie0"); + DumpFileToFd(fd, "PCIe1 Logs", "/dev/logbuffer_pcie1"); +} + void Dumpstate::dumpModemSection(int fd) { DumpFileToFd(fd, "Modem Stat", "/data/vendor/modem_stat/debug.txt"); RunCommandToFd(fd, "Modem SSR history", {"/vendor/bin/sh", "-c", diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index 805c1cbd..b13061fa 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -72,6 +72,7 @@ class Dumpstate : public BnDumpstateDevice { void dumpLEDSection(int fd); void dumpPixelTraceSection(int fd); void dumpPerfMetricsSection(int fd); + void dumpPCIeSection(int fd); void dumpLogSection(int fd, int fdModem); From 910f1e267ea6a01a37beabdace402efa9ecabf7b Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 24 Jan 2023 21:23:21 -0700 Subject: [PATCH 3/6] EGL: Configure multifile cache This CL enables multifile EGL blobcache for GS201 devices and sets a limit of 128MB. Test: pubg_mobile_launch ANGLE trace Test: /data/nativetest64/EGL_test/EGL_test Test: /data/nativetest64/libEGL_test/libEGL_test Bug: b/266725576 Change-Id: I1a0063fd5f7d5de7e64dcd00096a961f7ac922f4 --- device.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device.mk b/device.mk index 18eef0d9..21d9bb75 100644 --- a/device.mk +++ b/device.mk @@ -257,6 +257,11 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.hardware.egl = mali endif +# Configure EGL blobcache +PRODUCT_VENDOR_PROPERTIES += \ + ro.egl.blobcache.multifile=true \ + ro.egl.blobcache.multifile_limit=134217728 \ + PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ From 3357b8cf949b9e632d10759ba8bc700b72ac2242 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Thu, 2 Feb 2023 16:03:32 +0800 Subject: [PATCH 4/6] Set activelyPreferBadwifi config to 1 globally for gs201 devices This flag will not take effect if the system is configured to avoid bad wifis. Set it to 1 globally. Then it will sprint into effect for all mcc/mncs where config_networkAvoidBadWifi is 0. For carriers that don't need this behavior change but config_networkAvoidBadWifi is 0, set activelyPreferBadwifi to 0 for their mccmncs. Test: manual Bug: 267489867 Change-Id: I4b6fe4964e8fd5d61978f1433dcbbd9e9b10ffc3 --- .../res/values-mcc204-mnc04/config.xml | 28 +++++++++++++++++++ .../ConnectivityOverlay/res/values/config.xml | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml new file mode 100644 index 00000000..2a6d2e5c --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml @@ -0,0 +1,28 @@ + + + + + 0 + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values/config.xml b/rro_overlays/ConnectivityOverlay/res/values/config.xml index d9a29b07..d9e9b583 100644 --- a/rro_overlays/ConnectivityOverlay/res/values/config.xml +++ b/rro_overlays/ConnectivityOverlay/res/values/config.xml @@ -23,4 +23,8 @@ 0x80000000 + + + 1 From 17c28ccd37c56c63a27898b573d7932982e53815 Mon Sep 17 00:00:00 2001 From: Taylor Nelms Date: Mon, 5 Dec 2022 15:22:41 +0000 Subject: [PATCH 5/6] Modify dumpstate to point to counters in sysfs rather than debugfs Bug: 240346564 Test: Build for Cheetah device with user build, check bugreport for decon_counters content Merged-In: I0026378d81f5de5ac48b658861a2d8a85c817820 Change-Id: Ia20e1e985d3d83b58e4dce28d7537b49b545e243 Signed-off-by: Taylor Nelms --- dumpstate/Dumpstate.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 65f774aa..b85f12dc 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -1059,15 +1059,24 @@ void Dumpstate::dumpStorageSection(int fd) { // Dump items related to display void Dumpstate::dumpDisplaySection(int fd) { - DumpFileToFd(fd, "CRTC-0 underrun count", "/sys/kernel/debug/dri/0/crtc-0/underrun_cnt"); - DumpFileToFd(fd, "CRTC-0 crc count", "/sys/kernel/debug/dri/0/crtc-0/crc_cnt"); - DumpFileToFd(fd, "CRTC-0 ecc count", "/sys/kernel/debug/dri/0/crtc-0/ecc_cnt"); - DumpFileToFd(fd, "CRTC-0 idma err count", "/sys/kernel/debug/dri/0/crtc-0/idma_err_cnt"); + // Dump counters for decon drivers + const std::string decon_device_sysfs_path("/sys/class/drm/card0/device/"); + for(int i = 0; i <= 2; ++i){ + const std::string decon_num_str = std::to_string(i); + const std::string decon_counter_path = decon_device_sysfs_path + + "decon" + decon_num_str + + "/counters"; + if (access(decon_counter_path.c_str(), R_OK) == 0){ + DumpFileToFd(fd, "DECON-" + decon_num_str + " counters", + decon_counter_path); + } + else{ + ::android::base::WriteStringToFd("No counters for DECON-" + + decon_num_str + " found at path (" + decon_counter_path + ")\n", + fd); + } + } DumpFileToFd(fd, "CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event"); - DumpFileToFd(fd, "CRTC-1 underrun count", "/sys/kernel/debug/dri/0/crtc-1/underrun_cnt"); - DumpFileToFd(fd, "CRTC-1 crc count", "/sys/kernel/debug/dri/0/crtc-1/crc_cnt"); - DumpFileToFd(fd, "CRTC-1 ecc count", "/sys/kernel/debug/dri/0/crtc-1/ecc_cnt"); - DumpFileToFd(fd, "CRTC-1 idma err count", "/sys/kernel/debug/dri/0/crtc-1/idma_err_cnt"); DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event"); RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"}, CommandOptions::WithTimeout(2).Build()); From 4f38a9f1657cf8e64f75f846c6323d6e2eef9f3a Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Fri, 3 Feb 2023 18:24:34 +0000 Subject: [PATCH 6/6] Revert "EGL: Configure multifile cache" Revert submission 21108066-blobcache_multifile_20230125 Reason for revert: b/267777424 Reverted changes: /q/submissionid:21108066-blobcache_multifile_20230125 Change-Id: I6b19045ab521800e9a3cb2262bb2778a415c9285 --- device.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/device.mk b/device.mk index 21d9bb75..18eef0d9 100644 --- a/device.mk +++ b/device.mk @@ -257,11 +257,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.hardware.egl = mali endif -# Configure EGL blobcache -PRODUCT_VENDOR_PROPERTIES += \ - ro.egl.blobcache.multifile=true \ - ro.egl.blobcache.multifile_limit=134217728 \ - PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \