Thread (7 messages) 7 messages, 3 authors, 2016-06-13

Re: [PATCH 2/3] MIPS: BMIPS: Add BCM6345 support

From: Álvaro Fernández Rojas <hidden>
Date: 2016-06-13 06:08:23
Also in: linux-mips, lkml

On a second thought I think I'll postpone adding support for BMIPS3300 SoCs since I failed booting latest kernel on a BCM6348.
I'll resend only patch 1/3 on a new patch series.

Álvaro.

El 3/6/16 a las 13:46, Jonas Gorski escribió:
Hi,

On 3 June 2016 at 10:12, Álvaro Fernández Rojas [off-list ref] wrote:
quoted
BCM6345 has only one CPU, so SMP support must be disabled.

Signed-off-by: Álvaro Fernández Rojas <redacted>
---
 Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
 arch/mips/bmips/setup.c                             | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index 4a7e030..1936e8a 100644
--- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -4,7 +4,7 @@ Required properties:

 - compatible: "brcm,bcm3384", "brcm,bcm33843"
               "brcm,bcm3384-viper", "brcm,bcm33843-viper"
-              "brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6368",
+              "brcm,bcm6328", "brcm,bcm6345", "brcm,bcm6358", "brcm,bcm6368",
               "brcm,bcm63168", "brcm,bcm63268",
               "brcm,bcm7125", "brcm,bcm7346", "brcm,bcm7358", "brcm,bcm7360",
               "brcm,bcm7362", "brcm,bcm7420", "brcm,bcm7425"
This is reasonable.
quoted
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index f146d12..b0d339d 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -95,6 +95,14 @@ static void bcm6328_quirks(void)
                bcm63xx_fixup_cpu1();
 }

+static void bcm6345_quirks(void)
+{
+       /*
+        * BCM6345 has only one CPU and no SMP support
+        */
+       bmips_smp_enabled = 0;
+}
+
 static void bcm6358_quirks(void)
 {
        /*
@@ -113,6 +121,7 @@ static const struct bmips_quirk bmips_quirk_list[] = {
        { "brcm,bcm3384-viper",         &bcm3384_viper_quirks           },
        { "brcm,bcm33843-viper",        &bcm3384_viper_quirks           },
        { "brcm,bcm6328",               &bcm6328_quirks                 },
+       { "brcm,bcm6345",               &bcm6345_quirks                 },
        { "brcm,bcm6358",               &bcm6358_quirks                 },
        { "brcm,bcm6368",               &bcm6368_quirks                 },
        { "brcm,bcm63168",              &bcm6368_quirks                 },
This part is unnecessary, as cpu-bmips will only try to enable smp for
bmips4350 and higher. but not for bmips32/bmips3300.


Jonas
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help