From cf6265fb325fdcc030b02df5a19586aa9b285bb6 Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Mon, 24 Oct 2022 11:48:16 -0700 Subject: [PATCH 1/4] gs101: pixelstats: add pixel perf stats paths Add pixel perf metrics paths in sysfs paths list for gs101 Bug: 232541623 Test: Tested resume latency metrics Signed-off-by: Ziyi Cui Change-Id: I0c4b363e93a9ee651cedc35e2e1e09a691244828 --- pixelstats/service.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index fd62a70b..eb71d45e 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -45,6 +45,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp", .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion", .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat", + .ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics", + .LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics", .UFSErrStatsPath = { UFS_ERR_PATH(pa_err_count), UFS_ERR_PATH(dl_err_count), From 2f92bc0d386c782ca26c0ddd6769756f067b57af Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Fri, 25 Nov 2022 05:38:40 +0000 Subject: [PATCH 2/4] gs101:use gs-common pixel_metrics dump Bug: 227809911 Bug: 232541623 Test:"adb bugreport" includes metrics capture. Change-Id: Ie1e6078713a969c490cba67ad64aac8328ac62df Signed-off-by: Ziyi Cui --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index e8efe715..a435ab26 100644 --- a/device.mk +++ b/device.mk @@ -21,6 +21,7 @@ include device/google/gs-common/soc/soc.mk include device/google/gs-common/modem/modem.mk include device/google/gs-common/aoc/aoc.mk include device/google/gs-common/thermal/thermal.mk +include device/google/gs-common/pixel_metrics/pixel_metrics.mk TARGET_BOARD_PLATFORM := gs101 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) From 66379fde0e3b9bef94566d5cb109242765072dea Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 28 Nov 2022 14:05:57 +0800 Subject: [PATCH 3/4] use touch dump from gs-common Bug: 256521567 Test: adb bugreport Change-Id: I224a2a194c9e37768e8a5c7e879da97964d97fbf --- dumpstate/Dumpstate.cpp | 180 ---------------------------------------- dumpstate/Dumpstate.h | 2 - 2 files changed, 182 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 44d7b0ca..11142f5f 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -252,12 +252,10 @@ void endSection(int fd, const std::string §ionName, timepoint_t startTime) { Dumpstate::Dumpstate() : mTextSections{ - { "pre-touch", [this](int fd) { dumpPreTouchSection(fd); } }, { "memory", [this](int fd) { dumpMemorySection(fd); } }, { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } }, { "cpu", [this](int fd) { dumpCpuSection(fd); } }, { "power", [this](int fd) { dumpPowerSection(fd); } }, - { "touch", [this](int fd) { dumpTouchSection(fd); } }, { "display", [this](int fd) { dumpDisplaySection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } }, { "camera", [this](int fd) { dumpCameraSection(fd); } }, @@ -508,184 +506,6 @@ void Dumpstate::dumpPowerSection(int fd) { } -// Dump items related to touch -void Dumpstate::dumpPreTouchSection(int fd) { - const char nvt_spi_path[] = "/sys/class/spi_master/spi11/spi11.0/input/nvt_touch"; - char cmd[256]; - - /* NVT touch */ - if (!access(nvt_spi_path, R_OK)) { - snprintf(cmd, sizeof(cmd), - "echo %s > %s/%s", - "0x21", - nvt_spi_path, - "force_touch_active"); - RunCommandToFd(fd, "Force Touch Active(Enable)", {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "/proc/nvt_fw_version"); - if (!access(cmd, R_OK)) - DumpFileToFd(fd, "FW version", cmd); - -#if 0 /* b/193467774: remove this temporarily */ - snprintf(cmd, sizeof(cmd), "/proc/nvt_diff"); - if (!access(cmd, R_OK)) - DumpFileToFd(fd, "Diff", cmd); - - snprintf(cmd, sizeof(cmd), "%s/nvt_fw_history", nvt_spi_path); - if (!access(nvt_spi_path, R_OK)) - DumpFileToFd(fd, "FW History", cmd); -#endif - - snprintf(cmd, sizeof(cmd), - "echo %s > %s/%s", - "0x20", - nvt_spi_path, - "force_touch_active"); - RunCommandToFd(fd, "Force Touch Active(Disable)", {"/vendor/bin/sh", "-c", cmd}); - } -} - -void Dumpstate::dumpTouchSection(int fd) { - const char stm_cmd_path[4][50] = {"/sys/class/spi_master/spi11/spi11.0", - "/proc/fts/driver_test", - "/sys/class/spi_master/spi6/spi6.0", - "/proc/fts_ext/driver_test"}; - char cmd[256]; - - for (int i = 0; i < 4; i+=2) { - snprintf(cmd, sizeof(cmd), "%s", stm_cmd_path[i + 1]); - if (!access(cmd, R_OK)) { - snprintf(cmd, sizeof(cmd), "echo A0 01 01 > %s", stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Force Set AP as Bus Owner with Bugreport Flag", - {"/vendor/bin/sh", "-c", cmd}); - } - - snprintf(cmd, sizeof(cmd), "%s/appid", stm_cmd_path[i]); - if (!access(cmd, R_OK)) { - // Touch firmware version - DumpFileToFd(fd, "STM touch firmware version", cmd); - - // Touch controller status - snprintf(cmd, sizeof(cmd), "%s/status", stm_cmd_path[i]); - DumpFileToFd(fd, "STM touch status", cmd); - - // Mutual raw data - snprintf(cmd, sizeof(cmd), - "echo 13 00 01 > %s/stm_fts_cmd && cat %s/stm_fts_cmd", - stm_cmd_path[i], stm_cmd_path[i]); - RunCommandToFd(fd, "Mutual Raw", {"/vendor/bin/sh", "-c", cmd}); - - // Mutual strength data - snprintf(cmd, sizeof(cmd), - "echo 17 01 > %s/stm_fts_cmd && cat %s/stm_fts_cmd", - stm_cmd_path[i], stm_cmd_path[i]); - RunCommandToFd(fd, "Mutual Strength", {"/vendor/bin/sh", "-c", cmd}); - - // Self raw data - snprintf(cmd, sizeof(cmd), - "echo 15 00 01 > %s/stm_fts_cmd && cat %s/stm_fts_cmd", - stm_cmd_path[i], stm_cmd_path[i]); - RunCommandToFd(fd, "Self Raw", {"/vendor/bin/sh", "-c", cmd}); - } - - snprintf(cmd, sizeof(cmd), "%s", stm_cmd_path[i + 1]); - if (!access(cmd, R_OK)) { - snprintf(cmd, sizeof(cmd), - "echo 01 A4 06 C3 > %s; echo 02 A7 00 00 00 40 00 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "HDM debug information (32 bytes)", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 23 00 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Mutual Raw Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 23 03 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Mutual Baseline Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 23 02 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Mutual Strength Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 24 00 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Self Raw Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 24 03 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Self Baseline Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 24 02 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Self Strength Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 32 10 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Mutual Compensation", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 32 11 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Mutual Low Power Compensation", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 33 12 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Self Compensation", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 34 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Golden Mutual Raw Data", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), "echo 01 FA 20 00 00 24 80 > %s", - stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Packaging Plant - HW reset", - {"/vendor/bin/sh", "-c", cmd}); - snprintf(cmd, sizeof(cmd), "echo 01 FA 20 00 00 68 08 > %s", - stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Packaging Plant - Hibernate Memory", - {"/vendor/bin/sh", "-c", cmd}); - snprintf(cmd, sizeof(cmd), - "echo 02 FB 00 04 3F D8 00 10 01 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Packaging Plant - Read 16 bytes from Address 0x00041FD8", - {"/vendor/bin/sh", "-c", cmd}); - - snprintf(cmd, sizeof(cmd), - "echo 01 A4 06 C3 > %s; echo 02 A7 00 00 00 40 00 > %s && cat %s", - stm_cmd_path[i + 1], stm_cmd_path[i + 1], stm_cmd_path[i + 1]); - RunCommandToFd(fd, "HDM debug information (32 bytes)", - {"/vendor/bin/sh", "-c", cmd}); - } - - snprintf(cmd, sizeof(cmd), "%s/stm_fts_cmd", stm_cmd_path[i]); - if (!access(cmd, R_OK)) { - // ITO raw data - snprintf(cmd, sizeof(cmd), - "echo 01 > %s/stm_fts_cmd && cat %s/stm_fts_cmd", - stm_cmd_path[i], stm_cmd_path[i]); - RunCommandToFd(fd, "ITO Raw", {"/vendor/bin/sh", "-c", cmd}); - } - - snprintf(cmd, sizeof(cmd), "%s", stm_cmd_path[i + 1]); - if (!access(cmd, R_OK)) { - snprintf(cmd, sizeof(cmd), "echo A0 00 01 > %s", stm_cmd_path[i + 1]); - RunCommandToFd(fd, "Restore Bus Owner", - {"/vendor/bin/sh", "-c", cmd}); - } - } - -} - // Dump items related to CPUs void Dumpstate::dumpCpuSection(int fd) { DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present"); diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index 7eb52f9b..314dc02c 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -48,8 +48,6 @@ class Dumpstate : public BnDumpstateDevice { // Text sections that can be dumped individually on the command line in // addition to being included in full dumps void dumpPowerSection(int fd); - void dumpPreTouchSection(int fd); - void dumpTouchSection(int fd); void dumpCpuSection(int fd); void dumpDevfreqSection(int fd); void dumpMemorySection(int fd); From 74f5ca9888ced31669e9efe29832ab7ebda3e36c Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Wed, 23 Nov 2022 14:03:48 -0800 Subject: [PATCH 4/4] Rename libedgetpu_dba_hal.google.so to libedgetpu_dba.google.so Bug: 257312560 Test: mma Test: atest edgetpu_dba_test Test: atest edgetpu_dba_dlopen_test Change-Id: I07d20366d05a7911eb8d950be7aff0e3ea04423b --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index a435ab26..d9051e0a 100644 --- a/device.mk +++ b/device.mk @@ -1110,8 +1110,8 @@ $(call soong_config_set,edgetpu_config,chip,abrolhos) PRODUCT_PACKAGES += edgetpu-abrolhos.fw # TPU DBA AIDL HAL service PRODUCT_PACKAGES += com.google.edgetpu.dba-service -# TPU DBA HAL C API library -PRODUCT_PACKAGES += libedgetpu_dba_hal.google +# TPU DBA C API library +PRODUCT_PACKAGES += libedgetpu_dba.google # Connectivity Thermal Power Manager