* [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling
@ 2011-08-03 16:26 Lennert Buytenhek
2011-08-04 9:28 ` Eric Miao
0 siblings, 1 reply; 4+ messages in thread
From: Lennert Buytenhek @ 2011-08-03 16:26 UTC (permalink / raw)
To: linux-arm-kernel
This got added in:
commit ef6c84454f8567d4968c210d7d194fb711ed3739
Author: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed Nov 24 11:54:25 2010 +0800
ARM: pxa: add iwmmx support for PJ4
which does:
- mrc p15, 0, r2, c15, c1, 0
- orr r2, r2, #0x3 @ enable access to CP0 and CP1
- mcr p15, 0, r2, c15, c1, 0
+ @ enable access to CP0 and CP1
+ XSC(mrc p15, 0, r2, c15, c1, 0)
+ XSC(orr r2, r2, #0x3)
+ XSC(mcr p15, 0, r2, c15, c1, 0)
but then later does:
- mrc p15, 0, r4, c15, c1, 0
- orr r4, r4, #0x3 @ enable access to CP0 and CP1
- mcr p15, 0, r4, c15, c1, 0
+ @ enable access to CP0 and CP1
+ XSC(mrc p15, 0, r4, c15, c1, 0)
+ XSC(orr r4, r4, #0xf)
+ XSC(mcr p15, 0, r4, c15, c1, 0)
Signed-off-by: Lennert Buytenhek <buytenh@laptop.org>
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
index 7fa3bb0..194a767 100644
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@ -195,10 +195,10 @@ ENTRY(iwmmxt_task_disable)
@ enable access to CP0 and CP1
XSC(mrc p15, 0, r4, c15, c1, 0)
- XSC(orr r4, r4, #0xf)
+ XSC(orr r4, r4, #0x3)
XSC(mcr p15, 0, r4, c15, c1, 0)
PJ4(mrc p15, 0, r4, c1, c0, 2)
- PJ4(orr r4, r4, #0x3)
+ PJ4(orr r4, r4, #0xf)
PJ4(mcr p15, 0, r4, c1, c0, 2)
mov r0, #0 @ nothing to load
@@ -313,7 +313,7 @@ ENTRY(iwmmxt_task_switch)
teq r2, r3 @ next task owns it?
movne pc, lr @ no: leave Concan disabled
-1: @ flip Conan access
+1: @ flip Concan access
XSC(eor r1, r1, #0x3)
XSC(mcr p15, 0, r1, c15, c1, 0)
PJ4(eor r1, r1, #0xf)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling
2011-08-03 16:26 [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling Lennert Buytenhek
@ 2011-08-04 9:28 ` Eric Miao
2011-08-04 9:58 ` Haojian Zhuang
0 siblings, 1 reply; 4+ messages in thread
From: Eric Miao @ 2011-08-04 9:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 3, 2011 at 5:26 PM, Lennert Buytenhek
<buytenh@wantstofly.org> wrote:
> This got added in:
>
> ? ? ? ?commit ef6c84454f8567d4968c210d7d194fb711ed3739
> ? ? ? ?Author: Haojian Zhuang <haojian.zhuang@marvell.com>
> ? ? ? ?Date: ? Wed Nov 24 11:54:25 2010 +0800
>
> ? ? ? ? ? ?ARM: pxa: add iwmmx support for PJ4
This looks correct to me. Haojian, you have any comments?
>
> which does:
>
> - ? ? ? mrc ? ? p15, 0, r2, c15, c1, 0
> - ? ? ? orr ? ? r2, r2, #0x3 ? ? ? ? ? ? ? ? ? ?@ enable access to CP0 and CP1
> - ? ? ? mcr ? ? p15, 0, r2, c15, c1, 0
> + ? ? ? @ enable access to CP0 and CP1
> + ? ? ? XSC(mrc p15, 0, r2, c15, c1, 0)
> + ? ? ? XSC(orr r2, r2, #0x3)
> + ? ? ? XSC(mcr p15, 0, r2, c15, c1, 0)
>
> but then later does:
>
> - ? ? ? mrc ? ? p15, 0, r4, c15, c1, 0
> - ? ? ? orr ? ? r4, r4, #0x3 ? ? ? ? ? ? ? ? ? ?@ enable access to CP0 and CP1
> - ? ? ? mcr ? ? p15, 0, r4, c15, c1, 0
> + ? ? ? @ enable access to CP0 and CP1
> + ? ? ? XSC(mrc p15, 0, r4, c15, c1, 0)
> + ? ? ? XSC(orr r4, r4, #0xf)
> + ? ? ? XSC(mcr p15, 0, r4, c15, c1, 0)
>
> Signed-off-by: Lennert Buytenhek <buytenh@laptop.org>
>
> diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
> index 7fa3bb0..194a767 100644
> --- a/arch/arm/kernel/iwmmxt.S
> +++ b/arch/arm/kernel/iwmmxt.S
> @@ -195,10 +195,10 @@ ENTRY(iwmmxt_task_disable)
>
> ? ? ? ?@ enable access to CP0 and CP1
> ? ? ? ?XSC(mrc p15, 0, r4, c15, c1, 0)
> - ? ? ? XSC(orr r4, r4, #0xf)
> + ? ? ? XSC(orr r4, r4, #0x3)
> ? ? ? ?XSC(mcr p15, 0, r4, c15, c1, 0)
> ? ? ? ?PJ4(mrc p15, 0, r4, c1, c0, 2)
> - ? ? ? PJ4(orr r4, r4, #0x3)
> + ? ? ? PJ4(orr r4, r4, #0xf)
> ? ? ? ?PJ4(mcr p15, 0, r4, c1, c0, 2)
>
> ? ? ? ?mov ? ? r0, #0 ? ? ? ? ? ? ? ? ? ? ? ? ?@ nothing to load
> @@ -313,7 +313,7 @@ ENTRY(iwmmxt_task_switch)
> ? ? ? ?teq ? ? r2, r3 ? ? ? ? ? ? ? ? ? ? ? ? ?@ next task owns it?
> ? ? ? ?movne ? pc, lr ? ? ? ? ? ? ? ? ? ? ? ? ?@ no: leave Concan disabled
>
> -1: ? ? @ flip Conan access
> +1: ? ? @ flip Concan access
> ? ? ? ?XSC(eor r1, r1, #0x3)
> ? ? ? ?XSC(mcr p15, 0, r1, c15, c1, 0)
> ? ? ? ?PJ4(eor r1, r1, #0xf)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling
2011-08-04 9:28 ` Eric Miao
@ 2011-08-04 9:58 ` Haojian Zhuang
2011-08-11 1:46 ` Haojian Zhuang
0 siblings, 1 reply; 4+ messages in thread
From: Haojian Zhuang @ 2011-08-04 9:58 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2011-08-04 at 02:28 -0700, Eric Miao wrote:
> On Wed, Aug 3, 2011 at 5:26 PM, Lennert Buytenhek
> <buytenh@wantstofly.org> wrote:
> > This got added in:
> >
> > commit ef6c84454f8567d4968c210d7d194fb711ed3739
> > Author: Haojian Zhuang <haojian.zhuang@marvell.com>
> > Date: Wed Nov 24 11:54:25 2010 +0800
> >
> > ARM: pxa: add iwmmx support for PJ4
>
> This looks correct to me. Haojian, you have any comments?
>
Yes, it fix a bug.
Thanks
Haojian
> >
> > which does:
> >
> > - mrc p15, 0, r2, c15, c1, 0
> > - orr r2, r2, #0x3 @ enable access to CP0 and CP1
> > - mcr p15, 0, r2, c15, c1, 0
> > + @ enable access to CP0 and CP1
> > + XSC(mrc p15, 0, r2, c15, c1, 0)
> > + XSC(orr r2, r2, #0x3)
> > + XSC(mcr p15, 0, r2, c15, c1, 0)
> >
> > but then later does:
> >
> > - mrc p15, 0, r4, c15, c1, 0
> > - orr r4, r4, #0x3 @ enable access to CP0 and CP1
> > - mcr p15, 0, r4, c15, c1, 0
> > + @ enable access to CP0 and CP1
> > + XSC(mrc p15, 0, r4, c15, c1, 0)
> > + XSC(orr r4, r4, #0xf)
> > + XSC(mcr p15, 0, r4, c15, c1, 0)
> >
> > Signed-off-by: Lennert Buytenhek <buytenh@laptop.org>
> >
> > diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
> > index 7fa3bb0..194a767 100644
> > --- a/arch/arm/kernel/iwmmxt.S
> > +++ b/arch/arm/kernel/iwmmxt.S
> > @@ -195,10 +195,10 @@ ENTRY(iwmmxt_task_disable)
> >
> > @ enable access to CP0 and CP1
> > XSC(mrc p15, 0, r4, c15, c1, 0)
> > - XSC(orr r4, r4, #0xf)
> > + XSC(orr r4, r4, #0x3)
> > XSC(mcr p15, 0, r4, c15, c1, 0)
> > PJ4(mrc p15, 0, r4, c1, c0, 2)
> > - PJ4(orr r4, r4, #0x3)
> > + PJ4(orr r4, r4, #0xf)
> > PJ4(mcr p15, 0, r4, c1, c0, 2)
> >
> > mov r0, #0 @ nothing to load
> > @@ -313,7 +313,7 @@ ENTRY(iwmmxt_task_switch)
> > teq r2, r3 @ next task owns it?
> > movne pc, lr @ no: leave Concan disabled
> >
> > -1: @ flip Conan access
> > +1: @ flip Concan access
> > XSC(eor r1, r1, #0x3)
> > XSC(mcr p15, 0, r1, c15, c1, 0)
> > PJ4(eor r1, r1, #0xf)
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling
2011-08-04 9:58 ` Haojian Zhuang
@ 2011-08-11 1:46 ` Haojian Zhuang
0 siblings, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2011-08-11 1:46 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Aug 4, 2011 at 5:58 PM, Haojian Zhuang
<haojian.zhuang@marvell.com> wrote:
> On Thu, 2011-08-04 at 02:28 -0700, Eric Miao wrote:
>> On Wed, Aug 3, 2011 at 5:26 PM, Lennert Buytenhek
>> <buytenh@wantstofly.org> wrote:
>> > This got added in:
>> >
>> > ? ? ? ?commit ef6c84454f8567d4968c210d7d194fb711ed3739
>> > ? ? ? ?Author: Haojian Zhuang <haojian.zhuang@marvell.com>
>> > ? ? ? ?Date: ? Wed Nov 24 11:54:25 2010 +0800
>> >
>> > ? ? ? ? ? ?ARM: pxa: add iwmmx support for PJ4
>>
>> This looks correct to me. Haojian, you have any comments?
>>
Acked-by Haojian <haojian.zhuang@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-11 1:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 16:26 [PATCH] ARM: pxa: fix logic error in PJ4 iWMMXt handling Lennert Buytenhek
2011-08-04 9:28 ` Eric Miao
2011-08-04 9:58 ` Haojian Zhuang
2011-08-11 1:46 ` Haojian Zhuang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).