Skip to contentSkip to conversation

ARM: mm: Fix stage-2 device memory attributes

PATCH Superseded Christoffer Dall 3 participants 4 messages Jan 28, 2014 – Jan 30, 2014 Arm (32-bit)

lore
Share & tools
lore

Christoffer Dall

author
#0 lore raw

PATCH v2 1/1 ARM: mm: Fix stage-2 device memory attributes

The stage-2 memory attributes are distinct from the Hyp memory attributes and the Stage-1 memory attributes. We were using the stage-1 memory attributes for stage-2 mappings causing device mappings to be mapped as normal memory. Add the S2 equivalent defines for memory attributes and fix the comments explaining the defines while at it.

Add a prot_pte_s2 field to the mem_type struct and fill out the field for device mappings accordingly.

Cc Marc Zyngier <[email protected]>
Cc Catalin Marinas <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>

---
Changes [v1 -> v2]:
- Only define stage 2 protection flag for MT_DEVICE memory type.

 arch/arm/include/asm/pgtable-3level.h | 15 +++++++++------
 arch/arm/mm/mm.h                      |  1 +
 arch/arm/mm/mmu.c                     |  7 ++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)
arch/arm/include/asm/pgtable-3level.h +9 -6
index 4f95039..1d15673 100644
@@ -120,13 +120,16 @@
 /*
  * 2nd stage PTE definitions for LPAE.
  */
-#define L_PTE_S2_MT_UNCACHED	 (_AT(pteval_t, 0x5) << 2) /* MemAttr[3:0] */
-#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */
-#define L_PTE_S2_MT_WRITEBACK	 (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */
-#define L_PTE_S2_RDONLY		 (_AT(pteval_t, 1) << 6)   /* HAP[1]   */
-#define L_PTE_S2_RDWR		 (_AT(pteval_t, 3) << 6)   /* HAP[2:1] */
+#define L_PTE_S2_MT_UNCACHED		(_AT(pteval_t, 0x0) << 2) /* strongly ordered */
+#define L_PTE_S2_MT_WRITETHROUGH	(_AT(pteval_t, 0xa) << 2) /* normal inner write-through */
+#define L_PTE_S2_MT_WRITEBACK		(_AT(pteval_t, 0xf) << 2) /* normal inner write-back */
+#define L_PTE_S2_MT_DEV_SHARED		(_AT(pteval_t, 0x1) << 2) /* device */
+#define L_PTE_S2_MT_MASK		(_AT(pteval_t, 0xf) << 2)
 
-#define L_PMD_S2_RDWR		 (_AT(pmdval_t, 3) << 6)   /* HAP[2:1] */
+#define L_PTE_S2_RDONLY			(_AT(pteval_t, 1) << 6)   /* HAP[1]   */
+#define L_PTE_S2_RDWR			(_AT(pteval_t, 3) << 6)   /* HAP[2:1] */
+
+#define L_PMD_S2_RDWR			(_AT(pmdval_t, 3) << 6)   /* HAP[2:1] */
 
 /*
  * Hyp-mode PL2 PTE definitions for LPAE.
arch/arm/mm/mm.h +1 -0
index d5a982d..7ea641b 100644
@@ -38,6 +38,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt)
 
 struct mem_type {
 	pteval_t prot_pte;
+	pteval_t prot_pte_s2;
 	pmdval_t prot_l1;
 	pmdval_t prot_sect;
 	unsigned int domain;
arch/arm/mm/mmu.c +6 -1
index 580ef2d..911d433 100644
@@ -231,12 +231,16 @@ __setup("noalign", noalign_setup);
 #endif /* ifdef CONFIG_CPU_CP15 / else */
 
 #define PROT_PTE_DEVICE		L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN
+#define PROT_PTE_S2_DEVICE	PROT_PTE_DEVICE
 #define PROT_SECT_DEVICE	PMD_TYPE_SECT|PMD_SECT_AP_WRITE
 
 static struct mem_type mem_types[] = {
 	[MT_DEVICE] = {		  /* Strongly ordered / ARMv6 shared device */
 		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
 				  L_PTE_SHARED,
+		.prot_pte_s2	= s2_policy(PROT_PTE_S2_DEVICE) |
+				  s2_policy(L_PTE_S2_MT_DEV_SHARED) |
+				  L_PTE_SHARED,
 		.prot_l1	= PMD_TYPE_TABLE,
 		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_S,
 		.domain		= DOMAIN_IO,

@@ -458,7 +462,8 @@ static void __init build_mem_type_table(void)
 	cp = &cache_policies[cachepolicy];
 	vecs_pgprot = kern_pgprot = user_pgprot = cp->pte;
 	s2_pgprot = cp->pte_s2;
-	hyp_device_pgprot = s2_device_pgprot = mem_types[MT_DEVICE].prot_pte;
+	hyp_device_pgprot = mem_types[MT_DEVICE].prot_pte;
+	s2_device_pgprot = mem_types[MT_DEVICE].prot_pte_s2;
 
 	/*
 	 * ARMv6 and above have extended page tables.
Signature · 1 line
1.8.5.2
#1 lore raw

PATCH v2 1/1 ARM: mm: Fix stage-2 device memory attributes

Quoted 6 lines · Christoffer Dall

The stage-2 memory attributes are distinct from the Hyp memory attributes and the Stage-1 memory attributes. We were using the stage-1 memory attributes for stage-2 mappings causing device mappings to be mapped as normal memory. Add the S2 equivalent defines for memory attributes and fix the comments explaining the defines while at it.

Quoted 6 lines

Add a prot_pte_s2 field to the mem_type struct and fill out the field for device mappings accordingly.

Cc Marc Zyngier <[email protected]>
Cc Catalin Marinas <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Acked-by Marc Zyngier <[email protected]>
	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
author
#2 lore raw

PATCH v2 1/1 ARM: mm: Fix stage-2 device memory attributes

Quoted 7 lines · Marc Zyngier
Quoted 6 lines · Christoffer Dall

The stage-2 memory attributes are distinct from the Hyp memory attributes and the Stage-1 memory attributes. We were using the stage-1 memory attributes for stage-2 mappings causing device mappings to be mapped as normal memory. Add the S2 equivalent defines for memory attributes and fix the comments explaining the defines while at it.

Quoted 9 lines
Quoted 6 lines

Add a prot_pte_s2 field to the mem_type struct and fill out the field for device mappings accordingly.

Cc Marc Zyngier <[email protected]>
Cc Catalin Marinas <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Acked-by Marc Zyngier <[email protected]>

Thanks, Catalin, Russell, any comments?

-Christoffer

#3 lore raw

PATCH v2 1/1 ARM: mm: Fix stage-2 device memory attributes

In reply to Christoffer Dall
Quoted 6 lines · Christoffer Dall

The stage-2 memory attributes are distinct from the Hyp memory attributes and the Stage-1 memory attributes. We were using the stage-1 memory attributes for stage-2 mappings causing device mappings to be mapped as normal memory. Add the S2 equivalent defines for memory attributes and fix the comments explaining the defines while at it.

Quoted 6 lines

Add a prot_pte_s2 field to the mem_type struct and fill out the field for device mappings accordingly.

Cc Marc Zyngier <[email protected]>
Cc Catalin Marinas <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Acked-by Catalin Marinas <[email protected]>