[PATCH] omap: iommu: fix pte attributes for super section

[PATCH] omap: iommu: fix pte attributes for super section

[Suman Anna]

The PTE programming causes a 16MB entry to be interpreted
as a 4K entry because of the bitwise check, and therefore does
not set the attributes properly in the first-level descriptor
table. The bitwise check has been replaced appropriately.

Signed-off-by: Suman Anna <s-anna@ti.com>
---
 arch/arm/mach-omap2/iommu2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index adb083e..c21fbe6 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c
@@ -225,7 +225,8 @@ static u32 omap2_get_pte_attr(struct iotlb_entry *e)
        attr = e->mixed << 5;
        attr |= e->endian;
        attr |= e->elsz >> 3;
-       attr <<= ((e->pgsz & MMU_CAM_PGSZ_4K) ? 0 : 6);
+       attr <<= (((e->pgsz == MMU_CAM_PGSZ_4K) ||
+                       (e->pgsz == MMU_CAM_PGSZ_64K)) ? 0 : 6);

        return attr;
 }
--
1.7.0.4

[PATCH] omap: iommu: fix pte attributes for super section

[Anna, Suman]

[PATCH] omap: iommu: fix pte attributes for super section

[Hiroshi DOYU]

From: "ext Anna, Suman" <s-anna@ti.com>
Subject: [PATCH] omap: iommu: fix pte attributes for super section
Date: Tue, 10 May 2011 10:25:17 -0700

> From 5796d8d8a0ea5aee342b78ca6ead229971cff6c5 Mon Sep 17 00:00:00 2001
> From: Suman Anna <s-anna@ti.com>
> Date: Wed, 4 May 2011 17:45:37 -0500
> Subject: [PATCH] omap: iommu: fix pte attributes for super section
> 
> The PTE programming causes a 16MB entry to be interpreted
> as a 4K entry because of the bitwise check, and therefore does
> not set the attributes properly in the first-level descriptor
> table. The bitwise check has been replaced appropriately.
> 
> Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

Thanks, checked with OMAP2/3 TRM.

[PATCH] omap: iommu: fix pte attributes for super section

[Anna, Suman]

On Mon, May 16, 2011 at 2:11 AM, Hiroshi DOYU <Hiroshi.DOYU@nokia.com> wrote:
> From: "ext Anna, Suman" <s-anna@ti.com>
> Subject: [PATCH] omap: iommu: fix pte attributes for super section
> Date: Tue, 10 May 2011 10:25:17 -0700
>
>> From 5796d8d8a0ea5aee342b78ca6ead229971cff6c5 Mon Sep 17 00:00:00 2001
>> From: Suman Anna <s-anna@ti.com>
>> Date: Wed, 4 May 2011 17:45:37 -0500
>> Subject: [PATCH] omap: iommu: fix pte attributes for super section
>>
>> The PTE programming causes a 16MB entry to be interpreted
>> as a 4K entry because of the bitwise check, and therefore does
>> not set the attributes properly in the first-level descriptor
>> table. The bitwise check has been replaced appropriately.
>>
>> Signed-off-by: Suman Anna <s-anna@ti.com>
> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

Tony,
Can this patch be queued up for the next rc, or is there any reason
for this to remain archived?
https://patchwork.kernel.org/patch/774932/

regards
Suman