]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Revert "iommu/io-pgtable-arm: Check for v7s-incapable systems"
authorYong Wu <yong.wu@mediatek.com>
Thu, 13 Dec 2018 09:19:48 +0000 (17:19 +0800)
committerJoerg Roedel <jroedel@suse.de>
Mon, 17 Dec 2018 09:19:10 +0000 (10:19 +0100)
This reverts commit 82db33dc5e49fb625262d81125625d07a0d6184e.

After the commit 29859aeb8a6e ("iommu/io-pgtable-arm-v7s: Abort
allocation when table address overflows the PTE"), v7s will return fail
if the page table allocation isn't expected. this PHYS_OFFSET check
is unnecessary now.

And this check may lead to fail. For example, If CONFIG_RANDOMIZE_BASE
is enabled, the "memstart_addr" will be updated randomly, then the
PHYS_OFFSET may be random.

Reported-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/io-pgtable-arm-v7s.c

index 445c3bde04800c49cec0a2d47083e968b51e6fba..cec29bf45c9bd79d38e4f6c7e97052ca9363255f 100644 (file)
@@ -709,10 +709,6 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 {
        struct arm_v7s_io_pgtable *data;
 
-#ifdef PHYS_OFFSET
-       if (upper_32_bits(PHYS_OFFSET))
-               return NULL;
-#endif
        if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS)
                return NULL;