Merge tag 'powerpc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / mm / mem.c

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 5e2e7c0..01ec2a2 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -49,6 +49,7 @@
 #include <asm/swiotlb.h>
 #include <asm/rtas.h>
 #include <asm/kasan.h>
+#include <asm/svm.h>
 
 #include <mm/mmu_decl.h>
 
@@ -283,7 +284,10 @@ void __init mem_init(void)
         * back to to-down.
         */
        memblock_set_bottom_up(true);
-       swiotlb_init(0);
+       if (is_secure_guest())
+               svm_swiotlb_init();
+       else
+               swiotlb_init(0);
 #endif
 
        high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);