aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu/iommu.c
diff options
context:
space:
mode:
authorVarun Sethi <Varun.Sethi@freescale.com>2013-03-28 15:54:00 -0400
committerJoerg Roedel <joro@8bytes.org>2013-04-02 12:20:53 -0400
commit80f97f0f73b82444f714651ea053838d27779dca (patch)
treedeb4213285b1014b2800e5828db564cb3820f535 /drivers/iommu/iommu.c
parentbb5547acfcd842950b8a22aa83f84af93388b9f2 (diff)
iommu/fsl: Add the window permission flag as a parameter to iommu_window_enable API.
Each iommu window can have access permissions associated with it. Extended the window_enable API to incorporate window access permissions. In case of PAMU each window can have its specific set of permissions. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu/iommu.c')
-rw-r--r--drivers/iommu/iommu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f730ed9d8af9..1d72b4f5b006 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -853,12 +853,13 @@ EXPORT_SYMBOL_GPL(iommu_unmap);
853 853
854 854
855int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr, 855int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
856 phys_addr_t paddr, u64 size) 856 phys_addr_t paddr, u64 size, int prot)
857{ 857{
858 if (unlikely(domain->ops->domain_window_enable == NULL)) 858 if (unlikely(domain->ops->domain_window_enable == NULL))
859 return -ENODEV; 859 return -ENODEV;
860 860
861 return domain->ops->domain_window_enable(domain, wnd_nr, paddr, size); 861 return domain->ops->domain_window_enable(domain, wnd_nr, paddr, size,
862 prot);
862} 863}
863EXPORT_SYMBOL_GPL(iommu_domain_window_enable); 864EXPORT_SYMBOL_GPL(iommu_domain_window_enable);
864 865