Skip to contentSkip to conversation

ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block

PATCH New Will Deacon 2 participants 2 messages Jan 16, 2012 – Jan 17, 2012 Arm (32-bit)

lore
Share & tools
lore

Will Deacon

author
#0 lore raw

PATCH 1/1 ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block

The merging of commits 1b6ba46b ("ARM: LPAE: MMU setup for the 3-level page table format") and b4244738 ("ARM: 7202/1: Add Cortex-A7 proc info") during the merge window ended up putting the Cortex-A7 proc_info into a code block guarded by !CONFIG_ARM_LPAE. This makes Cortex-A7 platforms unbootable when LPAE is enabled.

This patch moves the proc_info structure for Cortex-A7 outside of the guarded block.

Cc Catalin Marinas <[email protected]>
Cc Pawel Moll <[email protected]>
Signed-off-by Will Deacon <[email protected]>
---
 arch/arm/mm/proc-v7.S |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mm/proc-v7.S +10 -10
index 7e9b5bf..b155974 100644
@@ -330,16 +330,6 @@ __v7_ca5mp_proc_info:
 	.size	__v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info
 
 	/*
-	 * ARM Ltd. Cortex A7 processor.
-	 */
-	.type	__v7_ca7mp_proc_info, #object
-__v7_ca7mp_proc_info:
-	.long	0x410fc070
-	.long	0xff0ffff0
-	__v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
-	.size	__v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
-
-	/*
 	 * ARM Ltd. Cortex A9 processor.
 	 */
 	.type   __v7_ca9mp_proc_info, #object

@@ -351,6 +341,16 @@ __v7_ca9mp_proc_info:
 #endif	/* CONFIG_ARM_LPAE */
 
 	/*
+	 * ARM Ltd. Cortex A7 processor.
+	 */
+	.type	__v7_ca7mp_proc_info, #object
+__v7_ca7mp_proc_info:
+	.long	0x410fc070
+	.long	0xff0ffff0
+	__v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
+	.size	__v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
+
+	/*
 	 * ARM Ltd. Cortex A15 processor.
 	 */
 	.type	__v7_ca15mp_proc_info, #object
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block

Quoted 6 lines · Will Deacon

The merging of commits 1b6ba46b ("ARM: LPAE: MMU setup for the 3-level page table format") and b4244738 ("ARM: 7202/1: Add Cortex-A7 proc info") during the merge window ended up putting the Cortex-A7 proc_info into a code block guarded by !CONFIG_ARM_LPAE. This makes Cortex-A7 platforms unbootable when LPAE is enabled.

Quoted 6 lines

This patch moves the proc_info structure for Cortex-A7 outside of the guarded block.

Cc Catalin Marinas <[email protected]>
Cc Pawel Moll <[email protected]>
Signed-off-by Will Deacon <[email protected]>
Acked-by Catalin Marinas <[email protected]>
Signature · 1 line
Catalin