Skip to contentSkip to conversation

MIPS: BMIPS: Disable pref 30 for buggy CPUs

PATCH In review Florian Fainelli 4 participants 8 messages Jul 31, 2020 – Aug 5, 2020

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

PATCH 1/1 MIPS: BMIPS: Disable pref 30 for buggy CPUs

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
 arch/mips/bmips/setup.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +17 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
 	bcm63xx_fixup_cpu1();
 }
 
+static void bmips5000_pref30_quirk(void)
+{
+	__asm__ __volatile__(
+	"	li	$8, 0x5a455048\n"
+	"	.word	0x4088b00f\n"	/* mtc0 $8, $22, 15 */
+	"	nop; nop; nop\n"
+	"	.word	0x4008b008\n"	/* mfc0 $8, $22, 8 */
+	/* disable "pref 30" on buggy CPUs */
+	"	lui	$9, 0x0800\n"
+	"	or	$8, $9\n"
+	"	.word	0x4088b008\n"	/* mtc0 $8, $22, 8 */
+	: : : "$8", "$9");
+}
+
 static const struct bmips_quirk bmips_quirk_list[] = {
 	{ "brcm,bcm3368",		&bcm6358_quirks			},
 	{ "brcm,bcm3384-viper",		&bcm3384_viper_quirks		},
@@ -120,6 +134,9 @@ static const struct bmips_quirk bmips_quirk_list[] = {
 	{ "brcm,bcm6368",		&bcm6368_quirks			},
 	{ "brcm,bcm63168",		&bcm6368_quirks			},
 	{ "brcm,bcm63268",		&bcm6368_quirks			},
+	{ "brcm,bcm7344",		&bmips5000_pref30_quirk		},
+	{ "brcm,bcm7346",		&bmips5000_pref30_quirk		},
+	{ "brcm,bcm7425",		&bmips5000_pref30_quirk		},
 	{ },
 };
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 18 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
 arch/mips/bmips/setup.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +2 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
 	bcm63xx_fixup_cpu1();
 }
 
+static void bmips5000_pref30_quirk(void)
+{

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+	__asm__ __volatile__(
+	"	li	$8, 0x5a455048\n"
+	"	.word	0x4088b00f\n"	/* mtc0 $8, $22, 15 */
+	"	nop; nop; nop\n"
+	"	.word	0x4008b008\n"	/* mfc0 $8, $22, 8 */
+	/* disable "pref 30" on buggy CPUs */
+	"	lui	$9, 0x0800\n"
+	"	or	$8, $9\n"
+	"	.word	0x4088b008\n"	/* mtc0 $8, $22, 8 */
+	: : : "$8", "$9");

what's the reason for not using mfc/mtc here ?

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
#2 lore raw
Quoted 17 lines · Thomas Bogendoerfer
Quoted 16 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
 arch/mips/bmips/setup.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +0 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
 	bcm63xx_fixup_cpu1();
 }
 
Quoted 14 lines

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 12 lines
arch/mips/bmips/setup.c +12 -0
+static void bmips5000_pref30_quirk(void)
+{
+	__asm__ __volatile__(
+	"	li	$8, 0x5a455048\n"
+	"	.word	0x4088b00f\n"	/* mtc0 $8, $22, 15 */
+	"	nop; nop; nop\n"
+	"	.word	0x4008b008\n"	/* mfc0 $8, $22, 8 */
+	/* disable "pref 30" on buggy CPUs */
+	"	lui	$9, 0x0800\n"
+	"	or	$8, $9\n"
+	"	.word	0x4088b008\n"	/* mtc0 $8, $22, 8 */
+	: : : "$8", "$9");

what's the reason for not using mfc/mtc here ?

See my response to Jiaxun, thanks!

Signature · 1 line
Florian
#3 lore raw
In reply to Florian Fainelli
Quoted 19 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
  arch/mips/bmips/setup.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +3 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
  	bcm63xx_fixup_cpu1();
  }
 
