Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev

* changes:
  Zuma: disable MTE on system apps
  [Zuma] Unset mte_tcf_preferred
  Disable Kernel MTE in Zuma (non-fullmte).
This commit is contained in:
Evgenii Stepanov 2023-06-15 23:33:20 +00:00 committed by Android (Google) Code Review
commit 7421288b2d
3 changed files with 6 additions and 15 deletions

View file

@ -39,6 +39,9 @@ BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all
BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
BOARD_KERNEL_CMDLINE += swiotlb=1024 BOARD_KERNEL_CMDLINE += swiotlb=1024
BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem
ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
BOARD_KERNEL_CMDLINE += kasan=off
endif
BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true

View file

@ -1105,18 +1105,3 @@ on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
# Enable UFS powersaving in Off Mode Charger # Enable UFS powersaving in Off Mode Charger
write /dev/sys/block/bootdevice/clkgate_enable 1 write /dev/sys/block/bootdevice/clkgate_enable 1
# MTE
on property:persist.device_config.runtime_native_boot.bootloader_override=force_on
# Per-core mode overrides.
# Little Cores: sync
write /sys/devices/system/cpu/cpu0/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu1/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu2/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu3/mte_tcf_preferred sync
# Mid Cores: sync
write /sys/devices/system/cpu/cpu4/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu5/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu6/mte_tcf_preferred sync
write /sys/devices/system/cpu/cpu7/mte_tcf_preferred sync
# Big Core: sync more performance is prohibitively bad
write /sys/devices/system/cpu/cpu8/mte_tcf_preferred asymm

View file

@ -52,4 +52,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# force enable MTE. # force enable MTE.
ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off
endif endif