diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2011-11-10 11:32:28 +0200 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-11-10 11:40:37 +0100 |
commit | 83427275546a6e36076d4f1a0545335b1bb2afc2 (patch) | |
tree | 8f65c27cb919b5fa38b6731b340df55bcd1cb6bf /drivers/iommu/msm_iommu.c | |
parent | 66bc8cf3b1f70227a7847c88c24a36b4886bb3c3 (diff) | |
download | linux-stable-83427275546a6e36076d4f1a0545335b1bb2afc2.tar.gz linux-stable-83427275546a6e36076d4f1a0545335b1bb2afc2.tar.bz2 linux-stable-83427275546a6e36076d4f1a0545335b1bb2afc2.zip |
iommu/msm: announce supported page sizes
Let the IOMMU core know we support 4KiB, 64KiB, 1MiB and 16MiB page sizes.
This way the IOMMU core can split any arbitrary-sized physically
contiguous regions (that it needs to map) as needed.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu/msm_iommu.c')
-rw-r--r-- | drivers/iommu/msm_iommu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 13718d958da8..08a90b88e40d 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -42,6 +42,9 @@ __asm__ __volatile__ ( \ #define RCP15_PRRR(reg) MRC(reg, p15, 0, c10, c2, 0) #define RCP15_NMRR(reg) MRC(reg, p15, 0, c10, c2, 1) +/* bitmap of the page sizes currently supported */ +#define MSM_IOMMU_PGSIZES (SZ_4K | SZ_64K | SZ_1M | SZ_16M) + static int msm_iommu_tex_class[4]; DEFINE_SPINLOCK(msm_iommu_lock); @@ -679,7 +682,8 @@ static struct iommu_ops msm_iommu_ops = { .map = msm_iommu_map, .unmap = msm_iommu_unmap, .iova_to_phys = msm_iommu_iova_to_phys, - .domain_has_cap = msm_iommu_domain_has_cap + .domain_has_cap = msm_iommu_domain_has_cap, + .pgsize_bitmap = MSM_IOMMU_PGSIZES, }; static int __init get_tex_class(int icp, int ocp, int mt, int nos) |