Skip to contentSkip to conversation

OMAP: iovmm: fix SW flags passed by user

PATCH Superseded Omar Ramirez Luna 3 participants 4 messages Mar 25, 2011 – May 31, 2011

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Omar Ramirez Luna

author
#0 lore raw

PATCH v2 1/1 OMAP: iovmm: fix SW flags passed by user

Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself.

This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses".

Signed-off-by Omar Ramirez Luna <[email protected]>

---

v2:
Include missing reference (commit and name) to patch in description.

 arch/arm/plat-omap/include/plat/iovmm.h |    3 ---
 arch/arm/plat-omap/iovmm.c              |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
arch/arm/plat-omap/include/plat/iovmm.h +0 -3
index 32a2f6c..e992b96 100644
@@ -29,9 +29,6 @@ struct iovm_struct {
  * lower 16 bit is used for h/w and upper 16 bit is for s/w.
  */
 #define IOVMF_SW_SHIFT		16
-#define IOVMF_HW_SIZE		(1 << IOVMF_SW_SHIFT)
-#define IOVMF_HW_MASK		(IOVMF_HW_SIZE - 1)
-#define IOVMF_SW_MASK		(~IOVMF_HW_MASK)UL
 
 /*
  * iovma: h/w flags derived from cam and ram attribute
arch/arm/plat-omap/iovmm.c +0 -4
index 51ef43e..83a37c5 100644
@@ -648,7 +648,6 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt,
 			return PTR_ERR(va);
 	}
 
-	flags &= IOVMF_HW_MASK;
 	flags |= IOVMF_DISCONT;
 	flags |= IOVMF_MMIO;
 

@@ -706,7 +705,6 @@ u32 iommu_vmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags)
 	if (!va)
 		return -ENOMEM;
 
-	flags &= IOVMF_HW_MASK;
 	flags |= IOVMF_DISCONT;
 	flags |= IOVMF_ALLOC;
 

@@ -795,7 +793,6 @@ u32 iommu_kmap(struct iommu *obj, u32 da, u32 pa, size_t bytes,
 	if (!va)
 		return -ENOMEM;
 
-	flags &= IOVMF_HW_MASK;
 	flags |= IOVMF_LINEAR;
 	flags |= IOVMF_MMIO;
 

@@ -853,7 +850,6 @@ u32 iommu_kmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags)
 		return -ENOMEM;
 	pa = virt_to_phys(va);
 
-	flags &= IOVMF_HW_MASK;
 	flags |= IOVMF_LINEAR;
 	flags |= IOVMF_ALLOC;
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH v2 1/1 OMAP: iovmm: fix SW flags passed by user

Hi Hiroshi,

Quoted 8 lines · Omar Ramirez Luna

Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself.

This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses".

Quoted 6 lines
Signed-off-by Omar Ramirez Luna <[email protected]>

---

v2:
Include missing reference (commit and name) to patch in description.

If no comments, could you ack this patch?

Regards,

Omar

#2 lore raw

PATCH v2 1/1 OMAP: iovmm: fix SW flags passed by user

From: "ext Ramirez Luna, Omar" <[email protected]>
Subject: Re: [PATCH v2] OMAP: iovmm: fix SW flags passed by user
Date: Fri, 15 Apr 2011 10:49:42 -0500

Quoted 11 lines

Hi Hiroshi,

Quoted 8 lines · Omar Ramirez Luna

Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself.

This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses".

Quoted 8 lines
Quoted 6 lines
Signed-off-by Omar Ramirez Luna <[email protected]>

---

v2:
Include missing reference (commit and name) to patch in description.

If no comments, could you ack this patch?

Tony, please put this in your queue too.

#3 lore raw

PATCH v2 1/1 OMAP: iovmm: fix SW flags passed by user

Quoted 18 lines · Hiroshi DOYU

From: "ext Ramirez Luna, Omar" <[email protected]>
Subject: Re: [PATCH v2] OMAP: iovmm: fix SW flags passed by user
Date: Fri, 15 Apr 2011 10:49:42 -0500

Quoted 14 lines

Hi Hiroshi,

Quoted 11 lines · Omar Ramirez Luna

Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself.

This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses".

Signed-off-by Omar Ramirez Luna <[email protected]>

---

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

v2:
Include missing reference (commit and name) to patch in description.

If no comments, could you ack this patch?

Tony, please put this in your queue too.

I take that as your ack, will queue into fixes.

Tony