* [PATCHv3 0/4] iovmm: fixes for iovmm module @ 2010-10-14 2:27 Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 1/4] iovmm: no gap checking for fixed address Fernando Guzman Lugo 0 siblings, 1 reply; 9+ messages in thread From: Fernando Guzman Lugo @ 2010-10-14 2:27 UTC (permalink / raw) To: Hiroshi.DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap, Fernando Guzman Lugo 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. Fernando Guzman Lugo (4): iovmm: no gap checking for fixed address iovmm: add superpages support to fixed da address iovmm: replace __iounmap with omap_iounmap iommu: create new api to set valid da range arch/arm/plat-omap/include/plat/iommu.h | 3 + arch/arm/plat-omap/iommu.c | 29 ++++++++++++ arch/arm/plat-omap/iovmm.c | 74 +++++++++++++++++-------------- 3 files changed, 73 insertions(+), 33 deletions(-) ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] iovmm: no gap checking for fixed address 2010-10-14 2:27 [PATCHv3 0/4] iovmm: fixes for iovmm module Fernando Guzman Lugo @ 2010-10-14 2:27 ` Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 2/4] iovmm: add superpages support to fixed da address Fernando Guzman Lugo 0 siblings, 1 reply; 9+ messages in thread From: Fernando Guzman Lugo @ 2010-10-14 2:27 UTC (permalink / raw) To: Hiroshi.DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap, Fernando Guzman Lugo 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 <x0095840@ti.com> --- arch/arm/plat-omap/iovmm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 24ca9c4..34f0012 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -289,7 +289,7 @@ 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) @@ -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.6.3.3 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] iovmm: add superpages support to fixed da address 2010-10-14 2:27 ` [PATCH 1/4] iovmm: no gap checking for fixed address Fernando Guzman Lugo @ 2010-10-14 2:27 ` Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Fernando Guzman Lugo 0 siblings, 1 reply; 9+ messages in thread From: Fernando Guzman Lugo @ 2010-10-14 2:27 UTC (permalink / raw) To: Hiroshi.DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap, Fernando Guzman Lugo This patch adds superpages support to fixed ad address inside iommu_kmap function. Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> --- 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.6.3.3 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap 2010-10-14 2:27 ` [PATCH 2/4] iovmm: add superpages support to fixed da address Fernando Guzman Lugo @ 2010-10-14 2:27 ` Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 4/4] iommu: create new api to set valid da range Fernando Guzman Lugo 2010-10-14 6:45 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Hiroshi DOYU 0 siblings, 2 replies; 9+ messages in thread From: Fernando Guzman Lugo @ 2010-10-14 2:27 UTC (permalink / raw) To: Hiroshi.DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap, Fernando Guzman Lugo Omap platform is omap_iounmap function. Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> --- 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..5489ca9 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)omap_iounmap, IOVMF_LINEAR | IOVMF_MMIO); if (!sgt) dev_dbg(obj->dev, "%s: No sgt\n", __func__); -- 1.6.3.3 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] iommu: create new api to set valid da range 2010-10-14 2:27 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Fernando Guzman Lugo @ 2010-10-14 2:27 ` Fernando Guzman Lugo 2010-10-14 6:45 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Hiroshi DOYU 1 sibling, 0 replies; 9+ messages in thread From: Fernando Guzman Lugo @ 2010-10-14 2:27 UTC (permalink / raw) To: Hiroshi.DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap, Fernando Guzman Lugo 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 <x0095840@ti.com> --- 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap 2010-10-14 2:27 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 4/4] iommu: create new api to set valid da range Fernando Guzman Lugo @ 2010-10-14 6:45 ` Hiroshi DOYU 2010-10-14 8:18 ` Guzman Lugo, Fernando 1 sibling, 1 reply; 9+ messages in thread From: Hiroshi DOYU @ 2010-10-14 6:45 UTC (permalink / raw) To: x0095840 Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap Hi Fernando, From: ext Fernando Guzman Lugo <x0095840@ti.com> Subject: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Date: Thu, 14 Oct 2010 04:27:36 +0200 > Omap platform is omap_iounmap function. > > Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> > --- > 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..5489ca9 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, Woundn't the above be enough? Eventually this "iounmap()" calls "__arch_iounmap()" -> "omap_iounmap()". I don't see any special reason to call "omap_iounmap()" here for now. > + sgt = unmap_vm_area(obj, da, (func_t)omap_iounmap, > IOVMF_LINEAR | IOVMF_MMIO); > if (!sgt) > dev_dbg(obj->dev, "%s: No sgt\n", __func__); > -- > 1.6.3.3 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap 2010-10-14 6:45 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Hiroshi DOYU @ 2010-10-14 8:18 ` Guzman Lugo, Fernando 2010-10-14 9:47 ` Hiroshi DOYU 0 siblings, 1 reply; 9+ messages in thread From: Guzman Lugo, Fernando @ 2010-10-14 8:18 UTC (permalink / raw) To: Hiroshi DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap > ________________________________________ > From: Hiroshi DOYU [Hiroshi.DOYU@nokia.com] > Sent: Thursday, October 14, 2010 1:45 AM > To: Guzman Lugo, Fernando > Cc: felipe.contreras@nokia.com; tony@atomide.com; > linux-kernel@vger.kernel.org; andy.shevchenko@gmail.com; linux-omap@vger.kernel.org > Subject: Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > > Hi Fernando, > > From: ext Fernando Guzman Lugo <x0095840@ti.com> > Subject: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > Date: Thu, 14 Oct 2010 04:27:36 +0200 > > > Omap platform is omap_iounmap function. > > > > Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> > > --- > > 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..5489ca9 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, > > Woundn't the above be enough? > > Eventually this "iounmap()" calls "__arch_iounmap()" -> > "omap_iounmap()". I don't see any special reason to call > "omap_iounmap()" here for now. iounmap and __arch_iounmap are macros they cannot not be used there. If so, it gives a "undeclared" compile error. Regards, Fernando. > > > > + sgt = unmap_vm_area(obj, da, (func_t)omap_iounmap, > > IOVMF_LINEAR | IOVMF_MMIO); > > if (!sgt) > > dev_dbg(obj->dev, "%s: No sgt\n", __func__); > > -- > > 1.6.3.3 > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap 2010-10-14 8:18 ` Guzman Lugo, Fernando @ 2010-10-14 9:47 ` Hiroshi DOYU 2010-10-14 16:11 ` Guzman Lugo, Fernando 0 siblings, 1 reply; 9+ messages in thread From: Hiroshi DOYU @ 2010-10-14 9:47 UTC (permalink / raw) To: fernando.lugo Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap From: "ext Guzman Lugo, Fernando" <fernando.lugo@ti.com> Subject: RE: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Date: Thu, 14 Oct 2010 10:18:30 +0200 > >> ________________________________________ >> From: Hiroshi DOYU [Hiroshi.DOYU@nokia.com] >> Sent: Thursday, October 14, 2010 1:45 AM >> To: Guzman Lugo, Fernando >> Cc: felipe.contreras@nokia.com; tony@atomide.com; >> linux-kernel@vger.kernel.org; andy.shevchenko@gmail.com; linux-omap@vger.kernel.org >> Subject: Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap >> >> Hi Fernando, >> >> From: ext Fernando Guzman Lugo <x0095840@ti.com> >> Subject: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap >> Date: Thu, 14 Oct 2010 04:27:36 +0200 >> >> > Omap platform is omap_iounmap function. >> > >> > Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> >> > --- >> > 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..5489ca9 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, >> >> Woundn't the above be enough? >> >> Eventually this "iounmap()" calls "__arch_iounmap()" -> >> "omap_iounmap()". I don't see any special reason to call >> "omap_iounmap()" here for now. > > iounmap and __arch_iounmap are macros they cannot not > be used there. If so, it gives a "undeclared" compile error. Ok. I'll add this explanation as a note on this commit. ^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap 2010-10-14 9:47 ` Hiroshi DOYU @ 2010-10-14 16:11 ` Guzman Lugo, Fernando 0 siblings, 0 replies; 9+ messages in thread From: Guzman Lugo, Fernando @ 2010-10-14 16:11 UTC (permalink / raw) To: Hiroshi DOYU Cc: felipe.contreras, tony, linux-kernel, andy.shevchenko, linux-omap > -----Original Message----- > From: Hiroshi DOYU [mailto:Hiroshi.DOYU@nokia.com] > Sent: Thursday, October 14, 2010 4:47 AM > To: Guzman Lugo, Fernando > Cc: felipe.contreras@nokia.com; tony@atomide.com; > linux-kernel@vger.kernel.org; andy.shevchenko@gmail.com; > linux-omap@vger.kernel.org > Subject: Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > > From: "ext Guzman Lugo, Fernando" <fernando.lugo@ti.com> > Subject: RE: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > Date: Thu, 14 Oct 2010 10:18:30 +0200 > > > > >> ________________________________________ > >> From: Hiroshi DOYU [Hiroshi.DOYU@nokia.com] > >> Sent: Thursday, October 14, 2010 1:45 AM > >> To: Guzman Lugo, Fernando > >> Cc: felipe.contreras@nokia.com; tony@atomide.com; > >> linux-kernel@vger.kernel.org; andy.shevchenko@gmail.com; > >> linux-omap@vger.kernel.org > >> Subject: Re: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > >> > >> Hi Fernando, > >> > >> From: ext Fernando Guzman Lugo <x0095840@ti.com> > >> Subject: [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap > >> Date: Thu, 14 Oct 2010 04:27:36 +0200 > >> > >> > Omap platform is omap_iounmap function. > >> > > >> > Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> > >> > --- > >> > 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..5489ca9 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, > >> > >> Woundn't the above be enough? > >> > >> Eventually this "iounmap()" calls "__arch_iounmap()" -> > >> "omap_iounmap()". I don't see any special reason to call > >> "omap_iounmap()" here for now. > > > > iounmap and __arch_iounmap are macros they cannot not be > used there. > > If so, it gives a "undeclared" compile error. > > Ok. I'll add this explanation as a note on this commit. > Sure, Thanks. Regards, Fernando. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-10-14 16:11 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-10-14 2:27 [PATCHv3 0/4] iovmm: fixes for iovmm module Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 1/4] iovmm: no gap checking for fixed address Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 2/4] iovmm: add superpages support to fixed da address Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Fernando Guzman Lugo 2010-10-14 2:27 ` [PATCH 4/4] iommu: create new api to set valid da range Fernando Guzman Lugo 2010-10-14 6:45 ` [PATCH 3/4] iovmm: replace __iounmap with omap_iounmap Hiroshi DOYU 2010-10-14 8:18 ` Guzman Lugo, Fernando 2010-10-14 9:47 ` Hiroshi DOYU 2010-10-14 16:11 ` Guzman Lugo, Fernando
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®