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

Commit 4a280a41 authored by Joakim Tjernlund's avatar Joakim Tjernlund Committed by Benjamin Herrenschmidt
Browse files

powerpc/8xx: Add missing Guarded setting in DTLB Error. 



only DTLB Miss did set this bit, DTLB Error needs too otherwise
the setting is lost when the page becomes dirty.

Signed-off-by: default avatarJoakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0a2ab51f

arch/powerpc/kernel/head_8xx.S

+10 −3
Original line number Diff line number Diff line
@@ -553,8 +553,15 @@ DARFixed:/* Return from dcbx instruction bug workaround, r10 holds value of DAR 
	ori	r11, r11, 1		/* Set valid bit in physical L2 page */

	DO_8xx_CPU6(0x3b80, r3)

	mtspr	SPRN_MD_TWC, r11	/* Load pte table base address */

	mfspr	r11, SPRN_MD_TWC		/* ....and get the pte address */

	lwz	r10, 0(r11)		/* Get the pte */

	mfspr	r10, SPRN_MD_TWC	/* ....and get the pte address */

	lwz	r10, 0(r10)		/* Get the pte */

	/* Insert the Guarded flag into the TWC from the Linux PTE.

	 * It is bit 27 of both the Linux PTE and the TWC

	 */

	rlwimi	r11, r10, 0, 27, 27

	DO_8xx_CPU6(0x3b80, r3)

	mtspr	SPRN_MD_TWC, r11

	mfspr	r11, SPRN_MD_TWC	/* get the pte address again */



	ori	r10, r10, _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_HWWRITE

	stw	r10, 0(r11)		/* and update pte in table */