From a664dadaa8738f1a2ac91af8628777693587b0b9 Mon Sep 17 00:00:00 2001
From: Ocean Chen <oceanchen@google.com>
Date: Wed, 4 Sep 2024 15:40:17 +0800
Subject: [PATCH] Switch from the BFQ to the mq-deadline I/O scheduler

The mq-deadline I/O scheduler is more stable than BFQ. Additionally, the
boot time is shorter with the mq-deadline I/O scheduler. It only changes the scheduler on new kernel.

Bug: 186902601
Test: forrest build

Change-Id: I5d336b3f146ca673c83c03304773d0ccf4c01e77
Signed-off-by: Ocean Chen <oceanchen@google.com>
---
 conf/init.gs201.rc                 | 1 +
 device.mk                          | 8 ++++++++
 storage/5.10/init.gs201.storage.rc | 3 +++
 storage/6.1/init.gs201.storage.rc  | 2 ++
 4 files changed, 14 insertions(+)
 create mode 100644 storage/5.10/init.gs201.storage.rc
 create mode 100644 storage/6.1/init.gs201.storage.rc

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 15601204..028db4b6 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -1,3 +1,4 @@
+import /vendor/etc/init/hw/init.gs201.storage.rc
 import /vendor/etc/init/hw/init.gs201.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
diff --git a/device.mk b/device.mk
index 726de305..95b4fc28 100644
--- a/device.mk
+++ b/device.mk
@@ -356,6 +356,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
 
+ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
+PRODUCT_COPY_FILES += \
+	device/google/gs201/storage/5.10/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
+else
+PRODUCT_COPY_FILES += \
+	device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
+endif
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \
diff --git a/storage/5.10/init.gs201.storage.rc b/storage/5.10/init.gs201.storage.rc
new file mode 100644
index 00000000..7df260de
--- /dev/null
+++ b/storage/5.10/init.gs201.storage.rc
@@ -0,0 +1,3 @@
+on init
+    write /sys/block/sda/queue/scheduler bfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
\ No newline at end of file
diff --git a/storage/6.1/init.gs201.storage.rc b/storage/6.1/init.gs201.storage.rc
new file mode 100644
index 00000000..3d88bb69
--- /dev/null
+++ b/storage/6.1/init.gs201.storage.rc
@@ -0,0 +1,2 @@
+on init
+    write /sys/block/sda/queue/scheduler mq-deadline
\ No newline at end of file