From d7e65047477046b7652a52bf177cd4284e020c6a Mon Sep 17 00:00:00 2001
From: Evgenii Stepanov <eugenis@google.com>
Date: Thu, 27 Apr 2023 14:40:37 -0700
Subject: [PATCH 1/2] [Zuma] set mte_tcf_preferred

Restrict this logic to device_config.*bootloader_override to avoid
impacting lab testing.

Bug: 239832365
Bug: 280343521
Test: adb shell setprop persist.device_config.runtime_native_boot.bootloader_override force_on
      adb reboot
      adb shell 'cat /sys/devices/system/cpu/cpu?/mte_tcf_preferred'
          should return all "sync" x6 followed by "asymm"

Change-Id: Iee5352a2056e69636a31daf6a89dfc8805963baf
---
 conf/init.zuma.rc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 57b5e364..4ee1992b 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -1063,3 +1063,19 @@ on post-fs-data && property:ro.vendor.factory=1
 on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
     # Enable UFS powersaving in Off Mode Charger
     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

From 72637ea3639ab2e98988340a4c461ebb3b54a360 Mon Sep 17 00:00:00 2001
From: Martin Liu <liumartin@google.com>
Date: Tue, 2 May 2023 17:18:12 +0800
Subject: [PATCH 2/2] adjust applying watermark_scale_factor timing

We should apply watermark_sclae_factor after
boot complete. Otherwise, extra_free_kbytes.sh
might overwrite it and this also aligns with
previous projects' timing.

Bug: 278075546
Test: boot and check watermark_scale_factor
Change-Id: I7989fd1e8cd968193577300b0f83a829bdeb037d
Signed-off-by: Martin Liu <liumartin@google.com>
---
 conf/init.zuma.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 86f95579..84b424e5 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -105,9 +105,6 @@ on init
     write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
 
-    # Adjust watermark level
-    write /proc/sys/vm/watermark_scale_factor 200
-
     # Some user code relies on ro.boot.hardware.revision
     setprop ro.boot.hardware.revision ${ro.revision}
 
@@ -718,6 +715,9 @@ on property:sys.boot_completed=1
     swapon_all /vendor/etc/fstab.${ro.board.platform}
     write /proc/sys/vm/swappiness 100
 
+    # Adjust watermark level
+    write /proc/sys/vm/watermark_scale_factor 200
+
     # Back to default VM settings
     write /proc/sys/vm/dirty_expire_centisecs 3000
     write /proc/sys/vm/dirty_background_ratio 10