Skip to contentSkip to conversation

ARM: allow empty ATAG_CORE

PATCH New David Brown 2 participants 3 messages Sep 30, 2009 – Oct 1, 2009 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: allow empty ATAG_CORE

From: David Brown <[email protected]>

The ATAG_CORE is allowed to be empty. Although this is handled by parse_tag_core(), __vet_atags during startup rejects this tag unless it contains data. Allow the initial tag to be either the full size, or empty.

---
Currently, some configurations of the Android bootloader use an empty ATAG_CORE.

 arch/arm/kernel/head-common.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/kernel/head-common.S +3 -1
index 93ad576..1e8f0d6 100644
@@ -13,6 +13,7 @@
 
 #define ATAG_CORE 0x54410001
 #define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
+#define ATAG_CORE_SIZE_EMPTY ((2*4 + 3*4) >> 2)
 
 	.align	2
 	.type	__switch_data, %object
@@ -251,7 +252,8 @@ __vet_atags:
 	bne	1f
 
 	ldr	r5, [r2, #0]			@ is first tag ATAG_CORE?
-	subs	r5, r5, #ATAG_CORE_SIZE
+	cmp	r5, #ATAG_CORE_SIZE
+	cmpne	r5, #ATAG_CORE_SIZE_EMPTY
 	bne	1f
 	ldr	r5, [r2, #4]
 	ldr	r6, =ATAG_CORE
Signature · 1 line
1.6.2.3
#1 lore raw

PATCH 1/1 ARM: allow empty ATAG_CORE

From: David Brown <[email protected]>

The ATAG_CORE is allowed to be empty. Although this is handled by parse_tag_core(), __vet_atags during startup rejects this tag unless it contains data. Allow the initial tag to be either the full size, or empty.

---
Sorry, previous patch didn't actually do anything, since the new constant was defined incorrectly.

 arch/arm/kernel/head-common.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/kernel/head-common.S +3 -1
index 93ad576..885a721 100644
@@ -13,6 +13,7 @@
 
 #define ATAG_CORE 0x54410001
 #define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
+#define ATAG_CORE_SIZE_EMPTY ((2*4) >> 2)
 
 	.align	2
 	.type	__switch_data, %object
@@ -251,7 +252,8 @@ __vet_atags:
 	bne	1f
 
 	ldr	r5, [r2, #0]			@ is first tag ATAG_CORE?
-	subs	r5, r5, #ATAG_CORE_SIZE
+	cmp	r5, #ATAG_CORE_SIZE
+	cmpne	r5, #ATAG_CORE_SIZE_EMPTY
 	bne	1f
 	ldr	r5, [r2, #4]
 	ldr	r6, =ATAG_CORE
Signature · 1 line
1.6.2.3
#2 lore raw

PATCH 1/1 ARM: allow empty ATAG_CORE

Quoted 6 lines · David Brown

From: David Brown <[email protected]>

The ATAG_CORE is allowed to be empty. Although this is handled by parse_tag_core(), __vet_atags during startup rejects this tag unless it contains data. Allow the initial tag to be either the full size, or empty.

Please send to the patch system, thanks.