Changeset 47807
- Timestamp:
- 2015-12-07T20:20:40+01:00 (2 years ago)
- Location:
- trunk/target/linux/bcm53xx/patches-4.4
- Files:
-
- 3 moved
-
022-ARM-BCM-Clean-up-SMP-support-for-Broadcom-Kona.patch (moved) (moved from trunk/target/linux/bcm53xx/patches-4.4/131-ARM-BCM-Clean-up-SMP-support-for-Broadcom-Kona.patch) (5 diffs)
-
023-ARM-BCM-Add-SMP-support-for-Broadcom-NSP.patch (moved) (moved from trunk/target/linux/bcm53xx/patches-4.4/133-ARM-BCM-Add-SMP-support-for-Broadcom-NSP.patch) (3 diffs)
-
024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch (moved) (moved from trunk/target/linux/bcm53xx/patches-4.4/134-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/bcm53xx/patches-4.4/022-ARM-BCM-Clean-up-SMP-support-for-Broadcom-Kona.patch
r47806 r47807 1 From 8622d6da5d95293d474c156612fd819fdaf542ecMon Sep 17 00:00:00 20011 From b5989f783de046577067fe356b1bb76cae07e867 Mon Sep 17 00:00:00 2001 2 2 From: Kapil Hali <kapilh@broadcom.com> 3 Date: Wed, 25 Nov 2015 08:58:53-05004 Subject: [PATCH 131/134] ARM: BCM: Clean up SMP support for Broadcom Kona3 Date: Sat, 5 Dec 2015 06:53:41 -0500 4 Subject: [PATCH] ARM: BCM: Clean up SMP support for Broadcom Kona 5 5 6 6 These changes cleans up SMP implementaion for Broadcom's … … 9 9 10 10 Signed-off-by: Kapil Hali <kapilh@broadcom.com> 11 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 11 12 --- 12 arch/arm/boot/dts/bcm11351.dtsi | 2 +- 13 arch/arm/boot/dts/bcm21664.dtsi | 2 +- 14 arch/arm/mach-bcm/kona_smp.c | 82 +++++++++++++++++++++++++++-------------- 15 3 files changed, 56 insertions(+), 30 deletions(-) 13 .../bindings/arm/bcm/brcm,bcm11351-cpu-method.txt | 12 ++-- 14 arch/arm/boot/dts/bcm11351.dtsi | 4 +- 15 arch/arm/boot/dts/bcm21664.dtsi | 4 +- 16 arch/arm/mach-bcm/kona_smp.c | 82 ++++++++++++++-------- 17 4 files changed, 64 insertions(+), 38 deletions(-) 16 18 19 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt 20 +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt 21 @@ -1,17 +1,17 @@ 22 Broadcom Kona Family CPU Enable Method 23 -------------------------------------- 24 This binding defines the enable method used for starting secondary 25 -CPUs in the following Broadcom SoCs: 26 +CPU in the following Broadcom SoCs: 27 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664 28 29 The enable method is specified by defining the following required 30 -properties in the "cpus" device tree node: 31 +properties in the corresponding secondary "cpu" device tree node: 32 - enable-method = "brcm,bcm11351-cpu-method"; 33 - secondary-boot-reg = <...>; 34 35 The secondary-boot-reg property is a u32 value that specifies the 36 -physical address of the register used to request the ROM holding pen 37 -code release a secondary CPU. The value written to the register is 38 +physical address of the register used to request the ROM code 39 +release a secondary CPU. The value written to the register is 40 formed by encoding the target CPU id into the low bits of the 41 physical start address it should jump to. 42 43 @@ -19,8 +19,6 @@ Example: 44 cpus { 45 #address-cells = <1>; 46 #size-cells = <0>; 47 - enable-method = "brcm,bcm11351-cpu-method"; 48 - secondary-boot-reg = <0x3500417c>; 49 50 cpu0: cpu@0 { 51 device_type = "cpu"; 52 @@ -31,6 +29,8 @@ Example: 53 cpu1: cpu@1 { 54 device_type = "cpu"; 55 compatible = "arm,cortex-a9"; 56 + enable-method = "brcm,bcm11351-cpu-method"; 57 + secondary-boot-reg = <0x3500417c>; 58 reg = <1>; 59 }; 60 }; 17 61 --- a/arch/arm/boot/dts/bcm11351.dtsi 18 62 +++ b/arch/arm/boot/dts/bcm11351.dtsi 19 @@ -31,7 +31,6 @@ 63 @@ -30,8 +30,6 @@ 64 cpus { 20 65 #address-cells = <1>; 21 66 #size-cells = <0>; 22 67 - enable-method = "brcm,bcm11351-cpu-method"; 23 68 - secondary-boot-reg = <0x3500417c>; 24 69 25 70 cpu0: cpu@0 { 26 71 device_type = "cpu"; 27 @@ -42,6 +4 1,7@@72 @@ -42,6 +40,8 @@ 28 73 cpu1: cpu@1 { 29 74 device_type = "cpu"; 30 75 compatible = "arm,cortex-a9"; 76 + enable-method = "brcm,bcm11351-cpu-method"; 31 77 + secondary-boot-reg = <0x3500417c>; 32 78 reg = <1>; … … 35 81 --- a/arch/arm/boot/dts/bcm21664.dtsi 36 82 +++ b/arch/arm/boot/dts/bcm21664.dtsi 37 @@ -31,7 +31,6 @@ 83 @@ -30,8 +30,6 @@ 84 cpus { 38 85 #address-cells = <1>; 39 86 #size-cells = <0>; 40 87 - enable-method = "brcm,bcm11351-cpu-method"; 41 88 - secondary-boot-reg = <0x35004178>; 42 89 43 90 cpu0: cpu@0 { 44 91 device_type = "cpu"; 45 @@ -42,6 +4 1,7@@92 @@ -42,6 +40,8 @@ 46 93 cpu1: cpu@1 { 47 94 device_type = "cpu"; 48 95 compatible = "arm,cortex-a9"; 96 + enable-method = "brcm,bcm11351-cpu-method"; 49 97 + secondary-boot-reg = <0x35004178>; 50 98 reg = <1>; … … 170 218 void __iomem *boot_reg; 171 219 phys_addr_t boot_func; 172 @@ -154,15 +179,16 @@ static int bcm_boot_secondary(unsigned i 220 @@ -154,15 +179,16 @@ static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle) 173 221 return -EINVAL; 174 222 } … … 190 238 191 239 /* 192 @@ -191,12 +217,12 @@ static int bcm_boot_secondary(unsigned i 240 @@ -191,12 +217,12 @@ static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle) 193 241 194 242 pr_err("timeout waiting for cpu %u to start\n", cpu_id); -
trunk/target/linux/bcm53xx/patches-4.4/023-ARM-BCM-Add-SMP-support-for-Broadcom-NSP.patch
r47806 r47807 1 From e99fb6d01cddf38cffc11655aba4a96a981d604eMon Sep 17 00:00:00 20011 From 55be958cd27439a58c4d9369d6fe2a1f83efdaa6 Mon Sep 17 00:00:00 2001 2 2 From: Kapil Hali <kapilh@broadcom.com> 3 Date: Wed, 25 Nov 2015 13:25:55-05004 Subject: [PATCH 133/134] ARM: BCM: Add SMP support for Broadcom NSP3 Date: Sat, 5 Dec 2015 06:53:43 -0500 4 Subject: [PATCH] ARM: BCM: Add SMP support for Broadcom NSP 5 5 6 6 Add SMP support for Broadcom's Northstar Plus SoC … … 15 15 16 16 Signed-off-by: Kapil Hali <kapilh@broadcom.com> 17 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 17 18 --- 18 19 arch/arm/mach-bcm/Kconfig | 2 + … … 24 25 create mode 100644 arch/arm/mach-bcm/platsmp.c 25 26 27 --- a/arch/arm/mach-bcm/Kconfig 28 +++ b/arch/arm/mach-bcm/Kconfig 29 @@ -40,6 +40,8 @@ config ARCH_BCM_NSP 30 select ARCH_BCM_IPROC 31 select ARM_ERRATA_754322 32 select ARM_ERRATA_775420 33 + select ARM_ERRATA_764369 if SMP 34 + select HAVE_SMP 35 help 36 Support for Broadcom Northstar Plus SoC. 37 Broadcom Northstar Plus family of SoCs are used for switching control 26 38 --- a/arch/arm/mach-bcm/Makefile 27 39 +++ b/arch/arm/mach-bcm/Makefile 28 @@ -23,7 +23,7 @@ obj-$(CONFIG_ARCH_BCM_281XX) += board_bc 40 @@ -14,7 +14,11 @@ 41 obj-$(CONFIG_ARCH_BCM_CYGNUS) += bcm_cygnus.o 42 43 # Northstar Plus 44 -obj-$(CONFIG_ARCH_BCM_NSP) += bcm_nsp.o 45 +obj-$(CONFIG_ARCH_BCM_NSP) += bcm_nsp.o 46 + 47 +ifeq ($(CONFIG_ARCH_BCM_NSP),y) 48 +obj-$(CONFIG_SMP) += platsmp.o 49 +endif 50 51 # BCM281XX 52 obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o 53 @@ -23,7 +27,7 @@ obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o 29 54 obj-$(CONFIG_ARCH_BCM_21664) += board_bcm21664.o 30 55 -
trunk/target/linux/bcm53xx/patches-4.4/024-ARM-BCM-Add-SMP-support-for-Broadcom-4708.patch
r47806 r47807 1 From 16e1bf7dde22ee22a331aabf824cc31a6794a4cbMon Sep 17 00:00:00 20011 From af0783a87a365e87e5ee0ac0ba7e3075abc5007c Mon Sep 17 00:00:00 2001 2 2 From: Jon Mason <jonmason@broadcom.com> 3 Date: Thu, 15 Oct 2015 14:09:10 -04004 Subject: [PATCH 134/134] ARM: BCM: Add SMP support for Broadcom 47083 Date: Sat, 5 Dec 2015 06:53:44 -0500 4 Subject: [PATCH] ARM: BCM: Add SMP support for Broadcom 4708 5 5 6 6 Add SMP support for Broadcom's 4708 SoCs. … … 10 10 Tested-by: Hauke Mehrtens <hauke@hauke-m.de> 11 11 Signed-off-by: Kapil Hali <kapilh@broadcom.com> 12 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 12 13 --- 13 arch/arm/boot/dts/bcm4708.dtsi | 2 ++14 arch/arm/boot/dts/bcm4708.dtsi | 3 ++- 14 15 arch/arm/mach-bcm/Kconfig | 1 + 15 16 arch/arm/mach-bcm/Makefile | 3 +++ 16 3 files changed, 6 insertions(+) 17 3 files changed, 6 insertions(+), 1 deletion(-) 17 18 18 19 --- a/arch/arm/boot/dts/bcm4708.dtsi 19 20 +++ b/arch/arm/boot/dts/bcm4708.dtsi 20 @@ -15,6 +15,7 @@ 21 cpus { 22 #address-cells = <1>; 23 #size-cells = <0>; 24 + enable-method = "brcm,bcm-nsp-smp"; 25 26 cpu@0 { 27 device_type = "cpu"; 28 @@ -27,6 +28,7 @@ 21 @@ -27,8 +27,9 @@ 29 22 device_type = "cpu"; 30 23 compatible = "arm,cortex-a9"; 31 24 next-level-cache = <&L2>; 25 + enable-method = "brcm,bcm-nsp-smp"; 32 26 + secondary-boot-reg = <0xffff0400>; 33 27 reg = <0x1>; 34 28 }; 35 29 }; 30 - 31 }; 36 32 --- a/arch/arm/mach-bcm/Kconfig 37 33 +++ b/arch/arm/mach-bcm/Kconfig 38 @@ - 55,6 +55,7 @@ config ARCH_BCM_5301X39 select ARM_ERRATA_75432240 select ARM_ERRATA_77542041 select AR M_ERRATA_764369 if SMP34 @@ -29,6 +29,7 @@ config ARCH_BCM_IPROC 35 config ARCH_BCM_CYGNUS 36 bool "Broadcom Cygnus Support" if ARCH_MULTI_V7 37 select ARCH_BCM_IPROC 42 38 + select HAVE_SMP 43 44 39 help 45 Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. 40 Enable support for the Cygnus family, 41 which includes the following variants: 46 42 --- a/arch/arm/mach-bcm/Makefile 47 43 +++ b/arch/arm/mach-bcm/Makefile 48 @@ - 39,6 +39,9 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm244 @@ -43,6 +43,9 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o 49 45 50 46 # BCM5301X
Note: See TracChangeset
for help on using the changeset viewer.
