From 4db75dda18cbf22380b266428116024e36363075 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Mon, 16 May 2022 18:00:00 +0800 Subject: [PATCH 1/3] dumpstate: Dump logs Bug: 232556226 Test: log dumped in bugreport Signed-off-by: Kyle Tso Change-Id: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b Merged-In: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b --- conf/init.gs101.rc | 1 + dumpstate/DumpstateDevice.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 9898a7d3..bf63c26f 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -219,6 +219,7 @@ on init chown system system /dev/logbuffer_ttf chown system system /dev/logbuffer_tcpm chown system system /dev/logbuffer_usbpd + chown system system /dev/logbuffer_pogo_transport chown system system /dev/logbuffer_wireless chown system system /dev/logbuffer_pca9468 chown system system /dev/logbuffer_cpm diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 4b285b4e..b75ba64f 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -375,6 +375,7 @@ void DumpstateDevice::dumpPowerSection(int fd) { "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status; done"}); DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd"); + DumpFileToFd(fd, "POGO Transport", "/dev/logbuffer_pogo_transport"); DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm"); DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468"); From b495f66b8559d36f0b500c755a952976413620d1 Mon Sep 17 00:00:00 2001 From: Wiwit Rifa'i Date: Tue, 17 May 2022 15:30:37 +0800 Subject: [PATCH 2/3] dumpstate: add HWC logs Add hwc log files in /data/vendor/log/hwc to dumpstate. Bug: 230361290 Test: Manual - 'adb bugreport' Change-Id: Id23a16f42ecbdf75d83e056c7cba076041e19176 --- dumpstate/DumpstateDevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index b75ba64f..7da9b3fc 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -961,6 +961,10 @@ void DumpstateDevice::dumpDisplaySection(int fd) { CommandOptions::WithTimeout(2).Build()); DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); + RunCommandToFd(fd, "HWC logs", {"/vendor/bin/sh", "-c", + "for f in $(ls /data/vendor/log/hwc/*hwc_*); do " + "echo $f ; cat $f ; done"}, + CommandOptions::WithTimeout(2).Build()); } // Dump items related to AoC From 7bb4293087876144d5444ebd5146983399256622 Mon Sep 17 00:00:00 2001 From: Akilesh Kailash Date: Fri, 20 May 2022 06:22:54 +0000 Subject: [PATCH 3/3] Revert "gs101: Enable system_dlkm dynamic partition" This reverts commit 58893b442fe64f8061323c5b0cecb210531ed882. Reason for revert: OTA failues observed during S -> T Bug: 228927535 Test: Full and Incremental OTA's. Change-Id: Iec9e15d60dab92213494c9e679de6702f8d56e37 --- BoardConfig-common.mk | 9 +-------- conf/fstab.gs101.in | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1009bb4a..b5843c7c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -82,7 +82,6 @@ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ system \ - system_dlkm \ system_ext \ product \ vbmeta_system @@ -133,7 +132,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true # Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product +BOARD_AVB_VBMETA_SYSTEM := system system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) @@ -161,11 +160,6 @@ TARGET_COPY_OUT_PRODUCT := product BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext -# system_dlkm.img -BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm - ######################## # Video Codec ######################## @@ -183,7 +177,6 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ system \ - system_dlkm \ system_ext \ product \ vendor \ diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in index 5ad10a3c..8b7a7e3b 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -5,7 +5,6 @@ # # system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128