Skip to contentSkip to conversation

ARM: bcm283x: Fix SMP for old dtb files

PATCH New Stefan Wahren 3 participants 3 messages Aug 23, 2017 – Aug 24, 2017

Subsystems (4)
Arm (32-bit) Arm sub-architectures Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Stefan Wahren

author
#0 lore raw

PATCH 1/1 ARM: bcm283x: Fix SMP for old dtb files

Since "irqchip: bcm2836: Move SMP startup code to arch/arm" the SMP for BCM2836 and BCM2837 (32 bit) depends on commit "ARM: dts: bcm283x:
Add 32-bit enable method for SMP". This patch fixes SMP for older dtb files.

Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Stefan Wahren <[email protected]>
---
 arch/arm/mach-bcm/board_bcm2835.c |  6 +++++-
 arch/arm/mach-bcm/platsmp.c       |  2 +-
 arch/arm/mach-bcm/platsmp.h       | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/mach-bcm/platsmp.h
arch/arm/mach-bcm/board_bcm2835.c +5 -1
index 24af33f..8cff865 100644
@@ -19,16 +19,20 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include "platsmp.h"
+
 static const char * const bcm2835_compat[] = {
 #ifdef CONFIG_ARCH_MULTI_V6
 	"brcm,bcm2835",
 #endif
 #ifdef CONFIG_ARCH_MULTI_V7
 	"brcm,bcm2836",
+	"brcm,bcm2837",
 #endif
 	NULL
 };
 
 DT_MACHINE_START(BCM2835, "BCM2835")
-	.dt_compat = bcm2835_compat
+	.dt_compat = bcm2835_compat,
+	.smp = smp_ops(bcm2836_smp_ops),
 MACHINE_END
arch/arm/mach-bcm/platsmp.c +1 -1
index 7811160..7d95483 100644
@@ -339,7 +339,7 @@ static const struct smp_operations nsp_smp_ops __initconst = {
 };
 CPU_METHOD_OF_DECLARE(bcm_smp_nsp, "brcm,bcm-nsp-smp", &nsp_smp_ops);
 
-static const struct smp_operations bcm2836_smp_ops __initconst = {
+const struct smp_operations bcm2836_smp_ops __initconst = {
 	.smp_boot_secondary	= bcm2836_boot_secondary,
 };
 CPU_METHOD_OF_DECLARE(bcm_smp_bcm2836, "brcm,bcm2836-smp", &bcm2836_smp_ops);
arch/arm/mach-bcm/platsmp.h new file +10 -0
new file mode 100644
index 0000000..b8b8b3f
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2017 Stefan Wahren <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ */
+
+extern const struct smp_operations bcm2836_smp_ops;
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 ARM: bcm283x: Fix SMP for old dtb files

Quoted 7 lines · Stefan Wahren

Since "irqchip: bcm2836: Move SMP startup code to arch/arm" the SMP for BCM2836 and BCM2837 (32 bit) depends on commit "ARM: dts: bcm283x:
Add 32-bit enable method for SMP". This patch fixes SMP for older dtb files.

Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Stefan Wahren <[email protected]>

Looks good to me, thanks for the update.

Acked-by Arnd Bergmann <[email protected]>
#2 lore raw

PATCH 1/1 ARM: bcm283x: Fix SMP for old dtb files

Quoted 6 lines · Arnd Bergmann
Quoted 5 lines · Stefan Wahren

Since "irqchip: bcm2836: Move SMP startup code to arch/arm" the SMP for BCM2836 and BCM2837 (32 bit) depends on commit "ARM: dts: bcm283x:
Add 32-bit enable method for SMP". This patch fixes SMP for older dtb files.

Quoted 6 lines
Quoted 2 lines
Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Stefan Wahren <[email protected]>

Looks good to me, thanks for the update.

Acked-by Arnd Bergmann <[email protected]>

Great! I've squashed this into the original commit, tested, and I'll
generate a new PR without the DT merge.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170824/b7c39bda/attachment.sig>