Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PARISC] fix crash in flush_icache_page_asm on PA1.1

Browse source 
As pointed out by serveral people, PA1.1 only has a type 26 instruction
meaning that the space register must be explicitly encoded.  Not giving an
explicit space means that the compiler uses the type 24 version which is PA2.0
only resulting in an illegal instruction crash.

This regression was caused by

    commit f311847c2f
    Author: James Bottomley <James.Bottomley@HansenPartnership.com>
    Date:   Wed Dec 22 10:22:11 2010 -0600

        parisc: flush pages through tmpalias space

Reported-by: Helge Deller <deller@gmx.de>
Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org	#2.6.39+
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
John David Anglin 2012-05-16 10:14:52 +01:00 committed by James Bottomley
parent 5e185581d7
commit 207f583d71
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/parisc/kernel/pacache.S
View file

@ -692,7 +692,7 @@ ENTRY(flush_icache_page_asm)
/* Purge any old translation */ /* Purge any old translation */
pitlb (%sr0,%r28) pitlb (%sr4,%r28)
ldil L%icache_stride, %r1 ldil L%icache_stride, %r1
ldw R%icache_stride(%r1), %r1 ldw R%icache_stride(%r1), %r1
@ -706,27 +706,29 @@ ENTRY(flush_icache_page_asm)
sub %r25, %r1, %r25 sub %r25, %r1, %r25
1: fic,m %r1(%r28) /* fic only has the type 26 form on PA1.1, requiring an
fic,m %r1(%r28) * explicit space specification, so use %sr4 */
fic,m %r1(%r28) 1: fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
fic,m %r1(%sr4,%r28)
fic,m %r1(%sr4,%r28)
cmpb,COND(<<) %r28, %r25,1b cmpb,COND(<<) %r28, %r25,1b
fic,m %r1(%r28) fic,m %r1(%sr4,%r28)
sync sync
bv %r0(%r2) bv %r0(%r2)
pitlb (%sr0,%r25) pitlb (%sr4,%r25)
.exit .exit
.procend .procend