瀏覽代碼

powerpc: Fixes for instructions not using correct register naming

These macros are using integers where they could be using logical
names since they take registers.

We are going to enforce this soon, so fix these up now.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Michael Neuling 13 年之前
父節點
當前提交
e55174e911
共有 4 個文件被更改,包括 13 次插入13 次删除
  1. 4 4
      arch/powerpc/kernel/exceptions-64e.S
  2. 2 2
      arch/powerpc/kernel/misc_64.S
  3. 2 2
      arch/powerpc/lib/ldstfp.S
  4. 5 5
      arch/powerpc/mm/tlb_nohash_low.S

+ 4 - 4
arch/powerpc/kernel/exceptions-64e.S

@@ -903,7 +903,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 	bne	1b				/* If not, repeat */
 	bne	1b				/* If not, repeat */
 
 
 	/* Invalidate all TLBs */
 	/* Invalidate all TLBs */
-	PPC_TLBILX_ALL(0,0)
+	PPC_TLBILX_ALL(R0,R0)
 	sync
 	sync
 	isync
 	isync
 
 
@@ -961,7 +961,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 	tlbwe
 	tlbwe
 
 
 	/* Invalidate TLB1 */
 	/* Invalidate TLB1 */
-	PPC_TLBILX_ALL(0,0)
+	PPC_TLBILX_ALL(R0,R0)
 	sync
 	sync
 	isync
 	isync
 
 
@@ -1020,7 +1020,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 	tlbwe
 	tlbwe
 
 
 	/* Invalidate TLB1 */
 	/* Invalidate TLB1 */
-	PPC_TLBILX_ALL(0,0)
+	PPC_TLBILX_ALL(R0,R0)
 	sync
 	sync
 	isync
 	isync
 
 
@@ -1138,7 +1138,7 @@ a2_tlbinit_after_iprot_flush:
 	tlbwe
 	tlbwe
 #endif /* CONFIG_PPC_EARLY_DEBUG_WSP */
 #endif /* CONFIG_PPC_EARLY_DEBUG_WSP */
 
 
-	PPC_TLBILX(0,0,0)
+	PPC_TLBILX(0,R0,R0)
 	sync
 	sync
 	isync
 	isync
 
 

+ 2 - 2
arch/powerpc/kernel/misc_64.S

@@ -309,7 +309,7 @@ _GLOBAL(real_205_readb)
 	mtmsrd	r0
 	mtmsrd	r0
 	sync
 	sync
 	isync
 	isync
-	LBZCIX(R3,0,R3)
+	LBZCIX(R3,R0,R3)
 	isync
 	isync
 	mtmsrd	r7
 	mtmsrd	r7
 	sync
 	sync
@@ -324,7 +324,7 @@ _GLOBAL(real_205_writeb)
 	mtmsrd	r0
 	mtmsrd	r0
 	sync
 	sync
 	isync
 	isync
-	STBCIX(R3,0,R4)
+	STBCIX(R3,R0,R4)
 	isync
 	isync
 	mtmsrd	r7
 	mtmsrd	r7
 	sync
 	sync

+ 2 - 2
arch/powerpc/lib/ldstfp.S

@@ -332,7 +332,7 @@ _GLOBAL(do_lxvd2x)
 	beq	cr7,1f
 	beq	cr7,1f
 	STXVD2X(0,R1,R8)
 	STXVD2X(0,R1,R8)
 1:	li	r9,-EFAULT
 1:	li	r9,-EFAULT
-2:	LXVD2X(0,0,R4)
+2:	LXVD2X(0,R0,R4)
 	li	r9,0
 	li	r9,0
 3:	beq	cr7,4f
 3:	beq	cr7,4f
 	bl	put_vsr
 	bl	put_vsr
@@ -361,7 +361,7 @@ _GLOBAL(do_stxvd2x)
 	STXVD2X(0,R1,R8)
 	STXVD2X(0,R1,R8)
 	bl	get_vsr
 	bl	get_vsr
 1:	li	r9,-EFAULT
 1:	li	r9,-EFAULT
-2:	STXVD2X(0,0,R4)
+2:	STXVD2X(0,R0,R4)
 	li	r9,0
 	li	r9,0
 3:	beq	cr7,4f
 3:	beq	cr7,4f
 	LXVD2X(0,R1,R8)
 	LXVD2X(0,R1,R8)

+ 5 - 5
arch/powerpc/mm/tlb_nohash_low.S

@@ -266,7 +266,7 @@ BEGIN_MMU_FTR_SECTION
 	andi.	r3,r3,MMUCSR0_TLBFI@l
 	andi.	r3,r3,MMUCSR0_TLBFI@l
 	bne	1b
 	bne	1b
 MMU_FTR_SECTION_ELSE
 MMU_FTR_SECTION_ELSE
-	PPC_TLBILX_ALL(0,0)
+	PPC_TLBILX_ALL(R0,R0)
 ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
 ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
 	msync
 	msync
 	isync
 	isync
@@ -279,7 +279,7 @@ BEGIN_MMU_FTR_SECTION
 	wrteei	0
 	wrteei	0
 	mfspr	r4,SPRN_MAS6	/* save MAS6 */
 	mfspr	r4,SPRN_MAS6	/* save MAS6 */
 	mtspr	SPRN_MAS6,r3
 	mtspr	SPRN_MAS6,r3
-	PPC_TLBILX_PID(0,0)
+	PPC_TLBILX_PID(R0,R0)
 	mtspr	SPRN_MAS6,r4	/* restore MAS6 */
 	mtspr	SPRN_MAS6,r4	/* restore MAS6 */
 	wrtee	r10
 	wrtee	r10
 MMU_FTR_SECTION_ELSE
 MMU_FTR_SECTION_ELSE
@@ -331,7 +331,7 @@ _GLOBAL(_tlbil_pid)
 	mfmsr	r10
 	mfmsr	r10
 	wrteei	0
 	wrteei	0
 	mtspr	SPRN_MAS6,r4
 	mtspr	SPRN_MAS6,r4
-	PPC_TLBILX_PID(0,0)
+	PPC_TLBILX_PID(R0,R0)
 	wrtee	r10
 	wrtee	r10
 	msync
 	msync
 	isync
 	isync
@@ -343,14 +343,14 @@ _GLOBAL(_tlbil_pid_noind)
 	ori	r4,r4,MAS6_SIND
 	ori	r4,r4,MAS6_SIND
 	wrteei	0
 	wrteei	0
 	mtspr	SPRN_MAS6,r4
 	mtspr	SPRN_MAS6,r4
-	PPC_TLBILX_PID(0,0)
+	PPC_TLBILX_PID(R0,R0)
 	wrtee	r10
 	wrtee	r10
 	msync
 	msync
 	isync
 	isync
 	blr
 	blr
 
 
 _GLOBAL(_tlbil_all)
 _GLOBAL(_tlbil_all)
-	PPC_TLBILX_ALL(0,0)
+	PPC_TLBILX_ALL(R0,R0)
 	msync
 	msync
 	isync
 	isync
 	blr
 	blr