Misc fixes found while working with iovmm module. They are
needed in order to tidspbridge can work properly along with
iovmm module.
Version 7:
* Change 4/4 patch base on Felipe Contreras comments about
having start/end in platform data and struct iommu.
Version 6:
* Rebase on Russell King branch.
- for details see:
http://marc.info/?l=linux-omap&m=129228495723001&w=2
Version 5:
* Changes in "iommu: create new api to set valid da range"
- Change range variables to platform data structure.
Version 4:
* Changes in "iommu: create new api to set valid da range"
- Validate range for fixed address.
- Change way of change boundaries to avoid possible overflow
instead of style :
start + bytes >= end which start + end can overflow
use style:
end - start < bytes
Version 3:
* change patch 2 base on Felipe Contreras' comments,
now it uses min_t and I deleted some blank lines.
* patch "create new api to set valid da range" is base on
"iovmm: IVA2 MMU range is from 0x11000000 to 0xFFFFFFFF"
patch and on Hiroshi's comments and now it is added to
this set.
Version 2:
* Removed "iovmm: fixes for iovmm module" that patch was already
sent.
* Modified "iovmm: fix roundup for next area and end check for the
last area" patch, base on Davin Cohen's comments and rename it
to a proper name that describes what it is doing now.
Guzman Lugo, Fernando (4):
omap: iovmm - no gap checking for fixed address
omap: iovmm - add superpages support to fixed da address
omap: iovmm - replace __iounmap with iounmap
omap: iommu - create new api to set valid da range
arch/arm/mach-omap2/omap-iommu.c | 8 +++
arch/arm/plat-omap/include/plat/iommu.h | 5 ++
arch/arm/plat-omap/iommu.c | 24 +++++++++
arch/arm/plat-omap/iovmm.c | 81 +++++++++++++++++-------------
4 files changed, 83 insertions(+), 35 deletions(-)
From: Guzman Lugo, Fernando <[email protected]>
This patch adds superpages support to fixed ad address
inside iommu_kmap function.
Signed-off-by: Fernando Guzman Lugo <[email protected]>
Acked-by: Hiroshi DOYU <[email protected]>
---
arch/arm/plat-omap/iovmm.c | 62 +++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index 34f0012..93a34d9 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -87,35 +87,43 @@ static size_t sgtable_len(const struct sg_table *sgt)
}
#define sgtable_ok(x) (!!sgtable_len(x))
+static unsigned max_alignment(u32 addr)
+{
+ int i;
+ unsigned pagesize[] = { SZ_16M, SZ_1M, SZ_64K, SZ_4K, };
+ for (i = 0; i < ARRAY_SIZE(pagesize) && addr & (pagesize[i] - 1); i++)
+ ;
+ return (i < ARRAY_SIZE(pagesize)) ? pagesize[i] : 0;
+}
+
/*
* calculate the optimal number sg elements from total bytes based on
* iommu superpages
*/
-static unsigned int sgtable_nents(size_t bytes)
+static unsigned sgtable_nents(size_t bytes, u32 da, u32 pa)
{
- int i;
- unsigned int nr_entries;
- const unsigned long pagesize[] = { SZ_16M, SZ_1M, SZ_64K, SZ_4K, };
+ unsigned nr_entries = 0, ent_sz;
if (!IS_ALIGNED(bytes, PAGE_SIZE)) {
pr_err("%s: wrong size %08x\n", __func__, bytes);
return 0;
}
- nr_entries = 0;
- for (i = 0; i < ARRAY_SIZE(pagesize); i++) {
- if (bytes >= pagesize[i]) {
- nr_entries += (bytes / pagesize[i]);
- bytes %= pagesize[i];
- }
+ while (bytes) {
+ ent_sz = max_alignment(da | pa);
+ ent_sz = min_t(unsigned, ent_sz, iopgsz_max(bytes));
+ nr_entries++;
+ da += ent_sz;
+ pa += ent_sz;
+ bytes -= ent_sz;
}
- BUG_ON(bytes);
return nr_entries;
}
/* allocate and initialize sg_table header(a kind of 'superblock') */
-static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags)
+static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags,
+ u32 da, u32 pa)
{
unsigned int nr_entries;
int err;
@@ -127,9 +135,8 @@ static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags)
if (!IS_ALIGNED(bytes, PAGE_SIZE))
return ERR_PTR(-EINVAL);
- /* FIXME: IOVMF_DA_FIXED should support 'superpages' */
- if ((flags & IOVMF_LINEAR) && (flags & IOVMF_DA_ANON)) {
- nr_entries = sgtable_nents(bytes);
+ if (flags & IOVMF_LINEAR) {
+ nr_entries = sgtable_nents(bytes, da, pa);
if (!nr_entries)
return ERR_PTR(-EINVAL);
} else
@@ -409,7 +416,8 @@ static inline void sgtable_drain_vmalloc(struct sg_table *sgt)
BUG_ON(!sgt);
}
-static void sgtable_fill_kmalloc(struct sg_table *sgt, u32 pa, size_t len)
+static void sgtable_fill_kmalloc(struct sg_table *sgt, u32 pa, u32 da,
+ size_t len)
{
unsigned int i;
struct scatterlist *sg;
@@ -418,9 +426,10 @@ static void sgtable_fill_kmalloc(struct sg_table *sgt, u32 pa, size_t len)
va = phys_to_virt(pa);
for_each_sg(sgt->sgl, sg, sgt->nents, i) {
- size_t bytes;
+ unsigned bytes;
- bytes = iopgsz_max(len);
+ bytes = max_alignment(da | pa);
+ bytes = min_t(unsigned, bytes, iopgsz_max(len));
BUG_ON(!iopgsz_ok(bytes));
@@ -429,6 +438,7 @@ static void sgtable_fill_kmalloc(struct sg_table *sgt, u32 pa, size_t len)
* 'pa' is cotinuous(linear).
*/
pa += bytes;
+ da += bytes;
len -= bytes;
}
BUG_ON(len);
@@ -695,18 +705,18 @@ u32 iommu_vmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags)
if (!va)
return -ENOMEM;
- sgt = sgtable_alloc(bytes, flags);
+ flags &= IOVMF_HW_MASK;
+ flags |= IOVMF_DISCONT;
+ flags |= IOVMF_ALLOC;
+ flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON);
+
+ sgt = sgtable_alloc(bytes, flags, da, 0);
if (IS_ERR(sgt)) {
da = PTR_ERR(sgt);
goto err_sgt_alloc;
}
sgtable_fill_vmalloc(sgt, va);
- flags &= IOVMF_HW_MASK;
- flags |= IOVMF_DISCONT;
- flags |= IOVMF_ALLOC;
- flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON);
-
da = __iommu_vmap(obj, da, sgt, va, bytes, flags);
if (IS_ERR_VALUE(da))
goto err_iommu_vmap;
@@ -746,11 +756,11 @@ static u32 __iommu_kmap(struct iommu *obj, u32 da, u32 pa, void *va,
{
struct sg_table *sgt;
- sgt = sgtable_alloc(bytes, flags);
+ sgt = sgtable_alloc(bytes, flags, da, pa);
if (IS_ERR(sgt))
return PTR_ERR(sgt);
- sgtable_fill_kmalloc(sgt, pa, bytes);
+ sgtable_fill_kmalloc(sgt, pa, da, bytes);
da = map_iommu_region(obj, da, sgt, va, bytes, flags);
if (IS_ERR_VALUE(da)) {
--
1.7.0.4
From: Guzman Lugo, Fernando <[email protected]>
Some IOMMUs cannot use the whole 0x0 - 0xFFFFFFFF range.
With this new API the valid range can be set.
Signed-off-by: Fernando Guzman Lugo <[email protected]>
Acked-by: Hiroshi DOYU <[email protected]>
---
arch/arm/mach-omap2/omap-iommu.c | 8 ++++++++
arch/arm/plat-omap/include/plat/iommu.h | 5 +++++
arch/arm/plat-omap/iommu.c | 24 ++++++++++++++++++++++++
arch/arm/plat-omap/iovmm.c | 15 ++++++++-------
4 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index f5a1aad..6be548c 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -33,6 +33,8 @@ static struct iommu_device omap3_devices[] = {
.name = "isp",
.nr_tlb_entries = 8,
.clk_name = "cam_ick",
+ .da_start = 0x0,
+ .da_end = 0xFFFFF000,
},
},
#if defined(CONFIG_MPU_BRIDGE_IOMMU)
@@ -43,6 +45,8 @@ static struct iommu_device omap3_devices[] = {
.name = "iva2",
.nr_tlb_entries = 32,
.clk_name = "iva2_ck",
+ .da_start = 0x11000000,
+ .da_end = 0xFFFFF000,
},
},
#endif
@@ -64,6 +68,8 @@ static struct iommu_device omap4_devices[] = {
.name = "ducati",
.nr_tlb_entries = 32,
.clk_name = "ducati_ick",
+ .da_start = 0x0,
+ .da_end = 0xFFFFF000,
},
},
#if defined(CONFIG_MPU_TESLA_IOMMU)
@@ -74,6 +80,8 @@ static struct iommu_device omap4_devices[] = {
.name = "tesla",
.nr_tlb_entries = 32,
.clk_name = "tesla_ick",
+ .da_start = 0x0,
+ .da_end = 0xFFFFF000,
},
},
#endif
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
index 33c7d41..69230d6 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -50,6 +50,8 @@ struct iommu {
int (*isr)(struct iommu *obj);
void *ctx; /* iommu context: registres saved area */
+ u32 da_start;
+ u32 da_end;
};
struct cr_regs {
@@ -103,6 +105,8 @@ struct iommu_platform_data {
const char *name;
const char *clk_name;
const int nr_tlb_entries;
+ u32 da_start;
+ u32 da_end;
};
#if defined(CONFIG_ARCH_OMAP1)
@@ -152,6 +156,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..b1107c0 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -830,6 +830,28 @@ 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
**/
@@ -922,6 +944,8 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev)
obj->name = pdata->name;
obj->dev = &pdev->dev;
obj->ctx = (void *)obj + sizeof(*obj);
+ obj->da_start = pdata->da_start;
+ obj->da_end = pdata->da_end;
mutex_init(&obj->iommu_lock);
mutex_init(&obj->mmap_lock);
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index fa6e643..6dc1296 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -280,13 +280,14 @@ 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);
+ } else if (start < obj->da_start || start > obj->da_end ||
+ obj->da_end - start < bytes) {
+ return ERR_PTR(-EINVAL);
}
tmp = NULL;
@@ -299,16 +300,16 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
if (prev_end > start)
break;
- if (start + bytes <= tmp->da_start)
+ if (tmp->da_start > start && (tmp->da_start - start) >= bytes)
goto found;
- if (flags & IOVMF_DA_ANON)
+ if (tmp->da_end >= start && flags & IOVMF_DA_ANON)
start = roundup(tmp->da_end + 1, alignement);
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.7.0.4
From: Guzman Lugo, Fernando <[email protected]>
__iounmap function is wrong for OMAP architecture,
instead use iounmap which will call to the correct function.
Signed-off-by: Fernando Guzman Lugo <[email protected]>
Acked-by: Hiroshi DOYU <[email protected]>
---
arch/arm/plat-omap/iovmm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index 93a34d9..fa6e643 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -821,7 +821,7 @@ void iommu_kunmap(struct iommu *obj, u32 da)
struct sg_table *sgt;
typedef void (*func_t)(const void *);
- sgt = unmap_vm_area(obj, da, (func_t)__iounmap,
+ sgt = unmap_vm_area(obj, da, (func_t)iounmap,
IOVMF_LINEAR | IOVMF_MMIO);
if (!sgt)
dev_dbg(obj->dev, "%s: No sgt\n", __func__);
--
1.7.0.4
From: Guzman Lugo, Fernando <[email protected]>
If some fixed da address is wanted to be mapped and the page
is freed but it is used as gap, the mapping will fail.
This patch is fixing that and olny keeps the gap for
not fixed address.
Signed-off-by: Fernando Guzman Lugo <[email protected]>
Acked-by: Hiroshi DOYU <[email protected]>
---
arch/arm/plat-omap/iovmm.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index 8ce0de2..34f0012 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -289,10 +289,10 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
prev_end = 0;
list_for_each_entry(tmp, &obj->mmap, list) {
- if (prev_end >= start)
+ if (prev_end > start)
break;
- if (start + bytes < tmp->da_start)
+ if (start + bytes <= tmp->da_start)
goto found;
if (flags & IOVMF_DA_ANON)
@@ -301,7 +301,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 >= bytes))
+ if ((start >= prev_end) && (ULONG_MAX - start + 1 >= bytes))
goto found;
dev_dbg(obj->dev, "%s: no space to fit %08x(%x) flags: %08x\n",
--
1.7.0.4
Fernando,
For omap patches, follow the convention
OMAP: iommu: <subject>
OMAP: iovmm: <subject>
Ref: http://www.spinics.net/lists/linux-omap/msg39956.html
On Tue, Dec 14, 2010 at 6:53 PM, Fernando Guzman Lugo
<[email protected]> wrote:
> Misc fixes found while working with iovmm module. They are
> needed in order to tidspbridge can work properly along with
> iovmm module.
>
> Version 7:
> * Change 4/4 patch base on Felipe Contreras comments about
> ?having start/end in platform data and struct iommu.
>
> Version 6:
> * Rebase on Russell King branch.
> ?- for details see:
> ?http://marc.info/?l=linux-omap&m=129228495723001&w=2
>
> Version 5:
> * Changes in "iommu: create new api to set valid da range"
> ?- Change range variables to platform data structure.
>
> Version 4:
> * Changes in "iommu: create new api to set valid da range"
> ?- Validate range for fixed address.
> ?- Change way of change boundaries to avoid possible overflow
> ?instead of style :
> ? ? start + bytes >= end ? ? which start + end can overflow
> ?use style:
> ? ? end - start < bytes
>
> Version 3:
> * change patch 2 base on Felipe Contreras' comments,
> ?now it uses min_t and I deleted some blank lines.
> * patch "create new api to set valid da range" is base on
> ?"iovmm: IVA2 MMU range is from 0x11000000 to 0xFFFFFFFF"
> ?patch and on Hiroshi's comments and now it is added to
> ?this set.
>
> Version 2:
> * Removed "iovmm: fixes for iovmm module" that patch was already
> ?sent.
> * Modified "iovmm: fix roundup for next area and end check for the
> ?last area" patch, base on Davin Cohen's comments and rename it
> ?to a proper name that describes what it is doing now.
>
>
> Guzman Lugo, Fernando (4):
> ?omap: iovmm - no gap checking for fixed address
> ?omap: iovmm - add superpages support to fixed da address
> ?omap: iovmm - replace __iounmap with iounmap
> ?omap: iommu - create new api to set valid da range
>
> ?arch/arm/mach-omap2/omap-iommu.c ? ? ? ?| ? ?8 +++
> ?arch/arm/plat-omap/include/plat/iommu.h | ? ?5 ++
> ?arch/arm/plat-omap/iommu.c ? ? ? ? ? ? ?| ? 24 +++++++++
> ?arch/arm/plat-omap/iovmm.c ? ? ? ? ? ? ?| ? 81 +++++++++++++++++-------------
> ?4 files changed, 83 insertions(+), 35 deletions(-)
>
>
--
Thank you,
Best regards,
Hari Kanigeri
On Tue, Dec 14, 2010 at 7:54 PM, Kanigeri, Hari <[email protected]> wrote:
> Fernando,
>
> For omap patches, follow the convention
>
> OMAP: iommu: <subject>
> OMAP: iovmm: <subject>
>
> Ref: http://www.spinics.net/lists/linux-omap/msg39956.html
Ok, I will take in account that for next paches.
Thanks,
Fernando.
>
>
> On Tue, Dec 14, 2010 at 6:53 PM, Fernando Guzman Lugo
> <[email protected]> wrote:
>> Misc fixes found while working with iovmm module. They are
>> needed in order to tidspbridge can work properly along with
>> iovmm module.
>>
>> Version 7:
>> * Change 4/4 patch base on Felipe Contreras comments about
>> ?having start/end in platform data and struct iommu.
>>
>> Version 6:
>> * Rebase on Russell King branch.
>> ?- for details see:
>> ?http://marc.info/?l=linux-omap&m=129228495723001&w=2
>>
>> Version 5:
>> * Changes in "iommu: create new api to set valid da range"
>> ?- Change range variables to platform data structure.
>>
>> Version 4:
>> * Changes in "iommu: create new api to set valid da range"
>> ?- Validate range for fixed address.
>> ?- Change way of change boundaries to avoid possible overflow
>> ?instead of style :
>> ? ? start + bytes >= end ? ? which start + end can overflow
>> ?use style:
>> ? ? end - start < bytes
>>
>> Version 3:
>> * change patch 2 base on Felipe Contreras' comments,
>> ?now it uses min_t and I deleted some blank lines.
>> * patch "create new api to set valid da range" is base on
>> ?"iovmm: IVA2 MMU range is from 0x11000000 to 0xFFFFFFFF"
>> ?patch and on Hiroshi's comments and now it is added to
>> ?this set.
>>
>> Version 2:
>> * Removed "iovmm: fixes for iovmm module" that patch was already
>> ?sent.
>> * Modified "iovmm: fix roundup for next area and end check for the
>> ?last area" patch, base on Davin Cohen's comments and rename it
>> ?to a proper name that describes what it is doing now.
>>
>>
>> Guzman Lugo, Fernando (4):
>> ?omap: iovmm - no gap checking for fixed address
>> ?omap: iovmm - add superpages support to fixed da address
>> ?omap: iovmm - replace __iounmap with iounmap
>> ?omap: iommu - create new api to set valid da range
>>
>> ?arch/arm/mach-omap2/omap-iommu.c ? ? ? ?| ? ?8 +++
>> ?arch/arm/plat-omap/include/plat/iommu.h | ? ?5 ++
>> ?arch/arm/plat-omap/iommu.c ? ? ? ? ? ? ?| ? 24 +++++++++
>> ?arch/arm/plat-omap/iovmm.c ? ? ? ? ? ? ?| ? 81 +++++++++++++++++-------------
>> ?4 files changed, 83 insertions(+), 35 deletions(-)
>>
>>
>
>
>
> --
> Thank you,
> Best regards,
> Hari Kanigeri
>