Skip to contentSkip to conversation

ARM: head: fix swapper and idmap population with LPAE and big-endian

PATCH New Will Deacon 3 participants 4 messages Feb 25, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: head: fix swapper and idmap population with LPAE and big-endian

The LPAE page table format uses 64-bit descriptors, so we need to take endianness into account when populating the swapper and idmap tables during early initialisation.

This patch ensures that we store the two words making up each page table entry in the correct order when running big-endian.

---
 arch/arm/kernel/head.S | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)
arch/arm/kernel/head.S +22 -4
index 486a15a..e0eb9a1 100644
@@ -184,13 +184,22 @@ __create_page_tables:
 	orr	r3, r3, #3			@ PGD block type
 	mov	r6, #4				@ PTRS_PER_PGD
 	mov	r7, #1 << (55 - 32)		@ L_PGD_SWAPPER
-1:	str	r3, [r0], #4			@ set bottom PGD entry bits
+1:
+#ifdef CONFIG_CPU_ENDIAN_BE8
 	str	r7, [r0], #4			@ set top PGD entry bits
+	str	r3, [r0], #4			@ set bottom PGD entry bits
+#else
+	str	r3, [r0], #4			@ set bottom PGD entry bits
+	str	r7, [r0], #4			@ set top PGD entry bits
+#endif
 	add	r3, r3, #0x1000			@ next PMD table
 	subs	r6, r6, #1
 	bne	1b
 
 	add	r4, r4, #0x1000			@ point to the PMD tables
+#ifdef CONFIG_CPU_ENDIAN_BE8
+	add	r4, r4, #4			@ we only write the bottom word
+#endif
 #endif
 
 	ldr	r7, [r10, #PROCINFO_MM_MMUFLAGS] @ mm_mmuflags
@@ -258,6 +267,11 @@ __create_page_tables:
 	addne	r6, r6, #1 << SECTION_SHIFT
 	strne	r6, [r3]
 
+#if defined(CONFIG_LPAE) && defined(CONFIG_CPU_ENDIAN_BE8)
+	sub	r4, r4, #4			@ Fixup page table pointer
+						@ for 64-bit descriptors
+#endif
+
 #ifdef CONFIG_DEBUG_LL
 #if !defined(CONFIG_DEBUG_ICEDCC) && !defined(CONFIG_DEBUG_SEMIHOSTING)
 	/*
@@ -276,13 +290,17 @@ __create_page_tables:
 	orr	r3, r7, r3, lsl #SECTION_SHIFT
 #ifdef CONFIG_ARM_LPAE
 	mov	r7, #1 << (54 - 32)		@ XN
+#ifdef CONFIG_CPU_ENDIAN_BE8
+	str	r7, [r0], #4
+	str	r3, [r0], #4
 #else
-	orr	r3, r3, #PMD_SECT_XN
-#endif
 	str	r3, [r0], #4
-#ifdef CONFIG_ARM_LPAE
 	str	r7, [r0], #4
 #endif
+#else
+	orr	r3, r3, #PMD_SECT_XN
+	str	r3, [r0], #4
+#endif
 
 #else /* CONFIG_DEBUG_ICEDCC || CONFIG_DEBUG_SEMIHOSTING */
 	/* we don't need any serial debugging mappings */
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 ARM: head: fix swapper and idmap population with LPAE and big-endian

Quoted 10 lines · Will Deacon

The LPAE page table format uses 64-bit descriptors, so we need to take endianness into account when populating the swapper and idmap tables during early initialisation.

This patch ensures that we store the two words making up each page table entry in the correct order when running big-endian.

FWIW, tested as a KVM guest.

        M.
Signature · 1 line
Fast, cheap, reliable. Pick two.
#2 lore raw

PATCH 1/1 ARM: head: fix swapper and idmap population with LPAE and big-endian

Quoted 6 lines · Marc Zyngier
Quoted 4 lines · Will Deacon

The LPAE page table format uses 64-bit descriptors, so we need to take endianness into account when populating the swapper and idmap tables during early initialisation.

Quoted 8 lines
Quoted 6 lines

This patch ensures that we store the two words making up each page table entry in the correct order when running big-endian.

FWIW, tested as a KVM guest.

That was a for BE guest on LE host, right? :o

Any ideas about much work that would be?

Rob

#3 lore raw

PATCH 1/1 ARM: head: fix swapper and idmap population with LPAE and big-endian

Quoted 10 lines · Rob Herring
Quoted 9 lines · Marc Zyngier
Quoted 7 lines · Will Deacon

The LPAE page table format uses 64-bit descriptors, so we need to take endianness into account when populating the swapper and idmap tables during early initialisation.

This patch ensures that we store the two words making up each page table entry in the correct order when running big-endian.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

FWIW, tested as a KVM guest.

That was a for BE guest on LE host, right? :o

Yep. Actually, a 32bit BE guest on 64bit LE host. Scary, isn't it? ;-)

Quoted 1 line

Any ideas about much work that would be?

A substantial amount. I have a branch there:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm64/mmio-be

It contains all kind of patches to KVM, virtio and kvmtool. I need to split things into reviewable bits. And maybe get a life. ;-)

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...