Skip to contentSkip to conversation

powerpc: fix invalid use of register expressions

PATCH Applied Andreas Schwab 3 participants 5 messages Aug 5, 2017 – Aug 16, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: fix invalid use of register expressions

binutils >= 2.26 now warns about misuse of register expressions in assembler operands that are actually literals, for example:

arch/powerpc/kernel/entry_64.S:535: Warning: invalid register expression

---
 arch/powerpc/include/asm/ppc_asm.h |  2 +-
 arch/powerpc/kernel/swsusp_asm64.S |  2 +-
 arch/powerpc/kvm/book3s_64_slb.S   |  2 +-
 arch/powerpc/lib/copypage_power7.S | 14 ++++----
 arch/powerpc/lib/copyuser_power7.S | 66 +++++++++++++++++++-------------------
 arch/powerpc/lib/memcpy_power7.S   | 66 +++++++++++++++++++-------------------
 arch/powerpc/lib/string_64.S       |  2 +-
 7 files changed, 77 insertions(+), 77 deletions(-)
arch/powerpc/include/asm/ppc_asm.h +1 -1
index 6baeeb9acd..daeda2bbe1 100644
@@ -439,7 +439,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
 .machine push ;					\
 .machine "power4" ;				\
        lis     scratch,0x60000000@h;		\
-       dcbt    r0,scratch,0b01010;		\
+       dcbt    0,scratch,0b01010;		\
 .machine pop
 
 /*
arch/powerpc/kernel/swsusp_asm64.S +1 -1
index 988f38dced..82d8aae81c 100644
@@ -179,7 +179,7 @@ nothing_to_copy:
 	sld	r3, r3, r0
 	li	r0, 0
 1:
-	dcbf	r0,r3
+	dcbf	0,r3
 	addi	r3,r3,0x20
 	bdnz	1b
 
arch/powerpc/kvm/book3s_64_slb.S +1 -1
index 3589c4e3d4..688722acd6 100644
@@ -113,7 +113,7 @@ slb_do_enter:
 
 	/* Remove all SLB entries that are in use. */
 
-	li	r0, r0
+	li	r0, 0
 	slbmte	r0, r0
 	slbia
 
arch/powerpc/lib/copypage_power7.S +7 -7
index a84d333ecb..ca5fc8fa7e 100644
@@ -45,13 +45,13 @@ _GLOBAL(copypage_power7)
 .machine push
 .machine "power4"
 	/* setup read stream 0  */
-	dcbt	r0,r4,0b01000  	/* addr from */
-	dcbt	r0,r7,0b01010   /* length and depth from */
+	dcbt	0,r4,0b01000  	/* addr from */
+	dcbt	0,r7,0b01010   /* length and depth from */
 	/* setup write stream 1 */
-	dcbtst	r0,r9,0b01000   /* addr to */
-	dcbtst	r0,r10,0b01010  /* length and depth to */
+	dcbtst	0,r9,0b01000   /* addr to */
+	dcbtst	0,r10,0b01010  /* length and depth to */
 	eieio
-	dcbt	r0,r8,0b01010	/* all streams GO */
+	dcbt	0,r8,0b01010	/* all streams GO */
 .machine pop
 
 #ifdef CONFIG_ALTIVEC
@@ -83,7 +83,7 @@ _GLOBAL(copypage_power7)
 	li	r12,112
 
 	.align	5
-1:	lvx	v7,r0,r4
+1:	lvx	v7,0,r4
 	lvx	v6,r4,r6
 	lvx	v5,r4,r7
 	lvx	v4,r4,r8
@@ -92,7 +92,7 @@ _GLOBAL(copypage_power7)
 	lvx	v1,r4,r11
 	lvx	v0,r4,r12
 	addi	r4,r4,128
-	stvx	v7,r0,r3
+	stvx	v7,0,r3
 	stvx	v6,r3,r6
 	stvx	v5,r3,r7
 	stvx	v4,r3,r8
arch/powerpc/lib/copyuser_power7.S +33 -33

195 lines not on this page · raw message

arch/powerpc/lib/memcpy_power7.S +33 -33

194 lines not on this page · raw message

arch/powerpc/lib/string_64.S +1 -1
index d5b4d9498c..56aac4c220 100644
@@ -184,7 +184,7 @@ err1;	std	r0,8(r3)
 	mtctr	r6
 	mr	r8,r3
 14:
-err1;	dcbz	r0,r3
+err1;	dcbz	0,r3
 	add	r3,r3,r9
 	bdnz	14b
 
Signature · 7 lines
2.14.0


-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#1 lore raw
Quoted 6 lines · Andreas Schwab

binutils >= 2.26 now warns about misuse of register expressions in assembler operands that are actually literals, for example:

arch/powerpc/kernel/entry_64.S:535: Warning: invalid register expression

Quoted 9 lines
---
 arch/powerpc/include/asm/ppc_asm.h |  2 +-
 arch/powerpc/kernel/swsusp_asm64.S |  2 +-
 arch/powerpc/kvm/book3s_64_slb.S   |  2 +-
 arch/powerpc/lib/copypage_power7.S | 14 ++++----
 arch/powerpc/lib/copyuser_power7.S | 66 +++++++++++++++++++-------------------
 arch/powerpc/lib/memcpy_power7.S   | 66 +++++++++++++++++++-------------------
 arch/powerpc/lib/string_64.S       |  2 +-
 7 files changed, 77 insertions(+), 77 deletions(-)

Thanks. I updated the change log to mention that it's almost always s/r0/0/.

And I folded in:

arch/powerpc/purgatory/trampoline.S +1 -1
index 3696ea6c4826..30277446892c 100644
@@ -67,7 +67,7 @@ master:
 	mr	%r16,%r3	/* save dt address in reg16 */
 	li	%r4,20
 	LWZX_BE	%r6,%r3,%r4	/* fetch __be32 version number at byte 20 */
-	cmpwi	%r0,%r6,2	/* v2 or later? */
+	cmpwi	%cr0,%r6,2	/* v2 or later? */
 	blt	1f
 	li	%r4,28
 	STWX_BE	%r17,%r3,%r4	/* Store my cpu as __be32 at byte 28 */

cheers

#2 lore raw
In reply to Michael Ellerman

This fixes another invalid use of register expressions.

---
 arch/powerpc/kernel/l2cr_6xx.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/l2cr_6xx.S +2 -2
index 97ec8557f9..6408f09dbb 100644
@@ -181,7 +181,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
 	mtctr	r4
 	li	r4,0
 1:
-	lwzx	r0,r0,r4
+	lwzx	r0,0,r4
 	addi	r4,r4,32		/* Go to start of next cache line */
 	bdnz	1b
 	isync
@@ -328,7 +328,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_L3CR)
 	mtctr	r4
 	li	r4,0
 1:
-	lwzx	r0,r0,r4
+	lwzx	r0,0,r4
 	dcbf	0,r4
 	addi	r4,r4,32		/* Go to start of next cache line */
 	bdnz	1b
Signature · 6 lines
2.14.1

-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."