diff options
| author |   Yong Wu <yong.wu@mediatek.com> | 2018-12-13 17:19:48 +0800 |
|---|---|---|
| committer |   Joerg Roedel <jroedel@suse.de> | 2018-12-17 10:19:10 +0100 |
| commit | 2713fe37153efb90b7a8427a2f53fa49216faf5c (patch) | |
| tree | 725ab7dd2c8e1918199a231f7fc4a4e14c191733 /drivers/iommu/io-pgtable-arm-v7s.c | |
| parent | Linux 4.20-rc7 (diff) | |
| download | linux-dev-2713fe37153efb90b7a8427a2f53fa49216faf5c.tar.xz linux-dev-2713fe37153efb90b7a8427a2f53fa49216faf5c.zip | |
Revert "iommu/io-pgtable-arm: Check for v7s-incapable systems"
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>
Diffstat (limited to 'drivers/iommu/io-pgtable-arm-v7s.c')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm-v7s.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 445c3bde0480..cec29bf45c9b 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -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; |