Merge tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / iommu / io-pgtable-arm.c

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index dc7bcf8..a7a9bc0 100644 (file)
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -20,6 +20,8 @@
 
 #include <asm/barrier.h>
 
+#include "io-pgtable-arm.h"
+
 #define ARM_LPAE_MAX_ADDR_BITS         52
 #define ARM_LPAE_S2_MAX_CONCAT_PAGES   16
 #define ARM_LPAE_MAX_LEVELS            4
@@ -100,23 +102,6 @@
 #define ARM_LPAE_PTE_MEMATTR_DEV       (((arm_lpae_iopte)0x1) << 2)
 
 /* Register bits */
-#define ARM_LPAE_TCR_TG0_4K            0
-#define ARM_LPAE_TCR_TG0_64K           1
-#define ARM_LPAE_TCR_TG0_16K           2
-
-#define ARM_LPAE_TCR_TG1_16K           1
-#define ARM_LPAE_TCR_TG1_4K            2
-#define ARM_LPAE_TCR_TG1_64K           3
-
-#define ARM_LPAE_TCR_SH_NS             0
-#define ARM_LPAE_TCR_SH_OS             2
-#define ARM_LPAE_TCR_SH_IS             3
-
-#define ARM_LPAE_TCR_RGN_NC            0
-#define ARM_LPAE_TCR_RGN_WBWA          1
-#define ARM_LPAE_TCR_RGN_WT            2
-#define ARM_LPAE_TCR_RGN_WB            3
-
 #define ARM_LPAE_VTCR_SL0_MASK         0x3
 
 #define ARM_LPAE_TCR_T0SZ_SHIFT                0
@@ -124,14 +109,6 @@
 #define ARM_LPAE_VTCR_PS_SHIFT         16
 #define ARM_LPAE_VTCR_PS_MASK          0x7
 
-#define ARM_LPAE_TCR_PS_32_BIT         0x0ULL
-#define ARM_LPAE_TCR_PS_36_BIT         0x1ULL
-#define ARM_LPAE_TCR_PS_40_BIT         0x2ULL
-#define ARM_LPAE_TCR_PS_42_BIT         0x3ULL
-#define ARM_LPAE_TCR_PS_44_BIT         0x4ULL
-#define ARM_LPAE_TCR_PS_48_BIT         0x5ULL
-#define ARM_LPAE_TCR_PS_52_BIT         0x6ULL
-
 #define ARM_LPAE_MAIR_ATTR_SHIFT(n)    ((n) << 3)
 #define ARM_LPAE_MAIR_ATTR_MASK                0xff
 #define ARM_LPAE_MAIR_ATTR_DEVICE      0x04
@@ -751,11 +728,6 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
        if (cfg->oas > ARM_LPAE_MAX_ADDR_BITS)
                return NULL;
 
-       if (!selftest_running && cfg->iommu_dev->dma_pfn_offset) {
-               dev_err(cfg->iommu_dev, "Cannot accommodate DMA offset for IOMMU page tables\n");
-               return NULL;
-       }
-
        data = kmalloc(sizeof(*data), GFP_KERNEL);
        if (!data)
                return NULL;