Skip to contentSkip to conversation

MIPS: BMIPS: fix compilation for BMIPS5000

PATCH Superseded Jonas Gorski 5 participants 6 messages Aug 1, 2013 – Aug 31, 2013 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 MIPS: BMIPS: fix compilation for BMIPS5000

Commit 02b849f7613003fe5f9e58bf233d49b0ebd4a5e8 ("MIPS: Get rid of the use of .macro in C code.") replaced the macro usage but missed the accessors in bmips.h, causing the following build error:

CC arch/mips/kernel/smp-bmips.o
{standard input}: Assembler messages:
{standard input}:951: Error: Unrecognized opcode _ssnop' {standard input}:952: Error: Unrecognized opcode _ssnop' (...)
make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1

Fix this by also replacing the macros here, fixing the last occurrence in mips.

---
* V1 -> V2
Reworded and split out of patchset after finding the commmit introducing the build failure.

While this is technically a regression introduced in 3.10, the code requires OOT arch code to get compiled, so I'm not sure if that is critical enough to warrant a stable tag.

 arch/mips/include/asm/bmips.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
arch/mips/include/asm/bmips.h +14 -14
index 552a65a..87a253d 100644
@@ -70,15 +70,15 @@ static inline unsigned long bmips_read_zscm_reg(unsigned int offset)
 		".set noreorder\n"
 		"cache %1, 0(%2)\n"
 		"sync\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
 		"mfc0 %0, $28, 3\n"
-		"_ssnop\n"
+		__stringify(___ssnop) "\n"
 		".set pop\n"
 		: "=&r" (ret)
 		: "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
@@ -92,13 +92,13 @@ static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
 		".set push\n"
 		".set noreorder\n"
 		"mtc0 %0, $28, 3\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
 		"cache %1, 0(%2)\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
+		__stringify(___ssnop) "\n"
 		: /* no outputs */
 		: "r" (data),
 		  "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
Signature · 1 line
1.8.3.2
#1 lore raw
Quoted 11 lines · Jonas Gorski

Commit 02b849f7613003fe5f9e58bf233d49b0ebd4a5e8 ("MIPS: Get rid of the use of .macro in C code.") replaced the macro usage but missed the accessors in bmips.h, causing the following build error:

CC arch/mips/kernel/smp-bmips.o
{standard input}: Assembler messages:
{standard input}:951: Error: Unrecognized opcode _ssnop' {standard input}:952: Error: Unrecognized opcode _ssnop' (...)
make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1

Quoted 2 lines

Fix this by also replacing the macros here, fixing the last occurrence in mips.

How about getting rid of the entire inline assembler code by something like below patch?

Ralf

 arch/mips/include/asm/bmips.h | 56 ++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)
arch/mips/include/asm/bmips.h +23 -33
index 552a65a..6483d26 100644
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <asm/addrspace.h>
+#include <asm/r4kcache.h>
 #include <asm/mipsregs.h>
 #include <asm/hazards.h>
 
@@ -65,44 +66,33 @@ static inline unsigned long bmips_read_zscm_reg(unsigned int offset)
 {
 	unsigned long ret;
 
-	__asm__ __volatile__(
-		".set push\n"
-		".set noreorder\n"
-		"cache %1, 0(%2)\n"
-		"sync\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"mfc0 %0, $28, 3\n"
-		"_ssnop\n"
-		".set pop\n"
-		: "=&r" (ret)
-		: "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-		: "memory");
+	barrier();
+	cache_op(Index_Load_Tag_S, ZSCM_REG_BASE + offset);
+	__sync();
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	ret = read_c0_ddatalo();
+	__ssnop();
+
 	return ret;
 }
 
 static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
 {
-	__asm__ __volatile__(
-		".set push\n"
-		".set noreorder\n"
-		"mtc0 %0, $28, 3\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"cache %1, 0(%2)\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		"_ssnop\n"
-		: /* no outputs */
-		: "r" (data),
-		  "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
-		: "memory");
+	write_c0_ddatalo(3);
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	cache_op(Index_Store_Tag_S, ZSCM_REG_BASE + offset);
+	__ssnop();
+	__ssnop();
+	__ssnop();
+	barrier();
 }
 
 #endif /* !defined(__ASSEMBLY__) */
#2 lore raw
Quoted 13 lines · Ralf Baechle
Quoted 11 lines · Jonas Gorski

Commit 02b849f7613003fe5f9e58bf233d49b0ebd4a5e8 ("MIPS: Get rid of the use of .macro in C code.") replaced the macro usage but missed the accessors in bmips.h, causing the following build error:

CC arch/mips/kernel/smp-bmips.o
{standard input}: Assembler messages:
{standard input}:951: Error: Unrecognized opcode _ssnop' {standard input}:952: Error: Unrecognized opcode _ssnop' (...)
make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1

Quoted 5 lines
Quoted 2 lines

Fix this by also replacing the macros here, fixing the last occurrence in mips.

How about getting rid of the entire inline assembler code by something like below patch?

It certainly does look neater. One small issue though ...

Quoted 61 lines
 arch/mips/include/asm/bmips.h | 56 ++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)
arch/mips/include/asm/bmips.h +14 -24
index 552a65a..6483d26 100644
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <asm/addrspace.h>
+#include <asm/r4kcache.h>
 #include <asm/mipsregs.h>
 #include <asm/hazards.h>
 