+static void bmips5000_pref30_quirk(void)
+{
+	__asm__ __volatile__(

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 125

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+	"	li	$8, 0x5a455048\n"
+	"	.word	0x4088b00f\n"	/* mtc0 $8, $22, 15 */
+	"	nop; nop; nop\n"
+	"	.word	0x4008b008\n"	/* mfc0 $8, $22, 8 */
+	/* disable "pref 30" on buggy CPUs */
+	"	lui	$9, 0x0800\n"
+	"	or	$8, $9\n"
+	"	.word	0x4088b008\n"	/* mtc0 $8, $22, 8 */
+	: : : "$8", "$9");
+}

Hi,

Is there any toolchain issue blocking read_c0_**** family helpers being used?

Use .word looks unreasonable.

Thanks

- Jiaxun

Quoted 14 lines
arch/mips/bmips/setup.c +4 -0
+
  static const struct bmips_quirk bmips_quirk_list[] = {
  	{ "brcm,bcm3368",		&bcm6358_quirks			},
  	{ "brcm,bcm3384-viper",		&bcm3384_viper_quirks		},
@@ -120,6 +134,9 @@ static const struct bmips_quirk bmips_quirk_list[] = {
  	{ "brcm,bcm6368",		&bcm6368_quirks			},
  	{ "brcm,bcm63168",		&bcm6368_quirks			},
  	{ "brcm,bcm63268",		&bcm6368_quirks			},
+	{ "brcm,bcm7344",		&bmips5000_pref30_quirk		},
+	{ "brcm,bcm7346",		&bmips5000_pref30_quirk		},
+	{ "brcm,bcm7425",		&bmips5000_pref30_quirk		},
  	{ },
  };
 
#4 lore raw
Quoted 33 lines · Jiaxun Yang
Quoted 18 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
  arch/mips/bmips/setup.c | 17 +++++++++++++++++

  1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +2 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
       bcm63xx_fixup_cpu1();
   }
   +static void bmips5000_pref30_quirk(void)
+{
+    __asm__ __volatile__(

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+    "    li    $8, 0x5a455048\n"
+    "    .word    0x4088b00f\n"    /* mtc0 $8, $22, 15 */
+    "    nop; nop; nop\n"
+    "    .word    0x4008b008\n"    /* mfc0 $8, $22, 8 */
+    /* disable "pref 30" on buggy CPUs */
+    "    lui    $9, 0x0800\n"
+    "    or    $8, $9\n"
+    "    .word    0x4088b008\n"    /* mtc0 $8, $22, 8 */
+    : : : "$8", "$9");
+}

Hi,

Quoted 4 lines

Is there any toolchain issue blocking read_c0_**** family helpers being used?

Use .word looks unreasonable.

Yes, the assembler would be choking on the custom $22 selector, however this patch should not be necessary given that the boot loader (CFE) should have long been updated by now to disable pref 30.

Thanks

Signature · 1 line
Florian
#5 lore raw
Quoted 34 lines · Florian Fainelli
Quoted 33 lines · Jiaxun Yang
Quoted 18 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
  arch/mips/bmips/setup.c | 17 +++++++++++++++++

  1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +2 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
       bcm63xx_fixup_cpu1();
   }
   +static void bmips5000_pref30_quirk(void)
+{
+    __asm__ __volatile__(

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+    "    li    $8, 0x5a455048\n"
+    "    .word    0x4088b00f\n"    /* mtc0 $8, $22, 15 */
+    "    nop; nop; nop\n"
+    "    .word    0x4008b008\n"    /* mfc0 $8, $22, 8 */
+    /* disable "pref 30" on buggy CPUs */
+    "    lui    $9, 0x0800\n"
+    "    or    $8, $9\n"
+    "    .word    0x4088b008\n"    /* mtc0 $8, $22, 8 */
+    : : : "$8", "$9");
+}

Hi,

Quoted 6 lines
Quoted 4 lines

Is there any toolchain issue blocking read_c0_**** family helpers being used?

Use .word looks unreasonable.

Yes, the assembler would be choking on the custom $22 selector, however

I guess you meant selector 8 and 15. If BMIPS has a 4 bit selector field it might be good to do a binutils patch supporting it.

Quoted 2 lines

this patch should not be necessary given that the boot loader (CFE) should have long been updated by now to disable pref 30.

