diff mbox

[U-Boot] gic: fixed compilation error in GICv2 wait for interrupt macro

Message ID 1414411636-23806-1-git-send-email-yehuday@marvell.com
State Awaiting Upstream
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Yehuda Yitschak Oct. 27, 2014, 12:07 p.m. UTC
a hexadicemal value was missing the "0x" prefix which caused
	assembler error

Signed-off-by: Yehuda Yitschak <yehuday@marvell.com>
---
 arch/arm/include/asm/macro.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Albert ARIBAUD Oct. 27, 2014, 1:04 p.m. UTC | #1
Hello Yehuda,

On Mon, 27 Oct 2014 14:07:16 +0200, Yehuda Yitschak
<yehuday@marvell.com> wrote:
> 	a hexadicemal value was missing the "0x" prefix which caused
> 	assembler error
> 
> Signed-off-by: Yehuda Yitschak <yehuday@marvell.com>
> ---
>  arch/arm/include/asm/macro.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h
> index 541b443..1c8c425 100644
> --- a/arch/arm/include/asm/macro.h
> +++ b/arch/arm/include/asm/macro.h
> @@ -193,7 +193,7 @@ lr	.req	x30
>  0 :	wfi
>  	ldr     \wreg2, [\xreg1, GICC_AIAR]
>  	str     \wreg2, [\xreg1, GICC_AEOIR]
> -	and	\wreg2, \wreg2, #3ff
> +	and	\wreg2, \wreg2, #0x3ff
>  	cbnz    \wreg2, 0b
>  .endm
>  #endif
> -- 
> 1.8.1.2

Which board(s) does this error show up in?

Amicalement,
Yehuda Yitschak Oct. 27, 2014, 2:29 p.m. UTC | #2
Hello Albert

> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net]
> Sent: Monday, October 27, 2014 15:05
> To: Yehuda Yitschak
> Cc: u-boot@lists.denx.de; arnab.basu@freescale.com;
> fenghua@phytium.com.cn; yorksun@freescale.com;
> scottwood@freescale.com
> Subject: Re: [PATCH] gic: fixed compilation error in GICv2 wait for interrupt
> macro
> 
> Hello Yehuda,
> 
> On Mon, 27 Oct 2014 14:07:16 +0200, Yehuda Yitschak
> <yehuday@marvell.com> wrote:
> > 	a hexadicemal value was missing the "0x" prefix which caused
> > 	assembler error
> >
> > Signed-off-by: Yehuda Yitschak <yehuday@marvell.com>
> > ---
> >  arch/arm/include/asm/macro.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/include/asm/macro.h
> > b/arch/arm/include/asm/macro.h index 541b443..1c8c425 100644
> > --- a/arch/arm/include/asm/macro.h
> > +++ b/arch/arm/include/asm/macro.h
> > @@ -193,7 +193,7 @@ lr	.req	x30
> >  0 :	wfi
> >  	ldr     \wreg2, [\xreg1, GICC_AIAR]
> >  	str     \wreg2, [\xreg1, GICC_AEOIR]
> > -	and	\wreg2, \wreg2, #3ff
> > +	and	\wreg2, \wreg2, #0x3ff
> >  	cbnz    \wreg2, 0b
> >  .endm
> >  #endif
> > --
> > 1.8.1.2
> 
> Which board(s) does this error show up in?

There is no board in u-boot 2014.01 that use GICv2. I guess this is why it went under radar
I use mainline u-boot for one of my platforms so I noticed the bug once I rebased to 2014.10

Yehuda 

> 
> Amicalement,
> --
> Albert.
Albert ARIBAUD Oct. 27, 2014, 5:12 p.m. UTC | #3
Hello Yehuda,

On Mon, 27 Oct 2014 14:29:09 +0000, Yehuda Yitschak
<yehuday@marvell.com> wrote:
> Hello Albert

> > Which board(s) does this error show up in?
> 
> There is no board in u-boot 2014.01 that use GICv2. I guess this is why it went under radar
> I use mainline u-boot for one of my platforms so I noticed the bug once I rebased to 2014.10

Thanks for the explanation.

> Yehuda 

Amicalement,
Albert ARIBAUD Oct. 28, 2014, 6:58 a.m. UTC | #4
Hello Yehuda,

On Mon, 27 Oct 2014 14:07:16 +0200, Yehuda Yitschak
<yehuday@marvell.com> wrote:
> 	a hexadicemal value was missing the "0x" prefix which caused
> 	assembler error
> 
> Signed-off-by: Yehuda Yitschak <yehuday@marvell.com>
> ---
>  arch/arm/include/asm/macro.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h
> index 541b443..1c8c425 100644
> --- a/arch/arm/include/asm/macro.h
> +++ b/arch/arm/include/asm/macro.h
> @@ -193,7 +193,7 @@ lr	.req	x30
>  0 :	wfi
>  	ldr     \wreg2, [\xreg1, GICC_AIAR]
>  	str     \wreg2, [\xreg1, GICC_AEOIR]
> -	and	\wreg2, \wreg2, #3ff
> +	and	\wreg2, \wreg2, #0x3ff
>  	cbnz    \wreg2, 0b
>  .endm
>  #endif
> -- 
> 1.8.1.2

Applied to u-boot-arm/master (as a preventive bug fix), thanks!

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h
index 541b443..1c8c425 100644
--- a/arch/arm/include/asm/macro.h
+++ b/arch/arm/include/asm/macro.h
@@ -193,7 +193,7 @@  lr	.req	x30
 0 :	wfi
 	ldr     \wreg2, [\xreg1, GICC_AIAR]
 	str     \wreg2, [\xreg1, GICC_AEOIR]
-	and	\wreg2, \wreg2, #3ff
+	and	\wreg2, \wreg2, #0x3ff
 	cbnz    \wreg2, 0b
 .endm
 #endif