Re: [PATCH] iommu/omap: Remove virtual memory manager
Hi Suman,
Thank you for the review.
On Thursday 17 July 2014 10:53:03 Suman Anna wrote:
On 07/17/2014 06:09 AM, Laurent Pinchart wrote:
The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
---
Joerg, could you please pick this patch up for v3.17 if possible ?
Need one minor change as below, otherwise patch is good.
drivers/iommu/Kconfig| 10 +-
drivers/iommu/Makefile | 1 -
drivers/iommu/omap-iommu-debug.c | 114 --
drivers/iommu/omap-iommu.c | 2 -
drivers/iommu/omap-iommu.h | 6 +-
drivers/iommu/omap-iovmm.c | 791 --
include/linux/omap-iommu.h | 37 +-
7 files changed, 8 insertions(+), 953 deletions(-)
delete mode 100644 drivers/iommu/omap-iovmm.c
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d260605..a1f0fad 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -143,16 +143,12 @@ config OMAP_IOMMU
depends on ARCH_OMAP2PLUS
select IOMMU_API
-config OMAP_IOVMM
- tristate OMAP IO Virtual Memory Manager Support
- depends on OMAP_IOMMU
-
config OMAP_IOMMU_DEBUG
- tristate Export OMAP IOMMU/IOVMM internals in DebugFS
- depends on OMAP_IOVMM DEBUG_FS
+ tristate Export OMAP IOMMU internals in DebugFS
+ depends on DEBUG_FS
This module is relevant only when OMAP_IOMMU is enabled, so this should
be depends on OMAP_IOMMU DEBUG_FS. The dependency is inherent before
through OMAP_IOVMM. Otherwise, this module can be built by itself and
results in some build errors.
Oops, my bad. I'll fix that in v2.
help
Select this to see extensive information about
- the internal state of OMAP IOMMU/IOVMM in debugfs.
+ the internal state of OMAP IOMMU in debugfs.
Say N unless you know you need this.
[snip]
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index ea920c3..36a85f3 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -46,9 +46,6 @@ struct omap_iommu {
int nr_tlb_entries;
- struct list_headmmap;
- struct mutexmmap_lock; /* protect mmap */
-
void *ctx; /* iommu context: registres saved area */
u32 da_start;
u32 da_end;
With the removal of omap-iovmm, the da_start and da_end can also be
removed. No need to block this patch for that, it can be done in a
separate patch.
I'll remove the fields from struct omap_iommu in v2. I'll also remove them
from the platform data, but I'll need to do so in a separate patch, as arch/
code needs to be touched as well.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] iommu/omap: Remove virtual memory manager
On 07/18/2014 05:50 AM, Laurent Pinchart wrote:
Hi Suman,
Thank you for the review.
On Thursday 17 July 2014 10:53:03 Suman Anna wrote:
On 07/17/2014 06:09 AM, Laurent Pinchart wrote:
The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
---
Joerg, could you please pick this patch up for v3.17 if possible ?
Need one minor change as below, otherwise patch is good.
drivers/iommu/Kconfig| 10 +-
drivers/iommu/Makefile | 1 -
drivers/iommu/omap-iommu-debug.c | 114 --
drivers/iommu/omap-iommu.c | 2 -
drivers/iommu/omap-iommu.h | 6 +-
drivers/iommu/omap-iovmm.c | 791 --
include/linux/omap-iommu.h | 37 +-
7 files changed, 8 insertions(+), 953 deletions(-)
delete mode 100644 drivers/iommu/omap-iovmm.c
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d260605..a1f0fad 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -143,16 +143,12 @@ config OMAP_IOMMU
depends on ARCH_OMAP2PLUS
select IOMMU_API
-config OMAP_IOVMM
- tristate OMAP IO Virtual Memory Manager Support
- depends on OMAP_IOMMU
-
config OMAP_IOMMU_DEBUG
- tristate Export OMAP IOMMU/IOVMM internals in DebugFS
- depends on OMAP_IOVMM DEBUG_FS
+ tristate Export OMAP IOMMU internals in DebugFS
+ depends on DEBUG_FS
This module is relevant only when OMAP_IOMMU is enabled, so this should
be depends on OMAP_IOMMU DEBUG_FS. The dependency is inherent before
through OMAP_IOVMM. Otherwise, this module can be built by itself and
results in some build errors.
Oops, my bad. I'll fix that in v2.
help
Select this to see extensive information about
- the internal state of OMAP IOMMU/IOVMM in debugfs.
+ the internal state of OMAP IOMMU in debugfs.
Say N unless you know you need this.
[snip]
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index ea920c3..36a85f3 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -46,9 +46,6 @@ struct omap_iommu {
int nr_tlb_entries;
- struct list_headmmap;
- struct mutexmmap_lock; /* protect mmap */
-
void *ctx; /* iommu context: registres saved area */
u32 da_start;
u32 da_end;
With the removal of omap-iovmm, the da_start and da_end can also be
removed. No need to block this patch for that, it can be done in a
separate patch.
I'll remove the fields from struct omap_iommu in v2. I'll also remove them
from the platform data, but I'll need to do so in a separate patch, as arch/
code needs to be touched as well.
Yeah, that's the reason I said separate patch :)
regards
Suman
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] iommu/omap: Remove virtual memory manager
The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
---
Joerg, could you please pick this patch up for v3.17 if possible ?
drivers/iommu/Kconfig| 10 +-
drivers/iommu/Makefile | 1 -
drivers/iommu/omap-iommu-debug.c | 114 --
drivers/iommu/omap-iommu.c | 2 -
drivers/iommu/omap-iommu.h | 6 +-
drivers/iommu/omap-iovmm.c | 791 ---
include/linux/omap-iommu.h | 37 +-
7 files changed, 8 insertions(+), 953 deletions(-)
delete mode 100644 drivers/iommu/omap-iovmm.c
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d260605..a1f0fad 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -143,16 +143,12 @@ config OMAP_IOMMU
depends on ARCH_OMAP2PLUS
select IOMMU_API
-config OMAP_IOVMM
- tristate OMAP IO Virtual Memory Manager Support
- depends on OMAP_IOMMU
-
config OMAP_IOMMU_DEBUG
- tristate Export OMAP IOMMU/IOVMM internals in DebugFS
- depends on OMAP_IOVMM DEBUG_FS
+ tristate Export OMAP IOMMU internals in DebugFS
+ depends on DEBUG_FS
help
Select this to see extensive information about
- the internal state of OMAP IOMMU/IOVMM in debugfs.
+ the internal state of OMAP IOMMU in debugfs.
Say N unless you know you need this.
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 8893bad..6a4a00e 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu2.o
-obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o
obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 80fffba..531658d 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -213,116 +213,6 @@ static ssize_t debug_read_pagetable(struct file *file,
char __user *userbuf,
return bytes;
}
-static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
- size_t count, loff_t *ppos)
-{
- struct device *dev = file-private_data;
- struct omap_iommu *obj = dev_to_omap_iommu(dev);
- char *p, *buf;
- struct iovm_struct *tmp;
- int uninitialized_var(i);
- ssize_t bytes;
-
- buf = (char *)__get_free_page(GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- p = buf;
-
- p += sprintf(p, %-3s %-8s %-8s %6s %8s\n,
-No, start, end, size, flags);
- p += sprintf(p, -\n);
-
- mutex_lock(iommu_debug_lock);
-
- list_for_each_entry(tmp, obj-mmap, list) {
- size_t len;
- const char *str = %3d %08x-%08x %6x %8x\n;
- const int maxcol = 39;
-
- len = tmp-da_end - tmp-da_start;
- p += snprintf(p, maxcol, str,
- i, tmp-da_start, tmp-da_end, len, tmp-flags);
-
- if (PAGE_SIZE - (p - buf) maxcol)
- break;
- i++;
- }
-
- bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
-
- mutex_unlock(iommu_debug_lock);
- free_page((unsigned long)buf);
-
- return bytes;
-}
-
-static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
- size_t count, loff_t *ppos)
-{
- struct device *dev = file-private_data;
- char *p, *buf;
- struct iovm_struct *area;
- ssize_t bytes;
-
- count = min_t(ssize_t, count, PAGE_SIZE);
-
- buf = (char *)__get_free_page(GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- p = buf;
-
- mutex_lock(iommu_debug_lock);
-
- area = omap_find_iovm_area(dev, (u32)ppos);
- if (!area) {
- bytes = -EINVAL;
- goto err_out;
- }
- memcpy(p, area-va, count);
- p += count;
-
- bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
-err_out:
- mutex_unlock(iommu_debug_lock);
- free_page((unsigned long)buf);
-
- return bytes;
-}
-
-static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,
- size_t count, loff_t *ppos)
-{
- struct device *dev = file-private_data;
- struct iovm_struct *area;
- char *p, *buf;
-
- count = min_t(size_t, count, PAGE_SIZE);
-
- buf = (char *)__get_free_page(GFP_KERNEL);
- if (!buf)
-
Re: [PATCH] iommu/omap: Remove virtual memory manager
Hi Laurent,
On 07/17/2014 06:09 AM, Laurent Pinchart wrote:
The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
---
Joerg, could you please pick this patch up for v3.17 if possible ?
Need one minor change as below, otherwise patch is good.
drivers/iommu/Kconfig| 10 +-
drivers/iommu/Makefile | 1 -
drivers/iommu/omap-iommu-debug.c | 114 --
drivers/iommu/omap-iommu.c | 2 -
drivers/iommu/omap-iommu.h | 6 +-
drivers/iommu/omap-iovmm.c | 791
---
include/linux/omap-iommu.h | 37 +-
7 files changed, 8 insertions(+), 953 deletions(-)
delete mode 100644 drivers/iommu/omap-iovmm.c
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d260605..a1f0fad 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -143,16 +143,12 @@ config OMAP_IOMMU
depends on ARCH_OMAP2PLUS
select IOMMU_API
-config OMAP_IOVMM
- tristate OMAP IO Virtual Memory Manager Support
- depends on OMAP_IOMMU
-
config OMAP_IOMMU_DEBUG
- tristate Export OMAP IOMMU/IOVMM internals in DebugFS
- depends on OMAP_IOVMM DEBUG_FS
+ tristate Export OMAP IOMMU internals in DebugFS
+ depends on DEBUG_FS
This module is relevant only when OMAP_IOMMU is enabled, so this should
be depends on OMAP_IOMMU DEBUG_FS. The dependency is inherent before
through OMAP_IOVMM. Otherwise, this module can be built by itself and
results in some build errors.
help
Select this to see extensive information about
- the internal state of OMAP IOMMU/IOVMM in debugfs.
+ the internal state of OMAP IOMMU in debugfs.
Say N unless you know you need this.
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 8893bad..6a4a00e 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu2.o
-obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o
obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
diff --git a/drivers/iommu/omap-iommu-debug.c
b/drivers/iommu/omap-iommu-debug.c
index 80fffba..531658d 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -213,116 +213,6 @@ static ssize_t debug_read_pagetable(struct file *file,
char __user *userbuf,
return bytes;
}
-static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
-size_t count, loff_t *ppos)
-{
- struct device *dev = file-private_data;
- struct omap_iommu *obj = dev_to_omap_iommu(dev);
- char *p, *buf;
- struct iovm_struct *tmp;
- int uninitialized_var(i);
- ssize_t bytes;
-
- buf = (char *)__get_free_page(GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- p = buf;
-
- p += sprintf(p, %-3s %-8s %-8s %6s %8s\n,
- No, start, end, size, flags);
- p += sprintf(p, -\n);
-
- mutex_lock(iommu_debug_lock);
-
- list_for_each_entry(tmp, obj-mmap, list) {
- size_t len;
- const char *str = %3d %08x-%08x %6x %8x\n;
- const int maxcol = 39;
-
- len = tmp-da_end - tmp-da_start;
- p += snprintf(p, maxcol, str,
- i, tmp-da_start, tmp-da_end, len, tmp-flags);
-
- if (PAGE_SIZE - (p - buf) maxcol)
- break;
- i++;
- }
-
- bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
-
- mutex_unlock(iommu_debug_lock);
- free_page((unsigned long)buf);
-
- return bytes;
-}
-
-static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
- size_t count, loff_t *ppos)
-{
- struct device *dev = file-private_data;
- char *p, *buf;
- struct iovm_struct *area;
- ssize_t bytes;
-
- count = min_t(ssize_t, count, PAGE_SIZE);
-
- buf = (char *)__get_free_page(GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- p = buf;
-
- mutex_lock(iommu_debug_lock);
-
- area = omap_find_iovm_area(dev, (u32)ppos);
- if (!area) {
- bytes = -EINVAL;
- goto err_out;
- }
- memcpy(p, area-va, count);
- p += count;
-
- bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
-err_out:
- mutex_unlock(iommu_debug_lock);
- free_page((unsigned long)buf);
-
- return
