Skip to contentSkip to conversation

powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW

PATCH In review Kumar Gala 3 participants 3 messages Feb 10, 2009 – Feb 16, 2009 PowerPC

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW

The following commit:

commit 64b3d0e8122b422e879b23d42f9e0e8efbbf9744

Author: Benjamin Herrenschmidt <[email protected]>
Date:   Thu Dec 18 19:13:51 2008 +0000

powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED

broke setting of the _PAGE_COHERENT bit in the PPC HW PTE. Since we now actually set _PAGE_COHERENT in the Linux PTE we shouldn't be clearing it out before we propogate it to the PPC HW PTE.

---
 arch/powerpc/mm/hash_low_32.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/mm/hash_low_32.S +1 -1
index 67850ec..14af8ce 100644
@@ -320,7 +320,7 @@ _GLOBAL(create_hpte)
 	and	r8,r8,r0		/* writable if _RW & _DIRTY */
 	rlwimi	r5,r5,32-1,30,30	/* _PAGE_USER -> PP msb */
 	rlwimi	r5,r5,32-2,31,31	/* _PAGE_USER -> PP lsb */
-	ori	r8,r8,0xe14		/* clear out reserved bits and M */
+	ori	r8,r8,0xe04		/* clear out reserved bits */
 	andc	r8,r5,r8		/* PP = user? (rw&dirty? 2: 3): 0 */
 BEGIN_FTR_SECTION
 	rlwinm	r8,r8,0,~_PAGE_COHERENT	/* clear M (coherence not required) */
Signature · 1 line
1.5.6.6
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Kumar Gala

The following commit:

commit 64b3d0e8122b422e879b23d42f9e0e8efbbf9744

Author: Benjamin Herrenschmidt <[email protected]>
Date:   Thu Dec 18 19:13:51 2008 +0000
Quoted 8 lines

powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED

broke setting of the _PAGE_COHERENT bit in the PPC HW PTE. Since we now actually set _PAGE_COHERENT in the Linux PTE we shouldn't be clearing it out before we propogate it to the PPC HW PTE.

I've booted 8641 dual-core and run LTP to completion with an expected number of fails. So....

-B

Quoted 20 lines

---
arch/powerpc/mm/hash_low_32.S | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/mm/hash_low_32.S +1 -1
index 67850ec..14af8ce 100644
@@ -320,7 +320,7 @@ _GLOBAL(create_hpte)
 	and	r8,r8,r0		/* writable if _RW & _DIRTY */
 	rlwimi	r5,r5,32-1,30,30	/* _PAGE_USER -> PP msb */
 	rlwimi	r5,r5,32-2,31,31	/* _PAGE_USER -> PP lsb */
-	ori	r8,r8,0xe14		/* clear out reserved bits and M */
+	ori	r8,r8,0xe04		/* clear out reserved bits */
 	andc	r8,r5,r8		/* PP = user? (rw&dirty? 2: 3): 0 */

BEGIN_FTR_SECTION
rlwinm r8,r8,0,~_PAGE_COHERENT /* clear M (coherence not required) */

Signature · 1 line
1.5.6.6
#2 lore raw
In reply to Kumar Gala
Quoted 23 lines · Kumar Gala

The following commit:

commit 64b3d0e8122b422e879b23d42f9e0e8efbbf9744

Author: Benjamin Herrenschmidt <[email protected]>
Date:   Thu Dec 18 19:13:51 2008 +0000

powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED

broke setting of the _PAGE_COHERENT bit in the PPC HW PTE. Since we now actually set _PAGE_COHERENT in the Linux PTE we shouldn't be clearing it out before we propogate it to the PPC HW PTE.

---
 arch/powerpc/mm/hash_low_32.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/mm/hash_low_32.S +0 -0
index 67850ec..14af8ce 100644

arch/powerpc/mm/hash_low_32.S _GLOBAL(create_hpte) · line 326

Quoted 8 lines
arch/powerpc/mm/hash_low_32.S +1 -1
@@ -320,7 +320,7 @@ _GLOBAL(create_hpte)
 	and	r8,r8,r0		/* writable if _RW & _DIRTY */
 	rlwimi	r5,r5,32-1,30,30	/* _PAGE_USER -> PP msb */
 	rlwimi	r5,r5,32-2,31,31	/* _PAGE_USER -> PP lsb */
-	ori	r8,r8,0xe14		/* clear out reserved bits and M */
+	ori	r8,r8,0xe04		/* clear out reserved bits */
 	andc	r8,r5,r8		/* PP = user? (rw&dirty? 2: 3): 0 */
 BEGIN_FTR_SECTION
 	rlwinm	r8,r8,0,~_PAGE_COHERENT	/* clear M (coherence not required) */

This does indeed resolve the problem I was having.

Sorry for not replying sooner - bad weather here in the UK unexpectedly extended a planned holiday.

Thank you for resolving this issue,

Martyn

Signature · 4 lines
Martyn Welch MEng MPhil MIET (Principal Software Engineer)   T:+44(0)1327322748
GE Fanuc Intelligent Platforms Ltd,        |Registered in England and Wales
Tove Valley Business Park, Towcester,      |(3828642) at 100 Barbirolli Square,
Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB  VAT:GB 729849476