@@ -65,44 +66,33 @@ static inline unsigned long bmips_read_zscm_reg(unsigned int offset)
 {
        unsigned long ret;
 
-       __asm__ __volatile__(
-               ".set push\n"
-               ".set noreorder\n"
-               "cache %1, 0(%2)\n"
-               "sync\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "mfc0 %0, $28, 3\n"
-               "_ssnop\n"
-               ".set pop\n"
-               : "=&r" (ret)
-               : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-               : "memory");
+       barrier();
+       cache_op(Index_Load_Tag_S, ZSCM_REG_BASE + offset);
+       __sync();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       ret = read_c0_ddatalo();
+       __ssnop();
+
        return ret;
 }
 
 static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
 {
-       __asm__ __volatile__(
-               ".set push\n"
-               ".set noreorder\n"
-               "mtc0 %0, $28, 3\n"
-               "_ssnop\n"
-               "_ssnop\n"

arch/mips/include/asm/bmips.h static inline unsigned long bmips_read_zscm_reg(unsigned int offset) · line 87

Quoted 10 lines
arch/mips/include/asm/bmips.h +1 -9
-               "_ssnop\n"
-               "cache %1, 0(%2)\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               : /* no outputs */
-               : "r" (data),
-                 "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
-               : "memory");
+       write_c0_ddatalo(3);

I guess this needs to be write_c0_ddatalo(data);

arch/mips/include/asm/bmips.h static inline unsigned long bmips_read_zscm_reg(unsigned int offset) · line 98

Quoted 12 lines
arch/mips/include/asm/bmips.h +8 -0
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       cache_op(Index_Store_Tag_S, ZSCM_REG_BASE + offset);
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       barrier();
 }
 
 #endif /* !defined(__ASSEMBLY__) */

Kevin or Florian, can you comment on this?

Regards
Jonas

#3 lore raw

Hi Kevin,
Hi Florian,

Quoted 13 lines
Quoted 1 line

+ write_c0_ddatalo(3);

I guess this needs to be write_c0_ddatalo(data);

Quoted 10 lines
Quoted 10 lines
 +       __ssnop();
 +       __ssnop();
 +       __ssnop();
 +       cache_op(Index_Store_Tag_S, ZSCM_REG_BASE + offset);
 +       __ssnop();
 +       __ssnop();
 +       __ssnop();
 +       barrier();

}

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
   #endif /* !defined(__ASSEMBLY__) */

Kevin or Florian, can you comment on this?

any comments on this ?

John

#4 lore raw
Quoted 9 lines · John Crispin

Hi Kevin,
Hi Florian,

Quoted 3 lines
Quoted 1 line

+ write_c0_ddatalo(3);

I guess this needs to be write_c0_ddatalo(data);

any comments on this ?

Commit 43d309390349010cd384ab5a0feebf16b03b9a94 from the mips-for-linux-next branch has this fix (and the __ssnop -> _ssnop renaming). From comparing the assembly output it looks OK to me.

#5 lore raw
In reply to Ralf Baechle

2013/8/1 Ralf Baechle <[email protected]>:

Quoted 16 lines · Jonas Gorski
Quoted 12 lines

Commit 02b849f7613003fe5f9e58bf233d49b0ebd4a5e8 ("MIPS: Get rid of the use of .macro in C code.") replaced the macro usage but missed the accessors in bmips.h, causing the following build error:

CC arch/mips/kernel/smp-bmips.o
{standard input}: Assembler messages:
{standard input}:951: Error: Unrecognized opcode _ssnop' {standard input}:952: Error: Unrecognized opcode _ssnop' (...)
make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1

Quoted 2 lines

Fix this by also replacing the macros here, fixing the last occurrence in mips.

Quoted 6 lines

How about getting rid of the entire inline assembler code by something like below patch?

Ralf

Better late than never:

Quoted 83 lines
 arch/mips/include/asm/bmips.h | 56 ++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)
arch/mips/include/asm/bmips.h +23 -33
index 552a65a..6483d26 100644
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <asm/addrspace.h>
+#include <asm/r4kcache.h>
 #include <asm/mipsregs.h>
 #include <asm/hazards.h>
 
@@ -65,44 +66,33 @@ static inline unsigned long bmips_read_zscm_reg(unsigned int offset)
 {
        unsigned long ret;
 
-       __asm__ __volatile__(
-               ".set push\n"
-               ".set noreorder\n"
-               "cache %1, 0(%2)\n"
-               "sync\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "mfc0 %0, $28, 3\n"
-               "_ssnop\n"
-               ".set pop\n"
-               : "=&r" (ret)
-               : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-               : "memory");
+       barrier();
+       cache_op(Index_Load_Tag_S, ZSCM_REG_BASE + offset);
+       __sync();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       ret = read_c0_ddatalo();
+       __ssnop();
+
        return ret;
 }
 
 static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
 {
-       __asm__ __volatile__(
-               ".set push\n"
-               ".set noreorder\n"
-               "mtc0 %0, $28, 3\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "cache %1, 0(%2)\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               "_ssnop\n"
-               : /* no outputs */
-               : "r" (data),
-                 "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
-               : "memory");
+       write_c0_ddatalo(3);
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       cache_op(Index_Store_Tag_S, ZSCM_REG_BASE + offset);
+       __ssnop();
+       __ssnop();
+       __ssnop();
+       barrier();
 }
 
 #endif /* !defined(__ASSEMBLY__) */
Signature · 1 line
Florian