--- zzzz-none-000/linux-4.4.271/arch/arm/mm/cache-v7.S	2021-06-03 06:22:09.000000000 +0000
+++ dakota-7530ac-750/linux-4.4.271/arch/arm/mm/cache-v7.S	2023-01-11 09:25:41.000000000 +0000
@@ -162,6 +162,9 @@
 skip:
 	add	r10, r10, #2			@ increment cache number
 	cmp	r3, r10
+#ifdef CONFIG_ARM_ERRATA_814220
+	dsb
+#endif
 	bgt	flush_levels
 finished:
 	mov	r10, #0				@ swith back to cache level 0
@@ -273,7 +276,7 @@
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r12, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -326,7 +329,7 @@
 	add	r1, r0, r1
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -349,12 +352,12 @@
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-v7_dma_inv_range:
+ENTRY(v7_dma_inv_range)
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	tst	r0, r3
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -379,11 +382,11 @@
  *	- start   - virtual start address of region
  *	- end     - virtual end address of region
  */
-v7_dma_clean_range:
+ENTRY(v7_dma_clean_range)
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif
@@ -405,7 +408,7 @@
 	dcache_line_size r2, r3
 	sub	r3, r2, #1
 	bic	r0, r0, r3
-#ifdef CONFIG_ARM_ERRATA_764369
+#if defined(CONFIG_ARM_ERRATA_764369) || defined(CONFIG_ARM_ERRATA_764369_AVM_A53)
 	ALT_SMP(W(dsb))
 	ALT_UP(W(nop))
 #endif