Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 433c434a authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel
Browse files

iommu/omap: Use WARN_ON for page table alignment check 



The OMAP IOMMU page table needs to be aligned on a 16K boundary,
and the current code uses a BUG_ON on the alignment sanity check
in the .domain_alloc() ops implementation. Replace this with a
less severe WARN_ON and bail out gracefully.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 7c1ab600

drivers/iommu/omap-iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,8 @@ static struct iommu_domain *omap_iommu_domain_alloc(unsigned type) 
	 * should never fail, but please keep this around to ensure

	 * we keep the hardware happy

	 */

	BUG_ON(!IS_ALIGNED((long)omap_domain->pgtable, IOPGD_TABLE_SIZE));

	if (WARN_ON(!IS_ALIGNED((long)omap_domain->pgtable, IOPGD_TABLE_SIZE)))

		goto fail_align;



	clean_dcache_area(omap_domain->pgtable, IOPGD_TABLE_SIZE);

	spin_lock_init(&omap_domain->lock);
@@ -1173,6 +1174,8 @@ static struct iommu_domain *omap_iommu_domain_alloc(unsigned type) 


	return &omap_domain->domain;



fail_align:

	kfree(omap_domain->pgtable);

fail_nomem:

	kfree(omap_domain);

out: