From: hauke@hauke-m.de (Hauke Mehrtens) Date: Tue, 16 Jul 2013 17:39:46 +0200 Subject: [PATCH] bcm53xx: initial support for the BCM5301/BCM470X SoC with ARM CPU In-Reply-To: <20130716151435.GB3871@linaro.org> References: <1373982727-5492-1-git-send-email-hauke@hauke-m.de> <20130716151435.GB3871@linaro.org> Message-ID: <51E56942.8030801@hauke-m.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 07/16/2013 05:14 PM, Matt Porter wrote: > Hi Hauke, > > On Tue, Jul 16, 2013 at 03:52:07PM +0200, Hauke Mehrtens wrote: >> This patch adds support for the BCM5301/BCM470X SoCs with an ARM CPU. >> Currently just booting to a shell is working and nothing else, no >> Ethernet, wifi, flash, ... >> >> This SoC uses a Dual core CPU, but this is currently not implemented. >> More information about this SoC can be found here: >> http://www.anandtech.com/show/5925/broadcom-announces-bcm4708x-and-bcm5301x-socs-for-80211ac-routers >> >> Signed-off-by: Hauke Mehrtens >> --- >> >> A bootlog can be found here: >> http://pastebin.com/0MYYC7Fx >> >> MAINTAINERS | 7 +++ >> arch/arm/Kconfig | 2 + >> arch/arm/Kconfig.debug | 5 ++ >> arch/arm/Makefile | 1 + >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/bcm5301x-netgear-r6250.dts | 20 +++++++ >> arch/arm/boot/dts/bcm5301x.dtsi | 72 ++++++++++++++++++++++++++ >> arch/arm/include/debug/bcm53xx.S | 19 +++++++ >> arch/arm/mach-bcm53xx/Kconfig | 10 ++++ >> arch/arm/mach-bcm53xx/Makefile | 1 + >> arch/arm/mach-bcm53xx/bcm53xx.c | 68 ++++++++++++++++++++++++ >> 11 files changed, 206 insertions(+) >> create mode 100644 arch/arm/boot/dts/bcm5301x-netgear-r6250.dts >> create mode 100644 arch/arm/boot/dts/bcm5301x.dtsi >> create mode 100644 arch/arm/include/debug/bcm53xx.S >> create mode 100644 arch/arm/mach-bcm53xx/Kconfig >> create mode 100644 arch/arm/mach-bcm53xx/Makefile >> create mode 100644 arch/arm/mach-bcm53xx/bcm53xx.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index bf61e04..b72ba65 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1795,6 +1795,13 @@ F: arch/arm/boot/dts/bcm2835* >> F: arch/arm/configs/bcm2835_defconfig >> F: drivers/*/*bcm2835* >> >> +BROADCOM BCM53XX ARM ARCHICTURE >> +M: Hauke Mehrtens >> +L: linux-arm-kernel at lists.infradead.org >> +S: Maintained >> +F: arch/arm/mach-bcm53xx/ >> +F: arch/arm/boot/dts/bcm53* >> + >> BROADCOM TG3 GIGABIT ETHERNET DRIVER >> M: Nithin Nayak Sujir >> M: Michael Chan >> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig >> index ba412e0..ee7362e 100644 >> --- a/arch/arm/Kconfig >> +++ b/arch/arm/Kconfig >> @@ -930,6 +930,8 @@ source "arch/arm/mach-bcm/Kconfig" >> >> source "arch/arm/mach-bcm2835/Kconfig" >> >> +source "arch/arm/mach-bcm53xx/Kconfig" >> + >> source "arch/arm/mach-clps711x/Kconfig" >> >> source "arch/arm/mach-cns3xxx/Kconfig" >> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug >> index e401a76..74e32f6 100644 >> --- a/arch/arm/Kconfig.debug >> +++ b/arch/arm/Kconfig.debug >> @@ -93,6 +93,10 @@ choice >> bool "Kernel low-level debugging on BCM2835 PL011 UART" >> depends on ARCH_BCM2835 >> >> + config DEBUG_BCM53XX >> + bool "Kernel low-level debugging on BCM53XX UART1" >> + depends on ARCH_BCM53XX >> + >> config DEBUG_CLPS711X_UART1 >> bool "Kernel low-level debugging messages via UART1" >> depends on ARCH_CLPS711X >> @@ -762,6 +766,7 @@ endchoice >> config DEBUG_LL_INCLUDE >> string >> default "debug/bcm2835.S" if DEBUG_BCM2835 >> + default "debug/bcm53xx.S" if DEBUG_BCM53XX >> default "debug/cns3xxx.S" if DEBUG_CNS3XXX >> default "debug/exynos.S" if DEBUG_EXYNOS_UART >> default "debug/highbank.S" if DEBUG_HIGHBANK_UART >> diff --git a/arch/arm/Makefile b/arch/arm/Makefile >> index c0ac0f5..4a69cd5 100644 >> --- a/arch/arm/Makefile >> +++ b/arch/arm/Makefile >> @@ -147,6 +147,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 >> machine-$(CONFIG_ARCH_AT91) += at91 >> machine-$(CONFIG_ARCH_BCM) += bcm >> machine-$(CONFIG_ARCH_BCM2835) += bcm2835 >> +machine-$(CONFIG_ARCH_BCM53XX) += bcm53xx >> machine-$(CONFIG_ARCH_CLPS711X) += clps711x >> machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx >> machine-$(CONFIG_ARCH_DAVINCI) += davinci >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index 641b3c9..480a68e 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -242,6 +242,7 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ >> dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ >> zynq-zc706.dtb \ >> zynq-zed.dtb >> +dtb-$(CONFIG_ARCH_BCM53XX) += bcm5301x-netgear-r6250.dtb >> >> targets += dtbs >> targets += $(dtb-y) >> diff --git a/arch/arm/boot/dts/bcm5301x-netgear-r6250.dts b/arch/arm/boot/dts/bcm5301x-netgear-r6250.dts >> new file mode 100644 >> index 0000000..d1b97aa >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm5301x-netgear-r6250.dts >> @@ -0,0 +1,20 @@ >> +/* >> + * Broadcom BCM47XX / BCM53XX arm platform code. >> + * >> + * Copyright 2013 Hauke Mehrtens >> + * >> + * Licensed under the GNU/GPL. See COPYING for details. >> + */ >> + >> +/dts-v1/; >> + >> +/include/ "bcm5301x.dtsi" >> + >> +/ { >> + model = "Netgear R6250 V1 (BCM4708)"; >> + compatible = "netgear,r6250v1", "brcm,bcm5301x"; >> + >> + memory { >> + reg = <0x00000000 0x08000000>; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi >> new file mode 100644 >> index 0000000..638350d >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm5301x.dtsi >> @@ -0,0 +1,72 @@ >> +/* >> + * Broadcom BCM47XX / BCM53XX ARM platform code. >> + * >> + * Copyright 2013 Hauke Mehrtens >> + * >> + * Licensed under the GNU/GPL. See COPYING for details. >> + */ >> + >> +/include/ "skeleton.dtsi" >> + >> +/ { >> + compatible = "brcm,bcm5301x"; > > Ok, this was nagging at me before I went on my very long vacation. I see > the "brcm" vendor prefix as a real consistency problem. I noticed on the > bcm281xx/kona family, we have been using "bcm" which is not logged in > vendor-prefixes.txt as a legitimate prefix. I see that bcm2835 had > already established use of "brcm" before any of the bcm281xx support > came in. Ideally, the vendor prefix should change to "bcm" since every > reference in the family names is BCM. However, if others want the least > amount of churn in making this consistent, we might have to go with > "brcm" across the board. > > Arnd, any thoughts here? I have no problem with bcm or with brcm. This is a Broadcom Chip and their names are starting with bcm. > Another thing is that this is missing a binding definition for this > compatible string. See Documentation/devicetree/bindings/arm/bcm2835.txt > for an example. You should split this patch out separately as the DT > maintainers generally want to see bindings as a separate patch for easy > independent review. Ok I will do that. This will then be merged by Linus in the 3.12 merge window into a working version or how does this work? Currently I have based this patch on top of 3.11-rc1 on which tree should I base my changes? > Last thing, compatible strings are not to have wildcards in them. See > http://devicetree.org/Device_Tree_Usage#Understanding_the_compatible_Property > and note the Warning at the bottom. Also see how bcm2835.txt and > bcm11351.txt use a specific model. Ok will do that. >> + model = "BCM5301X/BCM4707/BCM4708/BCM4709 SoC"; >> + interrupt-parent = <&gic>; >> + >> + chosen { >> + bootargs = "console=ttyS0,115200 earlyprintk debug"; >> + }; >> + >> + cpus { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + cpu at 0 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + reg = <0>; >> + }; >> + }; >> + >> + clocks { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + clk_periph: periph { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <400000000>; >> + }; >> + }; >> + >> + uart at 18000300 { >> + compatible = "ns16550"; >> + reg = <0x18000300 0x100>; >> + interrupts = <0 85 4>; > > The DT files should be switched to use the C preprocessor like several > other machines have already done (see bcm11351.dtsi, for example), you > can use the existing GIC includes and have human-redable defines for the > edge/level values here and throughout all interrupt properties. Ok I will read that and change it. >> + clock-frequency = <100000000>; >> + }; >> + >> + uart at 18000400 { >> + compatible = "ns16550"; >> + reg = <0x18000400 0x100>; >> + interrupts = <0 85 4>; >> + clock-frequency = <100000000>; >> + }; >> + >> + gic: interrupt-controller at 19021000 { >> + compatible = "arm,cortex-a9-gic"; >> + #interrupt-cells = <3>; >> + #address-cells = <0>; >> + interrupt-controller; >> + reg = <0x19021000 0x1000>, >> + <0x19020100 0x100>; >> + }; >> + >> + timer at 19020200 { >> + compatible = "arm,cortex-a9-global-timer"; >> + reg = <0x19020200 0x100>; >> + interrupts = <1 11 0xf04>; >> + clocks = <&clk_periph>; >> + #clock-cells = <0>; >> + }; >> +}; >> diff --git a/arch/arm/include/debug/bcm53xx.S b/arch/arm/include/debug/bcm53xx.S >> new file mode 100644 >> index 0000000..98c836b >> --- /dev/null >> +++ b/arch/arm/include/debug/bcm53xx.S >> @@ -0,0 +1,19 @@ >> +/* >> + * Macros used for EARLY_PRINTK, in low-level UART debug console >> + * >> + * Copyright 2013 Hauke Mehrtens >> + * >> + * Licensed under the GNU/GPL. See COPYING for details. >> + */ >> + >> +#define BCM53XX_UART1_PHYS 0x18000300 >> +#define BCM53XX_UART1_VIRT 0xf1000300 >> +#define BCM53XX_UART1_SH 0 >> + >> + .macro addruart, rp, rv, tmp >> + ldr \rp, =BCM53XX_UART1_PHYS @ MMU off, Physical >> + ldr \rv, =BCM53XX_UART1_VIRT @ MMU on, Virtual >> + .endm >> + >> +#define UART_SHIFT BCM53XX_UART1_SH >> +#include >> diff --git a/arch/arm/mach-bcm53xx/Kconfig b/arch/arm/mach-bcm53xx/Kconfig >> new file mode 100644 >> index 0000000..1e16e87 >> --- /dev/null >> +++ b/arch/arm/mach-bcm53xx/Kconfig >> @@ -0,0 +1,10 @@ >> +config ARCH_BCM53XX >> + bool "Broadcom BCM47XX / BCM53XX ARM SoC" >> + select CPU_V7 >> + select ARM_GIC >> + select HAVE_CLK >> + select GENERIC_CLOCKEVENTS >> + select GENERIC_TIME >> + select ARM_GLOBAL_TIMER >> + help >> + Support for Broadcom BCM47XX and BCM53XX SoCs with ARM CPU cores. >> diff --git a/arch/arm/mach-bcm53xx/Makefile b/arch/arm/mach-bcm53xx/Makefile >> new file mode 100644 >> index 0000000..88da84d >> --- /dev/null >> +++ b/arch/arm/mach-bcm53xx/Makefile >> @@ -0,0 +1 @@ >> +obj-y += bcm53xx.o >> diff --git a/arch/arm/mach-bcm53xx/bcm53xx.c b/arch/arm/mach-bcm53xx/bcm53xx.c >> new file mode 100644 >> index 0000000..aa5bd397 >> --- /dev/null >> +++ b/arch/arm/mach-bcm53xx/bcm53xx.c >> @@ -0,0 +1,68 @@ >> +/* >> + * Broadcom BCM47XX / BCM53XX ARM platform code. >> + * >> + * Copyright 2013 Hauke Mehrtens >> + * >> + * Licensed under the GNU/GPL. See COPYING for details. >> + */ >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> + >> +static int bcm53xx_abort_handler(unsigned long addr, unsigned int fsr, >> + struct pt_regs *regs) >> +{ >> + /* >> + * These happen for no good reason >> + * possibly left over from CFE >> + */ >> + pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n", >> + addr, fsr); >> + >> + /* Returning non-zero causes fault display and panic */ >> + return 0; >> +} >> + >> +static void bcm53xx_aborts_enable(void) >> +{ >> + /* Install our hook */ >> + hook_fault_code(16 + 6, bcm53xx_abort_handler, SIGBUS, 0, >> + "imprecise external abort"); >> +} >> + >> +static void __init bcm53xx_timer_init(void) >> +{ >> + of_clk_init(NULL); >> + clocksource_of_init(); >> +} >> + >> +void __init bcm53xx_map_io(void) >> +{ >> + debug_ll_io_init(); >> + bcm53xx_aborts_enable(); >> +} >> + >> +static void __init bcm53xx_dt_init(void) >> +{ >> + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); >> +} >> + >> +static const char const *bcm53xx_dt_compat[] = { >> + "brcm,bcm5301x", >> + "netgear,r6250v1", >> + NULL, >> +}; >> + >> +DT_MACHINE_START(BCM53XX, "BCM53XX") >> + .init_machine = bcm53xx_dt_init, >> + .map_io = bcm53xx_map_io, >> + .init_irq = irqchip_init, >> + .init_time = bcm53xx_timer_init, >> + .dt_compat = bcm53xx_dt_compat, >> +MACHINE_END >> -- >> 1.7.10.4 >>