From 29c8d8c5ff707647fe69268da1c6e1477edc6f9e Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Wed, 8 Jun 2022 09:39:35 -0700 Subject: [PATCH 1/4] gs101: turn off page_pinner Page_pinner aimed for help tracking cma allocation failure. Since we are memory hungry and gs101 is lacking of critical usecases atm, we could disable it. It will return memory 0.78% memory. Bug: 235227018 Test: confirmed that no page_pinner directory in the debugfs. Signed-off-by: Minchan Kim Change-Id: I37a0c9ba76b278f813dff6e81b77438ab9e87d3c --- BoardConfig-common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index b5843c7c..1b246e13 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -46,7 +46,6 @@ endif BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y -BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs From 9ecd004e6bf34260c17c39bb29d0a718fa01cd1f Mon Sep 17 00:00:00 2001 From: Jidong Sun Date: Fri, 3 Jun 2022 14:42:05 -0700 Subject: [PATCH 2/4] BootControl: blow AR on boot complete Bug: 232277507 Signed-off-by: Jidong Sun Change-Id: I684bc259407b3cbaa5dda9fdc16158d7bd4b4e02 --- interfaces/boot/1.2/BootControl.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/interfaces/boot/1.2/BootControl.cpp b/interfaces/boot/1.2/BootControl.cpp index a28be05a..6c480bb6 100644 --- a/interfaces/boot/1.2/BootControl.cpp +++ b/interfaces/boot/1.2/BootControl.cpp @@ -49,6 +49,8 @@ namespace { #define BOOT_B_PATH "/dev/block/by-name/boot_b" #define DEVINFO_PATH "/dev/block/by-name/devinfo" +#define BLOW_AR_PATH "/sys/kernel/boot_control/blow_ar" + // slot flags #define AB_ATTR_PRIORITY_SHIFT 52 #define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT) @@ -174,6 +176,11 @@ static void DevInfoInitSlot(devinfo_ab_slot_data_t &slot_data) { slot_data.fastboot_ok = 0; } +static bool blowAR() { + android::base::unique_fd fd(open(BLOW_AR_PATH, O_WRONLY | O_DSYNC)); + return android::base::WriteStringToFd("1", fd); +} + } // namespace // Methods from ::android::hardware::boot::V1_0::IBootControl follow. @@ -211,7 +218,17 @@ Return BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) { ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL); } - !ret ? _hidl_cb({false, "Failed to set successful flag"}) : _hidl_cb({true, ""}); + if (!ret) { + _hidl_cb({false, "Failed to set successful flag"}); + return Void(); + } + + if (!blowAR()) { + ALOGE("Failed to blow anti-rollback counter"); + // Ignore the error, since ABL will re-trigger it on reboot + } + + _hidl_cb({true, ""}); return Void(); } From 957477e79fe283f6a53ad1c6d19747ebe63cfeb1 Mon Sep 17 00:00:00 2001 From: Mars Lin Date: Wed, 8 Jun 2022 22:08:50 +0800 Subject: [PATCH 3/4] gs101: Move tetheroffload HAL to raviole Since T6 does not support tetheroffload, move the tetheroffload HAL to raviole. Bug: 232717674 Test: Check if the manifest file exist in vendor/etc/vintf/manifest/ Change-Id: Ibbd315eec97e4e035fef986e389ba1124223390d --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index a2ac82f9..64f554c3 100644 --- a/device.mk +++ b/device.mk @@ -1123,10 +1123,6 @@ PRODUCT_PACKAGES += \ update_engine_sideload \ update_verifier -# tetheroffload HAL -PRODUCT_PACKAGES += \ - vendor.samsung_slsi.hardware.tetheroffload@1.1-service - # pKVM $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) PRODUCT_BUILD_PVMFW_IMAGE := true From b4854aa4bb31e1c21b5949e2697cea0b9161c009 Mon Sep 17 00:00:00 2001 From: Ken Huang Date: Thu, 9 Jun 2022 02:50:38 +0000 Subject: [PATCH 4/4] Revert "dumpstate: add HWC logs" This reverts commit b495f66b8559d36f0b500c755a952976413620d1. Reason for revert: CTS failure Bug: 233982921 Test: bugreport Change-Id: Ic1bb3fe6b3ac2b8f56646e3c9cdbfda963a5462e --- dumpstate/DumpstateDevice.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 7da9b3fc..b75ba64f 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -961,10 +961,6 @@ 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