37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
From 32d4b03c0aedb96022e86a67a560f6eaf488200a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Fri, 28 Jun 2013 00:25:13 +0200
|
||
|
|
Subject: [PATCH 10/10] MIPS: BCM63XX: disable SMP also on BCM3368
|
||
|
|
|
||
|
|
BCM3368 has the same shared TLB as BCM6358.
|
||
|
|
|
||
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/prom.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/prom.c
|
||
|
|
+++ b/arch/mips/bcm63xx/prom.c
|
||
|
|
@@ -64,9 +64,9 @@ void __init prom_init(void)
|
||
|
|
|
||
|
|
if (cpu_is_bmips4350()) {
|
||
|
|
/*
|
||
|
|
- * BCM6328 might not have its second CPU enabled, while BCM6358
|
||
|
|
- * needs special handling for its shared TLB, so disable SMP
|
||
|
|
- * for now.
|
||
|
|
+ * BCM6328 might not have its second CPU enabled, while BCM3368
|
||
|
|
+ * and BCM6358 need special handling for their shared TLB, so
|
||
|
|
+ * disable SMP for now.
|
||
|
|
*/
|
||
|
|
if (BCMCPU_IS_6328()) {
|
||
|
|
reg = bcm_readl(BCM_6328_OTP_BASE +
|
||
|
|
@@ -74,7 +74,7 @@ void __init prom_init(void)
|
||
|
|
|
||
|
|
if (reg & OTP_6328_REG3_TP1_DISABLED)
|
||
|
|
bmips_smp_enabled = 0;
|
||
|
|
- } else if (BCMCPU_IS_6358()) {
|
||
|
|
+ } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
|
||
|
|
bmips_smp_enabled = 0;
|
||
|
|
}
|
||
|
|
|