Patchwork [U-Boot] x86: turn off cache: set control register properly

login
register
mail settings
Submitter Ondrej Kupka
Date Sept. 30, 2011, 6:27 p.m.
Message ID <1317407227-8864-1-git-send-email-ondra.cap@gmail.com>
Download mbox | patch
Permalink /patch/117181/
State Accepted
Commit 7b3d5380eea55f5b2e21c592b256b7077698f766
Delegated to: Graeme Russ
Headers show

Comments

Ondrej Kupka - Sept. 30, 2011, 6:27 p.m.
Bits should be ORed when they are supposed to be added together

Cc: Graeme Russ <graeme.russ@gmail.com>
Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>
---
 arch/x86/cpu/start16.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Marek Vasut - Sept. 30, 2011, 8:24 p.m.
On Friday, September 30, 2011 08:27:07 PM Ondrej Kupka wrote:
> Bits should be ORed when they are supposed to be added together
> 
> Cc: Graeme Russ <graeme.russ@gmail.com>
> Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>
> ---
>  arch/x86/cpu/start16.S |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S
> index 3d3017a..9dabff2 100644
> --- a/arch/x86/cpu/start16.S
> +++ b/arch/x86/cpu/start16.S
> @@ -50,7 +50,7 @@ board_init16_ret:
> 
>  	/* Turn of cache (this might require a 486-class CPU) */
>  	movl	%cr0, %eax
> -	orl	$(X86_CR0_NW & X86_CR0_CD), %eax
> +	orl	$(X86_CR0_NW | X86_CR0_CD), %eax
>  	movl	%eax, %cr0
>  	wbinvd

Dear Ondrej Kupka,

Can we make this into some macro so we'd avoid such errors in the future ?

Cheers
Ondrej Kupka - Sept. 30, 2011, 8:56 p.m.
Dear Marek,

I am not really sure it would bring any advantage since it is used only on 2
places as far as I know and the meaning of those few lines of code is very
clear and commented...

Regards,
Ondra K.

On Fri, Sep 30, 2011 at 10:24 PM, Marek Vasut <marek.vasut@gmail.com> wrote:

> On Friday, September 30, 2011 08:27:07 PM Ondrej Kupka wrote:
> > Bits should be ORed when they are supposed to be added together
> >
> > Cc: Graeme Russ <graeme.russ@gmail.com>
> > Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>
> > ---
> >  arch/x86/cpu/start16.S |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S
> > index 3d3017a..9dabff2 100644
> > --- a/arch/x86/cpu/start16.S
> > +++ b/arch/x86/cpu/start16.S
> > @@ -50,7 +50,7 @@ board_init16_ret:
> >
> >       /* Turn of cache (this might require a 486-class CPU) */
> >       movl    %cr0, %eax
> > -     orl     $(X86_CR0_NW & X86_CR0_CD), %eax
> > +     orl     $(X86_CR0_NW | X86_CR0_CD), %eax
> >       movl    %eax, %cr0
> >       wbinvd
>
> Dear Ondrej Kupka,
>
> Can we make this into some macro so we'd avoid such errors in the future ?
>
> Cheers
>
Marek Vasut - Sept. 30, 2011, 9:01 p.m.
On Friday, September 30, 2011 10:56:03 PM Ondra Kupka wrote:
> Dear Marek,
> 
> I am not really sure it would bring any advantage since it is used only on
> 2 places as far as I know and the meaning of those few lines of code is
> very clear and commented...
> 
> Regards,
> Ondra K.

Dear Ondrej Kupka,

Please STOP TOP-POSTING !!

Otherwise ok.

Cheers
Graeme Russ - Oct. 16, 2011, 3:21 a.m.
On 01/10/11 04:27, Ondrej Kupka wrote:
> Bits should be ORed when they are supposed to be added together
> 
> Cc: Graeme Russ <graeme.russ@gmail.com>
> Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>
> ---
>  arch/x86/cpu/start16.S |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Applied to u-boot-x86

Thanks,

Graeme

Patch

diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S
index 3d3017a..9dabff2 100644
--- a/arch/x86/cpu/start16.S
+++ b/arch/x86/cpu/start16.S
@@ -50,7 +50,7 @@  board_init16_ret:
 
 	/* Turn of cache (this might require a 486-class CPU) */
 	movl	%cr0, %eax
-	orl	$(X86_CR0_NW & X86_CR0_CD), %eax
+	orl	$(X86_CR0_NW | X86_CR0_CD), %eax
 	movl	%eax, %cr0
 	wbinvd