Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8704672 from b4854aa4bb to tm-release

Browse source 
Change-Id: I24c0a80ae02d6400f6620e1a1c9120ae477078c1
This commit is contained in:
Android Build Coastguard Worker 2022-06-10 00:59:07 +00:00
commit 9cdc73ddfa
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BoardConfig-common.mk
View file

@ -46,7 +46,6 @@ endif
BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" 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 += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += swiotlb=noforce
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs

4
device.mk
View file

@ -1123,10 +1123,6 @@ PRODUCT_PACKAGES += \
update_engine_sideload \ update_engine_sideload \
update_verifier update_verifier
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
# pKVM # pKVM
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
PRODUCT_BUILD_PVMFW_IMAGE := true PRODUCT_BUILD_PVMFW_IMAGE := true

4
dumpstate/DumpstateDevice.cpp
View file

@ -961,10 +961,6 @@ void DumpstateDevice::dumpDisplaySection(int fd) {
CommandOptions::WithTimeout(2).Build()); CommandOptions::WithTimeout(2).Build());
DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); 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"); 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 // Dump items related to AoC

19
interfaces/boot/1.2/BootControl.cpp
View file

@ -49,6 +49,8 @@ namespace {
#define BOOT_B_PATH "/dev/block/by-name/boot_b" #define BOOT_B_PATH "/dev/block/by-name/boot_b"
#define DEVINFO_PATH "/dev/block/by-name/devinfo" #define DEVINFO_PATH "/dev/block/by-name/devinfo"
#define BLOW_AR_PATH "/sys/kernel/boot_control/blow_ar"
// slot flags // slot flags
#define AB_ATTR_PRIORITY_SHIFT 52 #define AB_ATTR_PRIORITY_SHIFT 52
#define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT) #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; 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 } // namespace
// Methods from ::android::hardware::boot::V1_0::IBootControl follow. // Methods from ::android::hardware::boot::V1_0::IBootControl follow.
@ -211,7 +218,17 @@ Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) {
ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL); 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(); return Void();
} }