diff --git a/aosptree/vendor/devices-community/pine64_pinephone/boot/bootscript_device_overlay.h b/aosptree/vendor/devices-community/pine64_pinephone/boot/bootscript_device_overlay.h
index cd465be..bd9e3ca 100644
--- a/aosptree/vendor/devices-community/pine64_pinephone/boot/bootscript_device_overlay.h
+++ b/aosptree/vendor/devices-community/pine64_pinephone/boot/bootscript_device_overlay.h
@@ -33,4 +33,4 @@
  gpio clear PD18; gpio set PD20; \
 
 #define POSTPROCESS_FDT() \
- EXTENV(bootargs, " loglevel=4"); \
+ EXTENV(bootargs, " loglevel=4 trace_buf_size=64M trace_event=sched_wakeup,sched_switch,sched_blocked_reason,sched_cpu_hotplug,block,ext4"); \
diff --git a/aosptree/vendor/devices-community/pine64_pinephone/device.mk b/aosptree/vendor/devices-community/pine64_pinephone/device.mk
index 6f98333..4610906 100644
--- a/aosptree/vendor/devices-community/pine64_pinephone/device.mk
+++ b/aosptree/vendor/devices-community/pine64_pinephone/device.mk
@@ -42,3 +42,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # RRO that disables round items in quicksetting menu to increase performance
 PRODUCT_PACKAGES += \
     SystemUISlowGpu
+
+PRODUCT_PROPERTY_OVERRIDES +=    debug.atrace.tags.enableflags=802922
+PRODUCT_PROPERTY_OVERRIDES +=    persist.traced.enable=0
+PRODUCT_COPY_FILES         +=    $(LOCAL_PATH)/etc/boottrace.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/boottrace.rc
diff --git a/aosptree/vendor/devices-community/pine64_pinephone/etc/boottrace.rc b/aosptree/vendor/devices-community/pine64_pinephone/etc/boottrace.rc
new file mode 100644
index 0000000..6ad355e
--- /dev/null
+++ b/aosptree/vendor/devices-community/pine64_pinephone/etc/boottrace.rc
@@ -0,0 +1,5 @@
+on property:sys.boot_completed=1          // This stops tracing on boot complete
+    write /d/tracing/tracing_on 0
+    write /d/tracing/events/ext4/enable 0
+    write /d/tracing/events/f2fs/enable 0
+    write /d/tracing/events/block/enable 0
diff --git a/patches-aosp/frameworks/native/0001-TEST-Don-t-disable-tracing-by-default.patch b/patches-aosp/frameworks/native/0001-TEST-Don-t-disable-tracing-by-default.patch
new file mode 100644
index 0000000..8d1b439
--- /dev/null
+++ b/patches-aosp/frameworks/native/0001-TEST-Don-t-disable-tracing-by-default.patch
@@ -0,0 +1,31 @@
+From 9383729f7a887c908dd60566340304758d27b7e9 Mon Sep 17 00:00:00 2001
+From: Roman Stratiienko <r.stratiienko@gmail.com>
+Date: Sun, 19 Mar 2023 18:04:33 +0200
+Subject: [PATCH] TEST: Don't disable tracing by default
+
+Required for boot tracing.
+
+Change-Id: I37d1fd137897f3d387fc70887c2adcec88beaf89
+Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
+---
+ cmds/atrace/atrace.rc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
+index 5267b0294c..f047d91268 100644
+--- a/cmds/atrace/atrace.rc
++++ b/cmds/atrace/atrace.rc
+@@ -227,8 +227,8 @@ on late-init
+     chmod 0666 /sys/kernel/tracing/events/thermal/cdev_update/enable
+ 
+ # Tracing disabled by default
+-    write /sys/kernel/debug/tracing/tracing_on 0
+-    write /sys/kernel/tracing/tracing_on 0
++#    write /sys/kernel/debug/tracing/tracing_on 0
++#    write /sys/kernel/tracing/tracing_on 0
+ 
+ # Read and truncate the kernel trace.
+     chmod 0666 /sys/kernel/debug/tracing/trace
+-- 
+2.34.1
+