diff options
author | Varun Sethi <Varun.Sethi@freescale.com> | 2013-03-28 15:53:58 -0400 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2013-04-02 12:20:53 -0400 |
commit | bb5547acfcd842950b8a22aa83f84af93388b9f2 (patch) | |
tree | 6b44ae74b7c3cd0dee3f0f6a5b1597007c1e3a0d /include/linux/iommu.h | |
parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) |
iommu/fsl: Make iova dma_addr_t in the iommu_iova_to_phys API.
This is required in case of PAMU, as it can support a window size of up
to 64G (even on 32bit).
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'include/linux/iommu.h')
-rw-r--r-- | include/linux/iommu.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ba3b8a98a049..bb0a0fc26729 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h | |||
@@ -91,8 +91,7 @@ struct iommu_ops { | |||
91 | phys_addr_t paddr, size_t size, int prot); | 91 | phys_addr_t paddr, size_t size, int prot); |
92 | size_t (*unmap)(struct iommu_domain *domain, unsigned long iova, | 92 | size_t (*unmap)(struct iommu_domain *domain, unsigned long iova, |
93 | size_t size); | 93 | size_t size); |
94 | phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, | 94 | phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova); |
95 | unsigned long iova); | ||
96 | int (*domain_has_cap)(struct iommu_domain *domain, | 95 | int (*domain_has_cap)(struct iommu_domain *domain, |
97 | unsigned long cap); | 96 | unsigned long cap); |
98 | int (*add_device)(struct device *dev); | 97 | int (*add_device)(struct device *dev); |
@@ -134,8 +133,7 @@ extern int iommu_map(struct iommu_domain *domain, unsigned long iova, | |||
134 | phys_addr_t paddr, size_t size, int prot); | 133 | phys_addr_t paddr, size_t size, int prot); |
135 | extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, | 134 | extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, |
136 | size_t size); | 135 | size_t size); |
137 | extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, | 136 | extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova); |
138 | unsigned long iova); | ||
139 | extern int iommu_domain_has_cap(struct iommu_domain *domain, | 137 | extern int iommu_domain_has_cap(struct iommu_domain *domain, |
140 | unsigned long cap); | 138 | unsigned long cap); |
141 | extern void iommu_set_fault_handler(struct iommu_domain *domain, | 139 | extern void iommu_set_fault_handler(struct iommu_domain *domain, |
@@ -267,8 +265,7 @@ static inline void iommu_domain_window_disable(struct iommu_domain *domain, | |||
267 | { | 265 | { |
268 | } | 266 | } |
269 | 267 | ||
270 | static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, | 268 | static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) |
271 | unsigned long iova) | ||
272 | { | 269 | { |
273 | return 0; | 270 | return 0; |
274 | } | 271 | } |