]> git.karo-electronics.de Git - linux-beck.git/commitdiff
iommu/exynos: Pointers are nto physical addresses
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 08:45:59 +0000 (09:45 +0100)
committerJoerg Roedel <jroedel@suse.de>
Mon, 29 Feb 2016 15:44:24 +0000 (16:44 +0100)
The exynos iommu driver changed an incorrect cast from pointer
to 'unsigned int' to an equally incorrect cast to a 'phys_addr_t',
which results in an obvious compile-time error when phys_addr_t
is wider than pointers are:

drivers/iommu/exynos-iommu.c: In function 'alloc_lv2entry':
drivers/iommu/exynos-iommu.c:918:32: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

The code does not actually want the physical address (which would
involve using virt_to_phys()), but just checks the alignment,
so we can change it to use a cast to uintptr_t instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 740a01eee9ad ("iommu/exynos: Add support for v5 SYSMMU")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/exynos-iommu.c

index b0665042bf29526e26db849e40be425653db0c27..484b3b37631f40f7c598a71ba5c3440fa2127b5a 100644 (file)
@@ -915,7 +915,7 @@ static sysmmu_pte_t *alloc_lv2entry(struct exynos_iommu_domain *domain,
                bool need_flush_flpd_cache = lv1ent_zero(sent);
 
                pent = kmem_cache_zalloc(lv2table_kmem_cache, GFP_ATOMIC);
-               BUG_ON((phys_addr_t)pent & (LV2TABLE_SIZE - 1));
+               BUG_ON((uintptr_t)pent & (LV2TABLE_SIZE - 1));
                if (!pent)
                        return ERR_PTR(-ENOMEM);