Merge tag 'dma-mapping-5.19-2022-05-25' of git://git.infradead.org/users/hch/dma...

[linux-2.6-microblaze.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index a141014..339ee84 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -451,11 +451,7 @@ void __init bootmem_init(void)
  */
 void __init mem_init(void)
 {
-       if (swiotlb_force == SWIOTLB_FORCE ||
-           max_pfn > PFN_DOWN(arm64_dma_phys_limit))
-               swiotlb_init(1);
-       else if (!xen_swiotlb_detect())
-               swiotlb_force = SWIOTLB_NO_FORCE;
+       swiotlb_init(max_pfn > PFN_DOWN(arm64_dma_phys_limit), SWIOTLB_VERBOSE);
 
        /* this will put all unused low memory onto the freelists */
        memblock_free_all();