|
@@ -192,6 +192,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
|
|
|
{
|
|
|
struct io_pgtable_cfg *cfg = &data->iop.cfg;
|
|
|
struct device *dev = cfg->iommu_dev;
|
|
|
+ phys_addr_t phys;
|
|
|
dma_addr_t dma;
|
|
|
size_t size = ARM_V7S_TABLE_SIZE(lvl);
|
|
|
void *table = NULL;
|
|
@@ -200,6 +201,10 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
|
|
|
table = (void *)__get_dma_pages(__GFP_ZERO, get_order(size));
|
|
|
else if (lvl == 2)
|
|
|
table = kmem_cache_zalloc(data->l2_tables, gfp | GFP_DMA);
|
|
|
+ phys = virt_to_phys(table);
|
|
|
+ if (phys != (arm_v7s_iopte)phys)
|
|
|
+ /* Doesn't fit in PTE */
|
|
|
+ goto out_free;
|
|
|
if (table && !(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) {
|
|
|
dma = dma_map_single(dev, table, size, DMA_TO_DEVICE);
|
|
|
if (dma_mapping_error(dev, dma))
|
|
@@ -209,7 +214,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
|
|
|
* address directly, so if the DMA layer suggests otherwise by
|
|
|
* translating or truncating them, that bodes very badly...
|
|
|
*/
|
|
|
- if (dma != virt_to_phys(table))
|
|
|
+ if (dma != phys)
|
|
|
goto out_unmap;
|
|
|
}
|
|
|
kmemleak_ignore(table);
|