Skip to contentSkip to conversation

arm: add 8-byte alignment for ABI compliance before board_init_f

PATCH New Heiko Schocher 5 participants 11 messages Nov 12, 2010 – Dec 8, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

suggested from Daniel Hobi<[email protected]>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

cc Daniel Hobi <[email protected]>
cc Albert ARIBAUD <[email protected]>
---
 arch/arm/cpu/arm1136/start.S   |    1 +
 arch/arm/cpu/arm1176/start.S   |    1 +
 arch/arm/cpu/arm720t/start.S   |    1 +
 arch/arm/cpu/arm920t/start.S   |    1 +
 arch/arm/cpu/arm925t/start.S   |    1 +
 arch/arm/cpu/arm926ejs/start.S |    1 +
 arch/arm/cpu/arm946es/start.S  |    1 +
 arch/arm/cpu/arm_intcm/start.S |    1 +
 arch/arm/cpu/armv7/start.S     |    1 +
 arch/arm/cpu/ixp/start.S       |    1 +
 arch/arm/cpu/lh7a40x/start.S   |    1 +
 arch/arm/cpu/pxa/start.S       |    1 +
 arch/arm/cpu/s3c44b0/start.S   |    1 +
 arch/arm/cpu/sa1100/start.S    |    1 +
 arch/arm/lib/board.c           |    2 +-
 15 files changed, 15 insertions(+), 1 deletions(-)
arch/arm/cpu/arm1136/start.S +1 -0
index aecc943..f8558c1 100644
@@ -176,6 +176,7 @@ next:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 
 #ifdef CONFIG_NAND_SPL
arch/arm/cpu/arm1176/start.S +1 -0
index f04d268..03365dc 100644
@@ -251,6 +251,7 @@ skip_tcmdisable:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm720t/start.S +1 -0
index 8cd267b..21b2aca 100644
@@ -159,6 +159,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm920t/start.S +1 -0
index d4edde7..57430f8 100644
@@ -205,6 +205,7 @@ copyex:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm925t/start.S +1 -0
index 51229c6..3e6dd90 100644
@@ -196,6 +196,7 @@ poll1:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm926ejs/start.S +1 -0
index 6dcc9b4..bf4988d 100644
@@ -174,6 +174,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm946es/start.S +1 -0
index cad43ba..1d9ba30 100644
@@ -165,6 +165,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/arm_intcm/start.S +1 -0
index 957ca34..c481de7 100644
@@ -163,6 +163,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/armv7/start.S +1 -0
index bb3948d..691eab0 100644
@@ -166,6 +166,7 @@ next:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/ixp/start.S +1 -0
index 8d1aebc..f561c8f 100644
@@ -289,6 +289,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/lh7a40x/start.S +1 -0
index fd8a40b..5015211 100644
@@ -176,6 +176,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/pxa/start.S +1 -0
index ae358a5..66479cb 100644
@@ -220,6 +220,7 @@ zerojmp:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/s3c44b0/start.S +1 -0
index 67b2c6a..5563572 100644
@@ -148,6 +148,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/cpu/sa1100/start.S +1 -0
index ace0c07..91cdd72 100644
@@ -152,6 +152,7 @@ reset:
 /* Set stackpointer in internal RAM to call board_init_f */
 call_board_init_f:
 	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 	bl	board_init_f
 
arch/arm/lib/board.c +1 -1
index 1fd5f83..96c0e30 100644
@@ -276,7 +276,7 @@ void board_init_f (ulong bootflag)
 	ulong addr, addr_sp;
 
 	/* Pointer is writable since we allocated a register for it */
-	gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR);
+	gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR) & ~0x07);
 	/* compiler optimization barrier needed for GCC >= 3.4 */
 	__asm__ __volatile__("": : :"memory");
 
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Dear Heiko Schocher,

Quoted 17 lines
arch/arm/cpu/sa1100/start.S +1 -0
index ace0c07..91cdd72 100644
@@ -152,6 +152,7 @@ reset:
  /* Set stackpointer in internal RAM to call board_init_f */
  call_board_init_f:
  	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
  	ldr	r0,=0x00000000
  	bl	board_init_f
 
arch/arm/lib/board.c +0 -0
index 1fd5f83..96c0e30 100644

arch/arm/lib/board.c void board_init_f (ulong bootflag) · line 282

Quoted 8 lines
arch/arm/lib/board.c +1 -1
@@ -276,7 +276,7 @@ void board_init_f (ulong bootflag)
  	ulong addr, addr_sp;
 
  	/* Pointer is writable since we allocated a register for it */
-	gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR);
+	gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR)&  ~0x07);
  	/* compiler optimization barrier needed for GCC>= 3.4 */
  	__asm__ __volatile__("": : :"memory");
 

Is bootflag ever used? If not, why not change the parameter to give the gd address to board_init_f?

ld r0, sp (whatever the exact assembly syntax for that would be)

void board_init_f (gd_t *gd_addr)
...

	gd = gd_addr;

