--- zzzz-none-000/linux-4.1.38/arch/arm/mm/cache-v7.S	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/arch/arm/mm/cache-v7.S	2020-11-25 10:06:48.000000000 +0000
@@ -335,8 +335,12 @@
 	add	r0, r0, r2
 	cmp	r0, r1
 	blo	1b
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_B15_MEGA_BARRIER)
+	issue_mega_barrier
+#else
 	dsb	st
-	ret	lr
+#endif
+	ret lr
 ENDPROC(v7_flush_kern_dcache_area)
 
 /*
@@ -390,7 +394,11 @@
 	add	r0, r0, r2
 	cmp	r0, r1
 	blo	1b
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_B15_MEGA_BARRIER)
+	issue_mega_barrier
+#else
 	dsb	st
+#endif
 	ret	lr
 ENDPROC(v7_dma_clean_range)
 
@@ -412,7 +420,11 @@
 	add	r0, r0, r2
 	cmp	r0, r1
 	blo	1b
+#if defined(CONFIG_BCM_KF_ARM_BCM963XX) && defined(CONFIG_BCM_B15_MEGA_BARRIER)
+	issue_mega_barrier
+#else
 	dsb	st
+#endif
 	ret	lr
 ENDPROC(v7_dma_flush_range)