Some IOMMUs cannot use the whole 0x0 - 0xFFFFFFFF rage. With this new API the valid range can be set.
Signed-off-by: Fernando Guzman Lugo <[email protected]> --- arch/arm/plat-omap/include/plat/iommu.h | 3 +++ arch/arm/plat-omap/iommu.c | 29 +++++++++++++++++++++++++++++ arch/arm/plat-omap/iovmm.c | 8 +++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h index 33c7d41..aea01b1 100644 --- a/arch/arm/plat-omap/include/plat/iommu.h +++ b/arch/arm/plat-omap/include/plat/iommu.h @@ -46,6 +46,8 @@ struct iommu { struct list_head mmap; struct mutex mmap_lock; /* protect mmap */ + u32 da_start; + u32 da_end; int (*isr)(struct iommu *obj); @@ -152,6 +154,7 @@ extern void flush_iotlb_all(struct iommu *obj); extern int iopgtable_store_entry(struct iommu *obj, struct iotlb_entry *e); extern size_t iopgtable_clear_entry(struct iommu *obj, u32 iova); +extern int iommu_set_da_range(struct iommu *obj, u32 start, u32 end); extern struct iommu *iommu_get(const char *name); extern void iommu_put(struct iommu *obj); diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index 6cd151b..e70e76b 100644 --- a/arch/arm/plat-omap/iommu.c +++ b/arch/arm/plat-omap/iommu.c @@ -25,6 +25,12 @@ #include "iopgtable.h" +/* Reserve the first page for NULL */ +#define IOMMU_DEFAULT_DA_START PAGE_SIZE +/* 0xFFFFFFFF not allowed because it is not page aligned */ +#define IOMMU_DEFAULT_DA_END 0xFFFFF000; + + #define for_each_iotlb_cr(obj, n, __i, cr) \ for (__i = 0; \ (__i < (n)) && (cr = __iotlb_read_cr((obj), __i), true); \ @@ -830,6 +836,27 @@ static int device_match_by_alias(struct device *dev, void *data) } /** + * iommu_set_da_range - Set a valid device address range + * @obj: target iommu + * @start Start of valid range + * @end End of valid range + **/ +int iommu_set_da_range(struct iommu *obj, u32 start, u32 end) +{ + if (!obj) + return -EFAULT; + + if (end < start || !PAGE_ALIGN(start | end)) + return -EINVAL; + + obj->da_start = start; + obj->da_end = end; + + return 0; +} +EXPORT_SYMBOL_GPL(iommu_set_da_range); + +/** * iommu_get - Get iommu handler * @name: target iommu name **/ @@ -853,6 +880,8 @@ struct iommu *iommu_get(const char *name) if (err) goto err_enable; flush_iotlb_all(obj); + obj->da_start = IOMMU_DEFAULT_DA_START; + obj->da_end = IOMMU_DEFAULT_DA_END; } if (!try_module_get(obj->owner)) diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 5489ca9..bb45780 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -280,10 +280,8 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, alignement = PAGE_SIZE; if (flags & IOVMF_DA_ANON) { - /* - * Reserve the first page for NULL - */ - start = PAGE_SIZE; + start = obj->da_start; + if (flags & IOVMF_LINEAR) alignement = iopgsz_max(bytes); start = roundup(start, alignement); @@ -308,7 +306,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, prev_end = tmp->da_end; } - if ((start >= prev_end) && (ULONG_MAX - start + 1 >= bytes)) + if ((start >= prev_end) && (obj->da_end - start >= bytes)) goto found; dev_dbg(obj->dev, "%s: no space to fit %08x(%x) flags: %08x\n", -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
