Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a05a30 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/603: Don't handle _PAGE_RW and _PAGE_DIRTY on ITLB misses 



_PAGE_RW and _PAGE_DIRTY do not matter for ITLB misses.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a8a12199

arch/powerpc/kernel/head_32.S

+2 −6
Original line number Diff line number Diff line
@@ -526,13 +526,9 @@ InstructionTLBMiss: 
	 */

	stw	r0,0(r2)		/* update PTE (accessed bit) */

	/* Convert linux-style PTE to low word of PPC-style PTE */

	rlwinm	r1,r0,32-10,31,31	/* _PAGE_RW -> PP lsb */

	rlwinm	r2,r0,32-7,31,31	/* _PAGE_DIRTY -> PP lsb */

	and	r1,r1,r2		/* writable if _RW and _DIRTY */

	rlwimi	r0,r0,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r0,r0,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r0,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

	ori	r1, r1, 0xe05		/* clear out reserved bits */

	andc	r1, r0, r1		/* PP = user? 2 : 0 */

BEGIN_FTR_SECTION

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

END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT)