diff --git a/rootdir/etc/init.qcom.debug.sh b/rootdir/etc/init.qcom.debug.sh
index 8118c318f5aea0f33d29b6e1ab3d49b84bde0041..aa20c6ec26e5200c56cabf85aea990611fdb5b8f 100644
--- a/rootdir/etc/init.qcom.debug.sh
+++ b/rootdir/etc/init.qcom.debug.sh
@@ -2587,7 +2587,7 @@ case "$coresight_config" in
             ;;
             "bengal")
                 soc_id=`cat /sys/devices/soc0/soc_id`
-                if [ "$soc_id" == "441" ]; then
+                if [[ "$soc_id" == "441" || "$soc_id" == "471" ]]; then
                     echo "Enabling DCC/STM/Debug events for scuba"
                     enable_scuba_debug
                     setprop ro.dbg.coresight.stm_cfg_done 1
diff --git a/rootdir/etc/init.qti.debug-scuba.sh b/rootdir/etc/init.qti.debug-scuba.sh
index a8021c731fe7315f9ec12f56dd8c13e1700a5935..92e56443cb930f442f6aea39e8db6d5ef76e8888 100644
--- a/rootdir/etc/init.qti.debug-scuba.sh
+++ b/rootdir/etc/init.qti.debug-scuba.sh
@@ -127,6 +127,9 @@ enable_scuba_stm_events()
     fi
 
     echo $etr_size > /sys/bus/coresight/devices/coresight-tmc-etr/buffer_size
+    if uname -m | grep "armv7l"; then
+        echo 0x1000000 > /sys/bus/coresight/devices/coresight-tmc-etr/buffer_size
+    fi
     echo 1 > /sys/bus/coresight/devices/coresight-tmc-etr/$sinkenable
     echo 1 > /sys/bus/coresight/devices/coresight-stm/$srcenable
     echo 1 > /sys/kernel/debug/tracing/tracing_on