One further thought, why not init the reserved register in assembly and remove the gd relevant code in C? But that bears some risk if the register is changed and the assembly is forgotten to adapt..

Best regards,
Reinhard

#2 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Hello Reinhard,

Quoted 20 lines · Reinhard Meyer

Dear Heiko Schocher,

Quoted 19 lines
arch/arm/cpu/sa1100/start.S +1 -0
index ace0c07..91cdd72 100644
@@ -152,6 +152,7 @@ reset:
  /* Set stackpointer in internal RAM to call board_init_f */
  call_board_init_f:
      ldr    sp, =(CONFIG_SYS_INIT_SP_ADDR)
+    bic    sp, sp, #7 /* 8-byte alignment for ABI compliance */
      ldr    r0,=0x00000000
      bl    board_init_f
 
arch/arm/lib/board.c +0 -0
index 1fd5f83..96c0e30 100644
@@ -276,7 +276,7 @@ void board_init_f (ulong bootflag)
      ulong addr, addr_sp;
 
Quoted 8 lines

arch/arm/lib/board.c void board_init_f (ulong bootflag) · line 282

Quoted 6 lines
arch/arm/lib/board.c +1 -1
      /* Pointer is writable since we allocated a register for it */
-    gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR);
+    gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR)&  ~0x07);
      /* compiler optimization barrier needed for GCC>= 3.4 */
      __asm__ __volatile__("": : :"memory");
 

Is bootflag ever used? If not, why not change the parameter to

No.

Quoted 7 lines

give the gd address to board_init_f?

ld r0, sp (whatever the exact assembly syntax for that would be)

void board_init_f (gd_t *gd_addr)
...

    gd = gd_addr;

I thought this too, but in arch/powerpc/lib/board.c it is used as bootflag, so I didn;t want to touch this ... but looking in arch/*/lib/board.c this first parameter is not always used as bootflag ... so I think that would be good ... opinions?

Quoted 3 lines

One further thought, why not init the reserved register in assembly and remove the gd relevant code in C? But that bears some risk if the register is changed and the assembly is forgotten to adapt..

No, I think this is to risky ...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#3 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Le 12/11/2010 08:19, Heiko Schocher a ?crit :

Quoted 5 lines
Quoted 3 lines

One further thought, why not init the reserved register in assembly and remove the gd relevant code in C? But that bears some risk if the register is changed and the assembly is forgotten to adapt..

No, I think this is to risky ...

It is absolutely not risky.

It is simply infeasible. :)

Different ARM toolchains use registers in different ways. Go from one toolchain to another, or from one *version* of a toolchain to another, and your "reserved" register is not any more.

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

In reply to Heiko Schocher
Quoted 14 lines · Heiko Schocher

Hello Reinhard,

Quoted 4 lines · Reinhard Meyer

Dear Heiko Schocher,

arch/arm/cpu/sa1100/start.S

Quoted 1 line
arch/arm/cpu/sa1100/start.S +0 -0

Is bootflag ever used? If not, why not change the parameter to

No.

Quoted 4 lines

give the gd address to board_init_f?

ld r0, sp (whatever the exact assembly syntax for that would be)

Quoted 9 lines
Quoted 3 lines

void board_init_f (gd_t *gd_addr)
...

    gd = gd_addr;

I thought this too, but in arch/powerpc/lib/board.c it is used as bootflag, so I didn;t want to touch this ... but looking in arch/*/lib/board.c this first parameter is not always used as bootflag ... so I think that would be good ... opinions?

For x86, I use the parameter as a pointer to gd and put boot flags in gd:

