From 77b0f3fc8c55f7cc934d380c6d295aa5f47ffc5f Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Thu, 28 Sep 2023 21:03:10 +0000 Subject: [PATCH] Revert "init.debug.rc: enable etm/etm2dram when SJTAG is unlocked" Revert submission 24754347-zuma-etm2dram Reason for revert: b/302352974 Reverted changes: /q/submissionid:24754347-zuma-etm2dram Bug: 302352974 Change-Id: I937658f7c78a97e2c3065a05058353b5cf16e860 Signed-off-by: Jing Wang --- conf/init.check_ap_pd_auth.sh | 15 --------------- conf/init.debug.rc | 11 ----------- device.mk | 3 +-- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 conf/init.check_ap_pd_auth.sh diff --git a/conf/init.check_ap_pd_auth.sh b/conf/init.check_ap_pd_auth.sh deleted file mode 100644 index 8175e754..00000000 --- a/conf/init.check_ap_pd_auth.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/vendor/bin/sh - -# This script sets up `ro.vendor.sjtag_ap_is_unlocked` for the non-fused -# device. For a fused device, this property should be set by -# betterbug->ss-restart-detector when PD is acquired. - -SJTAG_STATUS=0x$(cat /sys/devices/platform/sjtag_ap/interface/status) -SOFT_LOCK_BIT=4 -AUTH_PASS_BIT=8 - -# Unlocked or locked but auth passed. -if test "$((SJTAG_STATUS & (1 << SOFT_LOCK_BIT)))" = 0 -o \ - "$((SJTAG_STATUS & (1 << AUTH_PASS_BIT)))" != 0 ; then - setprop ro.vendor.sjtag_ap_is_unlocked true -fi diff --git a/conf/init.debug.rc b/conf/init.debug.rc index f86f224b..019a514b 100644 --- a/conf/init.debug.rc +++ b/conf/init.debug.rc @@ -50,14 +50,3 @@ on property:persist.sys.device_provisioned=1 && property:ro.revision=PROTO1.1 start vendor.force_pkvm on property:persist.sys.device_provisioned=1 && property:ro.revision=EVT1.0 start vendor.force_pkvm - -service vendor.check_ap_pd_auth_sh /vendor/bin/init.check_ap_pd_auth.sh - class main - user root - group root system - oneshot - -# Enable etm/etm2dram when ramdump is enabled, and ap-sjtag is unlocked. -on property:ro.boot.ramdump=enabled && property:ro.vendor.sjtag_ap_is_unlocked=true - write /sys/devices/platform/exynos-etm/etm_on 1 - write /sys/devices/platform/etm2dram/arm 1 diff --git a/device.mk b/device.mk index fef49dc2..a3f5f1d1 100644 --- a/device.mk +++ b/device.mk @@ -342,8 +342,7 @@ PRODUCT_COPY_FILES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/zuma/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \ - device/google/zuma/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh + device/google/zuma/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc PRODUCT_COPY_FILES += \ device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc endif