Commit 2c12393f authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/603: use physical address directly in TLB miss handlers. 



Since commit c62ce9ef ("powerpc: remove remaining bits from
CONFIG_APUS"), tophys() has become a pure constant operation.
PAGE_OFFSET is known at compile time so the physical address
can be builtin directly.

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

arch/powerpc/kernel/head_32.S

+6 −9
Original line number Diff line number Diff line
@@ -505,9 +505,8 @@ InstructionTLBMiss: 
	bge-	112f

	mfspr	r2,SPRN_SRR1		/* and MSR_PR bit from SRR1 */

	rlwimi	r1,r2,32-12,29,29	/* shift MSR_PR to _PAGE_USER posn */

	lis	r2,swapper_pg_dir@ha	/* if kernel address, use */

	addi	r2,r2,swapper_pg_dir@l	/* kernel page table */

	tophys(r2,r2)

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */

	lwz	r2,0(r2)		/* get pmd entry */

	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */
@@ -578,9 +577,8 @@ DataLoadTLBMiss: 
	bge-	112f

	mfspr	r2,SPRN_SRR1		/* and MSR_PR bit from SRR1 */

	rlwimi	r1,r2,32-12,29,29	/* shift MSR_PR to _PAGE_USER posn */

	lis	r2,swapper_pg_dir@ha	/* if kernel address, use */

	addi	r2,r2,swapper_pg_dir@l	/* kernel page table */

	tophys(r2,r2)

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */

	lwz	r2,0(r2)		/* get pmd entry */

	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */
@@ -661,9 +659,8 @@ DataStoreTLBMiss: 
	bge-	112f

	mfspr	r2,SPRN_SRR1		/* and MSR_PR bit from SRR1 */

	rlwimi	r1,r2,32-12,29,29	/* shift MSR_PR to _PAGE_USER posn */

	lis	r2,swapper_pg_dir@ha	/* if kernel address, use */

	addi	r2,r2,swapper_pg_dir@l	/* kernel page table */

	tophys(r2,r2)

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */

	lwz	r2,0(r2)		/* get pmd entry */

	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */

CRA Git | Maintained and supported by SUSTech CRA and CCSE