Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1413150

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

Show all headers | View raw

Hi,

On 3 June 2016 at 10:12, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> BCM6345 has only one CPU, so SMP support must be disabled.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  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.

> 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] MIPS: BMIPS: Add device tree example for BCM63268 Álvaro Fernández Rojas   <noltari@gmail.com> - 2016-06-03 10:20 +0200
  [PATCH 2/3] MIPS: BMIPS: Add BCM6345 support Álvaro Fernández Rojas   <noltari@gmail.com> - 2016-06-03 10:20 +0200
    Re: [PATCH 2/3] MIPS: BMIPS: Add BCM6345 support Jonas Gorski <jogo@openwrt.org> - 2016-06-03 13:50 +0200
    Re: [PATCH 2/3] MIPS: BMIPS: Add BCM6345 support Rob Herring <robh@kernel.org> - 2016-06-06 16:00 +0200

csiph-web