so, should I add it or drop it ?

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
#6 lore raw
Quoted 38 lines · Thomas Bogendoerfer
Quoted 37 lines · Florian Fainelli
Quoted 36 lines · Jiaxun Yang
Quoted 18 lines · Florian Fainelli

Disable pref 30 by utilizing the standard quirk method and matching the affected SoCs: 7344, 7346, 7425.

---
  arch/mips/bmips/setup.c | 17 +++++++++++++++++

  1 file changed, 17 insertions(+)
arch/mips/bmips/setup.c +2 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
       bcm63xx_fixup_cpu1();
   }
   +static void bmips5000_pref30_quirk(void)
+{
+    __asm__ __volatile__(

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+    "    li    $8, 0x5a455048\n"
+    "    .word    0x4088b00f\n"    /* mtc0 $8, $22, 15 */
+    "    nop; nop; nop\n"
+    "    .word    0x4008b008\n"    /* mfc0 $8, $22, 8 */
+    /* disable "pref 30" on buggy CPUs */
+    "    lui    $9, 0x0800\n"
+    "    or    $8, $9\n"
+    "    .word    0x4088b008\n"    /* mtc0 $8, $22, 8 */
+    : : : "$8", "$9");
+}

Hi,

Is there any toolchain issue blocking read_c0_**** family helpers being used?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Use .word looks unreasonable.

Yes, the assembler would be choking on the custom $22 selector, however

I guess you meant selector 8 and 15. If BMIPS has a 4 bit selector field it might be good to do a binutils patch supporting it.

Yes, sorry that is what I meant. I don't think an assembler patch makes sense at this point given this is an isolated use, and there is not just binutils these days, the Clang/LLVM integrated assembler would also need to be supported, and then we would need to have the kernel say: I require this minimum version to support the customer selectors, not worth the trouble if you ask me.

Quoted 5 lines
Quoted 3 lines

this patch should not be necessary given that the boot loader (CFE) should have long been updated by now to disable pref 30.

so, should I add it or drop it ?

You can drop it and I would resubmit it with feedback addressed if this later comes back.

Signature · 1 line
Florian
#7 lore raw
Quoted 32 lines · Florian Fainelli
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 10 lines
arch/mips/bmips/setup.c +2 -0
index 19308df5f577..df0efea12611 100644
@@ -110,6 +110,20 @@ static void bcm6368_quirks(void)
       bcm63xx_fixup_cpu1();
   }
   +static void bmips5000_pref30_quirk(void)
+{
+    __asm__ __volatile__(

arch/mips/bmips/setup.c static void bcm6368_quirks(void) · line 124

Quoted 10 lines
arch/mips/bmips/setup.c +10 -0
+    "    li    $8, 0x5a455048\n"
+    "    .word    0x4088b00f\n"    /* mtc0 $8, $22, 15 */
+    "    nop; nop; nop\n"
+    "    .word    0x4008b008\n"    /* mfc0 $8, $22, 8 */
+    /* disable "pref 30" on buggy CPUs */
+    "    lui    $9, 0x0800\n"
+    "    or    $8, $9\n"
+    "    .word    0x4088b008\n"    /* mtc0 $8, $22, 8 */
+    : : : "$8", "$9");
+}

Hi,

Is there any toolchain issue blocking read_c0_**** family helpers being used?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Use .word looks unreasonable.

Yes, the assembler would be choking on the custom $22 selector, however

I guess you meant selector 8 and 15. If BMIPS has a 4 bit selector field it might be good to do a binutils patch supporting it.

Quoted 6 lines

Yes, sorry that is what I meant. I don't think an assembler patch makes sense at this point given this is an isolated use, and there is not just binutils these days, the Clang/LLVM integrated assembler would also need to be supported, and then we would need to have the kernel say: I require this minimum version to support the customer selectors, not worth the trouble if you ask me.

Well, I asked for a GAS patch to add support 4.5 years ago, so by now and
9 binutils releases later it would have become fairly common. And then I also suggested how to handle it in a robust way. Cf.
<https://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=alpine.DEB.2.00.1602092245180.15885%40tp.orcam.me.uk>.

Maciej