1 files changed, 16 insertions, 0 deletions

diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c
index 5bb8e3c61d85..36ec171698b8 100644
--- a/arch/xtensa/mm/mmu.c
+++ b/arch/xtensa/mm/mmu.c
@@ -13,6 +13,8 @@
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
 #include <asm/page.h>
+#include <asm/initialize_mmu.h>
+#include <asm/io.h>
 
 void __init paging_init(void)
 {
@@ -37,6 +39,20 @@ void init_mmu(void)
         set_itlbcfg_register(0);
         set_dtlbcfg_register(0);
 #endif
+#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY && CONFIG_OF
+        /*
+         * Update the IO area mapping in case xtensa_kio_paddr has changed
+         */
+        write_dtlb_entry(__pte(xtensa_kio_paddr + CA_WRITEBACK),
+                        XCHAL_KIO_CACHED_VADDR + 6);
+        write_itlb_entry(__pte(xtensa_kio_paddr + CA_WRITEBACK),
+                        XCHAL_KIO_CACHED_VADDR + 6);
+        write_dtlb_entry(__pte(xtensa_kio_paddr + CA_BYPASS),
+                        XCHAL_KIO_BYPASS_VADDR + 6);
+        write_itlb_entry(__pte(xtensa_kio_paddr + CA_BYPASS),
+                        XCHAL_KIO_BYPASS_VADDR + 6);
+#endif
+
         local_flush_tlb_all();
 
         /* Set rasid register to a known value. */