void board_init_f (ulong gdp)
{

The memory layout for x86 is:

+--Top of Memory-+
|                |
|     Stack      |
|                |
+----------------+
|                |
|  Global Data   |
|                |
+----------------+
|                |
|  U-Boot Code   |
|    + Data      |
|                |
+----------------+ <-- dest_addr (see below)
|                |
|      BSS       |
|                |
+----------------+
|                |
|  malloc area   |
|                |
+----------------+
|                |
|  Free Memory   |
/                /

So passing the pointer to gd also serves to calculate the relocation address:

	/* Calculate destination RAM Address and relocation offset */
	dest_addr  = (void *)gdp - (bss_end - text_start);
	rel_offset = dest_addr - text_start;

Regards,

Graeme

#5 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

In reply to Reinhard Meyer

Dear Reinhard Meyer,

Quoted 3 lines · In message <[email protected]> you wrote:

Is bootflag ever used? If not, why not change the parameter to give the gd address to board_init_f?

No, bootflag is never used and could / should be removed.

Passing gd as parameter makes no sense, thoug, as it's global data and we reserve a register to store it's address, so it can always be used with minimal overhead.

Quoted 3 lines

One further thought, why not init the reserved register in assembly and remove the gd relevant code in C? But that bears some risk if the register is changed and the assembly is forgotten to adapt..

We try to do as much as pssible in C, and only what really cannot be avoided in assembly.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The last thing one knows in constructing a work is what to put first.
- Blaise Pascal
#6 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Quoted 4 lines · Wolfgang Denk

Dear Reinhard Meyer,

Quoted 1 line · In message <[email protected]> you wrote:
Quoted 8 lines
Quoted 2 lines

Is bootflag ever used? If not, why not change the parameter to give the gd address to board_init_f?

No, bootflag is never used and could / should be removed.

Passing gd as parameter makes no sense, thoug, as it's global data and we reserve a register to store it's address, so it can always be used with minimal overhead.

Which is a really nice idea if you have a register to spare. Unfortunately, x86 does not have this luxury, and the only way I can get gd (and as a consequence upper memory bound for relocation) is to allocate it in assembler and pass to C as a function argument

Regards,

Graeme

#7 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Dear Graeme Russ,

Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 4 lines

Passing gd as parameter makes no sense, thoug, as it's global data and we reserve a register to store it's address, so it can always be used with minimal overhead.

Which is a really nice idea if you have a register to spare. Unfortunately, x86 does not have this luxury, and the only way I can get gd (and as a consequence upper memory bound for relocation) is to allocate it in assembler and pass to C as a function argument

Agreed - x86 has always it's own set of limitations.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In the pitiful, multipage, connection-boxed form to which  the  flow-
chart  has  today  been  elaborated, it has proved to be useless as a
design tool -- programmers draw flowcharts after, not before, writing
the programs they describe.                        - Fred Brooks, Jr.
#8 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

In reply to Heiko Schocher

Le 12/11/2010 07:53, Heiko Schocher a ?crit :

Quoted 10 lines

suggested from Daniel Hobi<[email protected]>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

cc Daniel Hobi<[email protected]>
cc Albert ARIBAUD<[email protected]>

I'm a bit uneasy about having the symbol unaligned and the aligning done by the code (and in different places):

arch/arm/lib/board.c void board_init_f (ulong bootflag)

Quoted 6 lines

ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)

arch/arm/lib/board.c +2 -1
+	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 
-	gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR);
+	gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR)&  ~0x07);

There is always a risk that overhauls of the code, or new uses elsewhere in the code, forget about the alignment constraint and use the symbol straight away, which could cause all sorts of hard to debug issues.

Could we not align the symbol value itself so that the code simply uses the symbol?

Amicalement,

Signature · 1 line
Albert.
#9 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

Hello Albert,

Quoted 8 lines · Albert ARIBAUD

Le 12/11/2010 07:53, Heiko Schocher a ?crit :

Quoted 7 lines

suggested from Daniel Hobi<[email protected]>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

Quoted 6 lines
Quoted 3 lines
cc Daniel Hobi<[email protected]>
cc Albert ARIBAUD<[email protected]>

I'm a bit uneasy about having the symbol unaligned and the aligning done by the code (and in different places):

ok.

Quoted 10 lines

arch/arm/lib/board.c void board_init_f (ulong bootflag)

Quoted 6 lines

ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)

arch/arm/lib/board.c +2 -1
+    bic    sp, sp, #7 /* 8-byte alignment for ABI compliance */
 
-    gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR);
+    gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR)&  ~0x07);

There is always a risk that overhauls of the code, or new uses elsewhere in the code, forget about the alignment constraint and use the symbol straight away, which could cause all sorts of hard to debug issues.

Ok.

Quoted 2 lines

Could we not align the symbol value itself so that the code simply uses the symbol?

Hmm.. but users can forgot to align the symbol ... and I think, code should not change that often in this place ...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#10 lore raw

PATCH 1/1 arm: add 8-byte alignment for ABI compliance before board_init_f

In reply to Heiko Schocher

Dear Heiko Schocher,

Quoted 19 lines · In message <[email protected]> you wrote:

suggested from Daniel Hobi<[email protected]>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

cc Daniel Hobi <[email protected]>
cc Albert ARIBAUD <[email protected]>
---
 arch/arm/cpu/arm1136/start.S   |    1 +
 arch/arm/cpu/arm1176/start.S   |    1 +
 arch/arm/cpu/arm720t/start.S   |    1 +
 arch/arm/cpu/arm920t/start.S   |    1 +
 arch/arm/cpu/arm925t/start.S   |    1 +
 arch/arm/cpu/arm926ejs/start.S |    1 +
 arch/arm/cpu/arm946es/start.S  |    1 +
 arch/arm/cpu/arm_intcm/start.S |    1 +
Quoted 8 lines
 arch/arm/cpu/armv7/start.S     |    1 +
 arch/arm/cpu/ixp/start.S       |    1 +
 arch/arm/cpu/lh7a40x/start.S   |    1 +
 arch/arm/cpu/pxa/start.S       |    1 +
 arch/arm/cpu/s3c44b0/start.S   |    1 +
 arch/arm/cpu/sa1100/start.S    |    1 +
 arch/arm/lib/board.c           |    2 +-
 15 files changed, 15 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Our way is peace.
	-- Septimus, the Son Worshiper, "Bread and Circuses",
	   stardate 4040.7.