* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-04-22 1:39 [PATCH RESEND 0/5] ARM: BCM63XX: add support for BCM63138 SoC Florian Fainelli
@ 2014-04-22 1:39 ` Florian Fainelli
2014-04-22 10:45 ` Arnd Bergmann
2014-04-22 1:39 ` [PATCH RESEND 2/5] ARM: BCM63XX: add low-level UART debug support Florian Fainelli
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Florian Fainelli @ 2014-04-22 1:39 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds basic support for the Broadcom BCM63138 DSL SoC which is
using a dual-core Cortex A9 system. Add the very minimum required code
boot Linux on this SoC.
Due to the two specific register address spaces located at 0x8000_0000
and 0xfffe_0000, we need to setup a specific iotable descriptor for
those to be remapped at the expected virtual addresses.
Finally, the PL310 cache controller requires a bit of tweaking before
handing its initialization over l2x0_of_init(), this is also taken care
of to make sure that its size is properly configured.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../devicetree/bindings/arm/bcm/bcm63138.txt | 9 +++
arch/arm/mach-bcm/Kconfig | 20 +++++
arch/arm/mach-bcm/Makefile | 1 +
arch/arm/mach-bcm/bcm63xx.h | 29 +++++++
arch/arm/mach-bcm/board_bcm63xx.c | 94 ++++++++++++++++++++++
5 files changed, 153 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
create mode 100644 arch/arm/mach-bcm/bcm63xx.h
create mode 100644 arch/arm/mach-bcm/board_bcm63xx.c
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm63138.txt b/Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
new file mode 100644
index 000000000000..bd49987a8812
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
@@ -0,0 +1,9 @@
+Broadcom BCM63138 DSL System-on-a-Chip device tree bindings
+-----------------------------------------------------------
+
+Boards compatible with the BCM63138 DSL System-on-a-Chip should have the
+following properties:
+
+Required root node property:
+
+compatible: should be "brcm,bcm63138"
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 49c914cd9c7a..26b51bcf878c 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -69,6 +69,26 @@ config ARCH_BCM_5301X
different SoC or with the older BCM47XX and BCM53XX based
network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
+config ARCH_BCM_63XX
+ bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7
+ depends on MMU
+ select ARM_ERRATA_754322
+ select ARM_ERRATA_764369 if SMP
+ select ARM_GIC
+ select ARM_GLOBAL_TIMER
+ select CACHE_L2X0
+ select COMMON_CLK
+ select CPU_V7
+ select GENERIC_CLOCKEVENTS
+ select HAVE_ARM_ARCH_TIMER
+ select HAVE_ARM_TWD if SMP
+ select HAVE_ARM_SCU if SMP
+ select HAVE_SMP
+ help
+ This enables support for systems based on Broadcom DSL SoCs.
+ It currently supports the 'BCM63XX' ARM-based family, which includes
+ the BCM63138 variant.
+
endmenu
endif
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index a326b28c4406..c24ba586297d 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o
plus_sec := $(call as-instr,.arch_extension sec,+sec)
AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)
obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o
+obj-$(CONFIG_ARCH_BCM_63XX) := board_bcm63xx.o
diff --git a/arch/arm/mach-bcm/bcm63xx.h b/arch/arm/mach-bcm/bcm63xx.h
new file mode 100644
index 000000000000..95872c8131f6
--- /dev/null
+++ b/arch/arm/mach-bcm/bcm63xx.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Broadcom Corporation
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __ARM_BCM63XX_H
+#define __ARM_BCM63XX_H
+
+#define IO_ADDRESS(x) (((x) & 0x00ffffff) + 0xfc000000)
+
+/* AHB register space */
+#define BCM63XX_AHB_PHYS 0x80001000
+#define BCM63XX_AHB_VIRT IO_ADDRESS(BCM63XX_AHB_PHYS)
+#define BCM63XX_AHB_SIZE 0x800000
+
+/* PERIPH (legacy) register space */
+#define BCM63XX_PERIPH_PHYS 0xfffe8000
+#define BCM63XX_PERIPH_VIRT IO_ADDRESS(BCM63XX_PERIPH_PHYS)
+#define BCM63XX_PERIPH_SIZE 0x10000
+
+#endif /* __ARM_BCM63XX_H */
diff --git a/arch/arm/mach-bcm/board_bcm63xx.c b/arch/arm/mach-bcm/board_bcm63xx.c
new file mode 100644
index 000000000000..a779aca673c4
--- /dev/null
+++ b/arch/arm/mach-bcm/board_bcm63xx.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2014 Broadcom Corporation
+ *
+ * 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.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_platform.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/clocksource.h>
+#include <linux/irqchip.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include "bcm63xx.h"
+
+static void __init bcm63xx_l2cc_init(void)
+{
+ u32 auxctl_val = 0, auxctl_msk = ~0UL;
+
+ /* 16-way cache */
+ auxctl_val |= (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
+ auxctl_msk &= ~(1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
+ /* 32 KB */
+ auxctl_val |= (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT);
+ auxctl_msk &= ~(L2X0_AUX_CTRL_WAY_SIZE_MASK);
+
+ /*
+ * Set bit 22 in the auxiliary control register. If this bit
+ * is cleared, PL310 treats Normal Shared Non-cacheable
+ * accesses as Cacheable no-allocate.
+ */
+ auxctl_val |= (1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT);
+
+ /* Allow non-secure access */
+ auxctl_val |= (1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT);
+ /* Instruction prefetch */
+ auxctl_val |= (1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT);
+ /* Early BRESP */
+ auxctl_val |= (1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT);
+
+ l2x0_of_init(auxctl_val, auxctl_msk);
+}
+
+static void __init bcm63xx_init(void)
+{
+ of_platform_populate(NULL, of_default_bus_match_table, NULL,
+ &platform_bus);
+ bcm63xx_l2cc_init();
+}
+
+static const char * const bcm63xx_dt_compat[] = {
+ "brcm,bcm63138",
+ NULL
+};
+
+static struct map_desc bcm63xx_map_desc[] __initdata = {
+ /* AHB register space */
+ {
+ .virtual = BCM63XX_AHB_VIRT,
+ .pfn = __phys_to_pfn(BCM63XX_AHB_PHYS),
+ .length = BCM63XX_AHB_SIZE,
+ .type = MT_DEVICE,
+ },
+ /* PERIPH register space */
+ {
+ .virtual = BCM63XX_PERIPH_VIRT,
+ .pfn = __phys_to_pfn(BCM63XX_PERIPH_PHYS),
+ .length = BCM63XX_PERIPH_SIZE,
+ .type = MT_DEVICE,
+ },
+};
+
+static void __init bcm63xx_map_io(void)
+{
+ iotable_init(bcm63xx_map_desc, ARRAY_SIZE(bcm63xx_map_desc));
+}
+
+DT_MACHINE_START(BCM63XXX_DT, "BCM63xx DSL SoC")
+ .map_io = bcm63xx_map_io,
+ .init_machine = bcm63xx_init,
+ .dt_compat = bcm63xx_dt_compat,
+MACHINE_END
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-04-22 1:39 ` [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC Florian Fainelli
@ 2014-04-22 10:45 ` Arnd Bergmann
2014-05-02 5:32 ` Florian Fainelli
0 siblings, 1 reply; 15+ messages in thread
From: Arnd Bergmann @ 2014-04-22 10:45 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 21 April 2014 18:39:14 Florian Fainelli wrote:
> This patch adds basic support for the Broadcom BCM63138 DSL SoC which is
> using a dual-core Cortex A9 system. Add the very minimum required code
> boot Linux on this SoC.
>
> Due to the two specific register address spaces located at 0x8000_0000
> and 0xfffe_0000, we need to setup a specific iotable descriptor for
> those to be remapped at the expected virtual addresses.
What is the significance of the "expected virtual address"? All drivers
nowadays should call ioremap() and use whatever virtual address comes
out of that.
> Finally, the PL310 cache controller requires a bit of tweaking before
> handing its initialization over l2x0_of_init(), this is also taken care
> of to make sure that its size is properly configured.
Russell has just spent a lot of work on cleaning up the l2x0 setup
of various platforms. I really don't want to see new platform specific
code for this.
> diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
> index 49c914cd9c7a..26b51bcf878c 100644
> --- a/arch/arm/mach-bcm/Kconfig
> +++ b/arch/arm/mach-bcm/Kconfig
> @@ -69,6 +69,26 @@ config ARCH_BCM_5301X
> different SoC or with the older BCM47XX and BCM53XX based
> network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
>
> +config ARCH_BCM_63XX
> + bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7
> + depends on MMU
> + select ARM_ERRATA_754322
> + select ARM_ERRATA_764369 if SMP
> + select ARM_GIC
> + select ARM_GLOBAL_TIMER
> + select CACHE_L2X0
> + select COMMON_CLK
> + select CPU_V7
> + select GENERIC_CLOCKEVENTS
> + select HAVE_ARM_ARCH_TIMER
> + select HAVE_ARM_TWD if SMP
> + select HAVE_ARM_SCU if SMP
> + select HAVE_SMP
A lot of these are already selected by ARCH_MULTI_V7 and can be
omitted here.
> +#ifndef __ARM_BCM63XX_H
> +#define __ARM_BCM63XX_H
> +
> +#define IO_ADDRESS(x) (((x) & 0x00ffffff) + 0xfc000000)
> +
> +/* AHB register space */
> +#define BCM63XX_AHB_PHYS 0x80001000
> +#define BCM63XX_AHB_VIRT IO_ADDRESS(BCM63XX_AHB_PHYS)
> +#define BCM63XX_AHB_SIZE 0x800000
> +
> +/* PERIPH (legacy) register space */
> +#define BCM63XX_PERIPH_PHYS 0xfffe8000
> +#define BCM63XX_PERIPH_VIRT IO_ADDRESS(BCM63XX_PERIPH_PHYS)
> +#define BCM63XX_PERIPH_SIZE 0x10000
You shouldn't need these any more. If you do, just move all of this
into the main file, to ensure no other file accidentally relies
on hardcoded values.
Note that BCM63XX_AHB_PHYS is nor aligned, so AFAICT you don't
actually get a huge page entry for it, and there is no point
doing this at all, as it has neither functional nor performance
relevance.
You may have out-of-tree drivers that you haven't cleaned up
or posted yet relying on specific static mappings, but that is
no reason to have these mappings in the mainline kernel.
> diff --git a/arch/arm/mach-bcm/board_bcm63xx.c b/arch/arm/mach-bcm/board_bcm63xx.c
> new file mode 100644
> index 000000000000..a779aca673c4
> --- /dev/null
> +++ b/arch/arm/mach-bcm/board_bcm63xx.c
Maybe just "bcm63xx.c"? We don't really do "board" files any more.
> +static void __init bcm63xx_l2cc_init(void)
> +{
> + u32 auxctl_val = 0, auxctl_msk = ~0UL;
> +
> + /* 16-way cache */
> + auxctl_val |= (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
> + auxctl_msk &= ~(1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
> + /* 32 KB */
> + auxctl_val |= (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT);
> + auxctl_msk &= ~(L2X0_AUX_CTRL_WAY_SIZE_MASK);
> +
> + /*
> + * Set bit 22 in the auxiliary control register. If this bit
> + * is cleared, PL310 treats Normal Shared Non-cacheable
> + * accesses as Cacheable no-allocate.
> + */
> + auxctl_val |= (1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT);
> +
> + /* Allow non-secure access */
> + auxctl_val |= (1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT);
> + /* Instruction prefetch */
> + auxctl_val |= (1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT);
> + /* Early BRESP */
> + auxctl_val |= (1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT);
> +
> + l2x0_of_init(auxctl_val, auxctl_msk);
> +}
What are the power-on values of bits you override here? Are you sure
you have to force all of them?
Don't we already have ways to specify the same things in DT properties?
Arnd
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-04-22 10:45 ` Arnd Bergmann
@ 2014-05-02 5:32 ` Florian Fainelli
2014-05-02 7:55 ` Arnd Bergmann
0 siblings, 1 reply; 15+ messages in thread
From: Florian Fainelli @ 2014-05-02 5:32 UTC (permalink / raw)
To: linux-arm-kernel
2014-04-22 3:45 GMT-07:00 Arnd Bergmann <arnd@arndb.de>:
> On Monday 21 April 2014 18:39:14 Florian Fainelli wrote:
>> This patch adds basic support for the Broadcom BCM63138 DSL SoC which is
>> using a dual-core Cortex A9 system. Add the very minimum required code
>> boot Linux on this SoC.
>>
>> Due to the two specific register address spaces located at 0x8000_0000
>> and 0xfffe_0000, we need to setup a specific iotable descriptor for
>> those to be remapped at the expected virtual addresses.
>
> What is the significance of the "expected virtual address"? All drivers
> nowadays should call ioremap() and use whatever virtual address comes
> out of that.
>
>> Finally, the PL310 cache controller requires a bit of tweaking before
>> handing its initialization over l2x0_of_init(), this is also taken care
>> of to make sure that its size is properly configured.
>
> Russell has just spent a lot of work on cleaning up the l2x0 setup
> of various platforms. I really don't want to see new platform specific
> code for this.
Ok, I will try with his cleanup patchset applied and see if I need any
platform specific implementation.
>
>> diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
>> index 49c914cd9c7a..26b51bcf878c 100644
>> --- a/arch/arm/mach-bcm/Kconfig
>> +++ b/arch/arm/mach-bcm/Kconfig
>> @@ -69,6 +69,26 @@ config ARCH_BCM_5301X
>> different SoC or with the older BCM47XX and BCM53XX based
>> network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
>>
>> +config ARCH_BCM_63XX
>> + bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7
>> + depends on MMU
>> + select ARM_ERRATA_754322
>> + select ARM_ERRATA_764369 if SMP
>> + select ARM_GIC
>> + select ARM_GLOBAL_TIMER
>> + select CACHE_L2X0
>> + select COMMON_CLK
>> + select CPU_V7
>> + select GENERIC_CLOCKEVENTS
>> + select HAVE_ARM_ARCH_TIMER
>> + select HAVE_ARM_TWD if SMP
>> + select HAVE_ARM_SCU if SMP
>> + select HAVE_SMP
>
> A lot of these are already selected by ARCH_MULTI_V7 and can be
> omitted here.
>
>> +#ifndef __ARM_BCM63XX_H
>> +#define __ARM_BCM63XX_H
>> +
>> +#define IO_ADDRESS(x) (((x) & 0x00ffffff) + 0xfc000000)
>> +
>> +/* AHB register space */
>> +#define BCM63XX_AHB_PHYS 0x80001000
>> +#define BCM63XX_AHB_VIRT IO_ADDRESS(BCM63XX_AHB_PHYS)
>> +#define BCM63XX_AHB_SIZE 0x800000
>> +
>> +/* PERIPH (legacy) register space */
>> +#define BCM63XX_PERIPH_PHYS 0xfffe8000
>> +#define BCM63XX_PERIPH_VIRT IO_ADDRESS(BCM63XX_PERIPH_PHYS)
>> +#define BCM63XX_PERIPH_SIZE 0x10000
>
> You shouldn't need these any more. If you do, just move all of this
> into the main file, to ensure no other file accidentally relies
> on hardcoded values.
>
> Note that BCM63XX_AHB_PHYS is nor aligned, so AFAICT you don't
> actually get a huge page entry for it, and there is no point
> doing this at all, as it has neither functional nor performance
> relevance.
>
> You may have out-of-tree drivers that you haven't cleaned up
> or posted yet relying on specific static mappings, but that is
> no reason to have these mappings in the mainline kernel.
I tried without the iotable entries, and any register access to these
regions did hang the system, I will check harder what was going on
there.
>
>> diff --git a/arch/arm/mach-bcm/board_bcm63xx.c b/arch/arm/mach-bcm/board_bcm63xx.c
>> new file mode 100644
>> index 000000000000..a779aca673c4
>> --- /dev/null
>> +++ b/arch/arm/mach-bcm/board_bcm63xx.c
>
> Maybe just "bcm63xx.c"? We don't really do "board" files any more.
Makes sense, there is nothing board specific here (and there should
not be anyway).
>
>> +static void __init bcm63xx_l2cc_init(void)
>> +{
>> + u32 auxctl_val = 0, auxctl_msk = ~0UL;
>> +
>> + /* 16-way cache */
>> + auxctl_val |= (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
>> + auxctl_msk &= ~(1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT);
>> + /* 32 KB */
>> + auxctl_val |= (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT);
>> + auxctl_msk &= ~(L2X0_AUX_CTRL_WAY_SIZE_MASK);
>> +
>> + /*
>> + * Set bit 22 in the auxiliary control register. If this bit
>> + * is cleared, PL310 treats Normal Shared Non-cacheable
>> + * accesses as Cacheable no-allocate.
>> + */
>> + auxctl_val |= (1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT);
>> +
>> + /* Allow non-secure access */
>> + auxctl_val |= (1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT);
>> + /* Instruction prefetch */
>> + auxctl_val |= (1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT);
>> + /* Early BRESP */
>> + auxctl_val |= (1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT);
>> +
>> + l2x0_of_init(auxctl_val, auxctl_msk);
>> +}
>
> What are the power-on values of bits you override here? Are you sure
> you have to force all of them?
>
> Don't we already have ways to specify the same things in DT properties?
>
> Arnd
--
Florian
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-05-02 5:32 ` Florian Fainelli
@ 2014-05-02 7:55 ` Arnd Bergmann
2014-05-05 22:41 ` Florian Fainelli
0 siblings, 1 reply; 15+ messages in thread
From: Arnd Bergmann @ 2014-05-02 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 01 May 2014 22:32:27 Florian Fainelli wrote:
> >> +#ifndef __ARM_BCM63XX_H
> >> +#define __ARM_BCM63XX_H
> >> +
> >> +#define IO_ADDRESS(x) (((x) & 0x00ffffff) + 0xfc000000)
> >> +
> >> +/* AHB register space */
> >> +#define BCM63XX_AHB_PHYS 0x80001000
> >> +#define BCM63XX_AHB_VIRT IO_ADDRESS(BCM63XX_AHB_PHYS)
> >> +#define BCM63XX_AHB_SIZE 0x800000
> >> +
> >> +/* PERIPH (legacy) register space */
> >> +#define BCM63XX_PERIPH_PHYS 0xfffe8000
> >> +#define BCM63XX_PERIPH_VIRT IO_ADDRESS(BCM63XX_PERIPH_PHYS)
> >> +#define BCM63XX_PERIPH_SIZE 0x10000
> >
> > You shouldn't need these any more. If you do, just move all of this
> > into the main file, to ensure no other file accidentally relies
> > on hardcoded values.
> >
> > Note that BCM63XX_AHB_PHYS is nor aligned, so AFAICT you don't
> > actually get a huge page entry for it, and there is no point
> > doing this at all, as it has neither functional nor performance
> > relevance.
> >
> > You may have out-of-tree drivers that you haven't cleaned up
> > or posted yet relying on specific static mappings, but that is
> > no reason to have these mappings in the mainline kernel.
>
> I tried without the iotable entries, and any register access to these
> regions did hang the system, I will check harder what was going on
> there.
Can you clarify what you mean with 'any register access to these
regions did hang the system'? If you remove the call to iotable_init,
you obviously can't access the registers through BCM63XX_{AHB,PERIPH}_VIRT
any longer, but accesses through a pointer returned from ioremap()
should keep working as before.
The DEBUG_LL early output is a special case here, these need one
of three options:
- .map_io is NULL (preferred)
- .map_io points to a function that calls debug_ll_io_init()
- .map_io points to a function that calls iotable_init with
an equivalent or larger mapping as debug_ll_io_init() would.
I suspect you were doing the third here for historic reasons.
Arnd
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-05-02 7:55 ` Arnd Bergmann
@ 2014-05-05 22:41 ` Florian Fainelli
2014-05-06 9:32 ` Arnd Bergmann
0 siblings, 1 reply; 15+ messages in thread
From: Florian Fainelli @ 2014-05-05 22:41 UTC (permalink / raw)
To: linux-arm-kernel
2014-05-02 0:55 GMT-07:00 Arnd Bergmann <arnd@arndb.de>:
> On Thursday 01 May 2014 22:32:27 Florian Fainelli wrote:
>> >> +#ifndef __ARM_BCM63XX_H
>> >> +#define __ARM_BCM63XX_H
>> >> +
>> >> +#define IO_ADDRESS(x) (((x) & 0x00ffffff) + 0xfc000000)
>> >> +
>> >> +/* AHB register space */
>> >> +#define BCM63XX_AHB_PHYS 0x80001000
>> >> +#define BCM63XX_AHB_VIRT IO_ADDRESS(BCM63XX_AHB_PHYS)
>> >> +#define BCM63XX_AHB_SIZE 0x800000
>> >> +
>> >> +/* PERIPH (legacy) register space */
>> >> +#define BCM63XX_PERIPH_PHYS 0xfffe8000
>> >> +#define BCM63XX_PERIPH_VIRT IO_ADDRESS(BCM63XX_PERIPH_PHYS)
>> >> +#define BCM63XX_PERIPH_SIZE 0x10000
>> >
>> > You shouldn't need these any more. If you do, just move all of this
>> > into the main file, to ensure no other file accidentally relies
>> > on hardcoded values.
>> >
>> > Note that BCM63XX_AHB_PHYS is nor aligned, so AFAICT you don't
>> > actually get a huge page entry for it, and there is no point
>> > doing this at all, as it has neither functional nor performance
>> > relevance.
>> >
>> > You may have out-of-tree drivers that you haven't cleaned up
>> > or posted yet relying on specific static mappings, but that is
>> > no reason to have these mappings in the mainline kernel.
>>
>> I tried without the iotable entries, and any register access to these
>> regions did hang the system, I will check harder what was going on
>> there.
>
> Can you clarify what you mean with 'any register access to these
> regions did hang the system'?
I would not get any console output progress around the time we
initialize the MMU (roughly), neither would I get an exception since
that is too early in the boot process.
> If you remove the call to iotable_init,
> you obviously can't access the registers through BCM63XX_{AHB,PERIPH}_VIRT
> any longer, but accesses through a pointer returned from ioremap()
> should keep working as before.
>
> The DEBUG_LL early output is a special case here, these need one
> of three options:
>
> - .map_io is NULL (preferred)
> - .map_io points to a function that calls debug_ll_io_init()
> - .map_io points to a function that calls iotable_init with
> an equivalent or larger mapping as debug_ll_io_init() would.
>
> I suspect you were doing the third here for historic reasons.
I think you are right, I was in the 3rd case where accessing the UART
using its virtual address would make the system. Reading through
devicemaps_init(), defining a custom map_io() functions means you are
in control and you explicitely need to call debug_ll_io_init(), which
I was not doing when I removed my custom map_io() implementation.
Thanks!
--
Florian
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
2014-05-05 22:41 ` Florian Fainelli
@ 2014-05-06 9:32 ` Arnd Bergmann
0 siblings, 0 replies; 15+ messages in thread
From: Arnd Bergmann @ 2014-05-06 9:32 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 05 May 2014 15:41:43 Florian Fainelli wrote:
> 2014-05-02 0:55 GMT-07:00 Arnd Bergmann <arnd@arndb.de>:
> > On Thursday 01 May 2014 22:32:27 Florian Fainelli wrote:
> > If you remove the call to iotable_init,
> > you obviously can't access the registers through BCM63XX_{AHB,PERIPH}_VIRT
> > any longer, but accesses through a pointer returned from ioremap()
> > should keep working as before.
> >
> > The DEBUG_LL early output is a special case here, these need one
> > of three options:
> >
> > - .map_io is NULL (preferred)
> > - .map_io points to a function that calls debug_ll_io_init()
> > - .map_io points to a function that calls iotable_init with
> > an equivalent or larger mapping as debug_ll_io_init() would.
> >
> > I suspect you were doing the third here for historic reasons.
>
> I think you are right, I was in the 3rd case where accessing the UART
> using its virtual address would make the system. Reading through
> devicemaps_init(), defining a custom map_io() functions means you are
> in control and you explicitely need to call debug_ll_io_init(), which
> I was not doing when I removed my custom map_io() implementation.
Ok, so I guess it should all work now if you remove the function from
the submission, or keep one in your private tree that sets up any
mapping needed by drivers that are not converted along with
debug_ll_io_init().
Arnd
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH RESEND 2/5] ARM: BCM63XX: add low-level UART debug support
2014-04-22 1:39 [PATCH RESEND 0/5] ARM: BCM63XX: add support for BCM63138 SoC Florian Fainelli
2014-04-22 1:39 ` [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC Florian Fainelli
@ 2014-04-22 1:39 ` Florian Fainelli
2014-04-22 1:39 ` [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree Florian Fainelli
` (2 subsequent siblings)
4 siblings, 0 replies; 15+ messages in thread
From: Florian Fainelli @ 2014-04-22 1:39 UTC (permalink / raw)
To: linux-arm-kernel
Broadcom BCM63xx DSL SoCs have a different UART implementation for which
we need specially crafted low-level debug assembly code to support. Add
support for this using the standard definitions provided in
include/linux/serial_bcm63xx.h (shared with their MIPS counterparts).
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/arm/Kconfig.debug | 18 ++++++++++++++++--
arch/arm/include/debug/bcm63xxx.S | 33 +++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/include/debug/bcm63xxx.S
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4a2fc0bf6fc9..321bc679ff8c 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -122,6 +122,11 @@ choice
mobile SoCs in the Kona family of chips (e.g. bcm28155,
bcm11351, etc...)
+ config DEBUG_BCM63XX
+ bool "Kernel low-level debugging on BCM63XX UART"
+ depends on ARCH_BCM_63XX
+ select DEBUG_UART_BCM63XX
+
config DEBUG_BERLIN_UART
bool "Marvell Berlin SoC Debug UART"
depends on ARCH_BERLIN
@@ -981,6 +986,7 @@ config DEBUG_LL_INCLUDE
default "debug/vf.S" if DEBUG_VF_UART
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
+ default "debug/bcm63xxx.S" if DEBUG_UART_BCM63XX
default "mach/debug-macro.S"
# Compatibility options for PL01x
@@ -1000,6 +1006,10 @@ config DEBUG_UART_8250
ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
+# Compatibility options for BCM63xx
+config DEBUG_UART_BCM63XX
+ def_bool ARCH_BCM_63XX
+
config DEBUG_UART_PHYS
hex "Physical base address of debug UART"
default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
@@ -1055,10 +1065,12 @@ config DEBUG_UART_PHYS
default 0xffc02000 if DEBUG_SOCFPGA_UART
default 0xffd82340 if ARCH_IOP13XX
default 0xfff36000 if DEBUG_HIGHBANK_UART
+ default 0xfffe8600 if DEBUG_UART_BCM63XX
default 0xfffff700 if ARCH_IOP33X
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
DEBUG_LL_UART_EFM32 || \
- DEBUG_UART_8250 || DEBUG_UART_PL01X
+ DEBUG_UART_8250 || DEBUG_UART_PL01X || \
+ DEBUG_UART_BCM63XX
config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
@@ -1080,6 +1092,7 @@ config DEBUG_UART_VIRT
default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
+ default 0xfcfe8600 if DEBUG_UART_BCM63XX
default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
default 0xfd000000 if ARCH_SPEAR13XX
default 0xfd012000 if ARCH_MV78XX0
@@ -1116,7 +1129,8 @@ config DEBUG_UART_VIRT
default 0xff003000 if DEBUG_U300_UART
default DEBUG_UART_PHYS if !MMU
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
- DEBUG_UART_8250 || DEBUG_UART_PL01X
+ DEBUG_UART_8250 || DEBUG_UART_PL01X || \
+ DEBUG_UART_BCM63XX
config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"
diff --git a/arch/arm/include/debug/bcm63xxx.S b/arch/arm/include/debug/bcm63xxx.S
new file mode 100644
index 000000000000..a28fbd1bb5d8
--- /dev/null
+++ b/arch/arm/include/debug/bcm63xxx.S
@@ -0,0 +1,33 @@
+/*
+ * Broadcom BCM63xxx low-level UART debug
+ *
+ * Copyright (C) 2014 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/serial_bcm63xx.h>
+
+ .macro addruart, rp, rv, tmp
+ ldr \rp, =CONFIG_DEBUG_UART_PHYS
+ ldr \rv, =CONFIG_DEBUG_UART_VIRT
+ .endm
+
+ .macro senduart, rd, rx
+ /* word access do not work */
+ strb \rd, [\rx, #UART_FIFO_REG]
+ .endm
+
+ .macro waituart, rd, rx
+1001: ldr \rd, [\rx, #UART_IR_REG]
+ tst \rd, #(1 << UART_IR_TXEMPTY)
+ beq 1001b
+ .endm
+
+ .macro busyuart, rd, rx
+1002: ldr \rd, [\rx, #UART_IR_REG]
+ tst \rd, #(1 << UART_IR_TXTRESH)
+ beq 1002b
+ .endm
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree
2014-04-22 1:39 [PATCH RESEND 0/5] ARM: BCM63XX: add support for BCM63138 SoC Florian Fainelli
2014-04-22 1:39 ` [PATCH RESEND 1/5] ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC Florian Fainelli
2014-04-22 1:39 ` [PATCH RESEND 2/5] ARM: BCM63XX: add low-level UART debug support Florian Fainelli
@ 2014-04-22 1:39 ` Florian Fainelli
2014-04-22 10:52 ` Arnd Bergmann
2014-04-22 1:39 ` [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS Florian Fainelli
2014-04-22 1:39 ` [PATCH RESEND 5/5] MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs Florian Fainelli
4 siblings, 1 reply; 15+ messages in thread
From: Florian Fainelli @ 2014-04-22 1:39 UTC (permalink / raw)
To: linux-arm-kernel
Add a very minimalistic BCM63138 Device Tree include file which
describes the BCM63138 SoC with only the basic set of required
peripherals:
- Cortex A9 CPU
- ARM GIC
- PL310 Level-2 cache controller
- ARM TWD & Global timers
- ARM TWD watchdog
- legacy MIPS bus (UBUS)
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/arm/boot/dts/bcm63138.dtsi | 109 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 109 insertions(+)
create mode 100644 arch/arm/boot/dts/bcm63138.dtsi
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
new file mode 100644
index 000000000000..190d6e53a85a
--- /dev/null
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -0,0 +1,109 @@
+/*
+ * Broadcom BCM63138 DSL SoCs Device Tree
+ *
+ * Copyright (C) 2014 Broadcom Corporation
+ *
+ * Licensed under the GNU/GPL. See COPYING for details
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+#include "skeleton.dtsi"
+
+/ {
+ compatible = "brcm,bcm63138";
+ model = "Broadcom BCM63138 DSL SoC";
+ interrupt-parent = <&gic>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu at 0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a9";
+ next-level-cache = <&L2>;
+ reg = <0>;
+ };
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ arm_timer_clk: arm_timer_clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <500000000>;
+ };
+ };
+
+ /* ARM bus */
+ axi at 80000000 {
+ compatible = "simple-bus";
+ ranges = <0 0x80000000 0x783003>;
+ reg = <0x80000000 0x783003>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ L2: cache-controller at 1d000 {
+ compatible = "arm,pl310-cache";
+ reg = <0x1d000 0x1000>;
+ cache-unified;
+ cache-level = <2>;
+ interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ mpcore at 1e000 {
+ compatible = "simple-bus";
+ reg = <0x1e000 0x20000>;
+ ranges = <0 0x1e000 0x20000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ scu: scu at 0 {
+ compatible = "arm,cortex-a9-scu";
+ reg = <0x0 0x100>;
+ };
+
+ gic: interrupt-controller at 100 {
+ compatible = "arm,cortex-a9-gic";
+ reg = <0x1000 0x1000
+ 0x100 0x100>;
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ };
+
+ global_timer: timer at 200 {
+ compatible = "arm,cortex-a9-global-timer";
+ reg = <0x200 0x20>;
+ interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&arm_timer_clk>;
+ };
+
+ local_timer: local-timer at 600 {
+ compatible = "arm,cortex-a9-twd-timer";
+ reg = <0x600 0x20>;
+ interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&arm_timer_clk>;
+ };
+
+ twd_watchdog: watchdog at 620 {
+ compatible = "arm,cortex-a9-twd-wdt";
+ reg = <0x620 0x20>;
+ interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
+ };
+ };
+ };
+
+ /* Legacy UBUS base */
+ ubus at fffe8000 {
+ compatible = "simple-bus";
+ reg = <0xfffe8000 0x8053>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0xfffe8000 0x8053>;
+ };
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree
2014-04-22 1:39 ` [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree Florian Fainelli
@ 2014-04-22 10:52 ` Arnd Bergmann
2014-05-02 5:37 ` Florian Fainelli
0 siblings, 1 reply; 15+ messages in thread
From: Arnd Bergmann @ 2014-04-22 10:52 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 21 April 2014 18:39:16 Florian Fainelli wrote:
>
> +#include "skeleton.dtsi"
> +
> +/ {
> + compatible = "brcm,bcm63138";
> + model = "Broadcom BCM63138 DSL SoC";
> + interrupt-parent = <&gic>;
> +
> + cpus {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + cpu at 0 {
> + device_type = "cpu";
> + compatible = "arm,cortex-a9";
> + next-level-cache = <&L2>;
> + reg = <0>;
> + };
> + };
Even if you don't support SMP yet, I can see no reason not
to list both CPUs here. The binding is known and the code
should ignore the extra cores if it doesn't know how to
turn them on.
> +
> + /* ARM bus */
> + axi at 80000000 {
> + compatible = "simple-bus";
> + ranges = <0 0x80000000 0x783003>;
> + reg = <0x80000000 0x783003>;
The length seems odd, I would expect that the bus actually
translates all addresses in the 0x80000000 range to downstream
devices even if there is nothing connected. Just round it up
to your best knowledge.
I would also drop the 'reg' property. Since you don't have a
specific "compatible" value, there is no way to use the registers
in this node.
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + L2: cache-controller at 1d000 {
> + compatible = "arm,pl310-cache";
> + reg = <0x1d000 0x1000>;
> + cache-unified;
> + cache-level = <2>;
> + interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;
> + };
> +
> + mpcore at 1e000 {
> + compatible = "simple-bus";
> + reg = <0x1e000 0x20000>;
> + ranges = <0 0x1e000 0x20000>;
> + #address-cells = <1>;
> + #size-cells = <1>;
Same thing here.
Also, can you explain why there is a separate 'mpcore' bus, and why the
cache controller is not part of that?
Do you have reason to believe that this is how the hardware actually
looks?
> +
> + /* Legacy UBUS base */
> + ubus at fffe8000 {
> + compatible = "simple-bus";
> + reg = <0xfffe8000 0x8053>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0 0xfffe8000 0x8053>;
> + };
> +};
Again, use a proper 'length' here and remove the 'reg' property.
Arnd
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree
2014-04-22 10:52 ` Arnd Bergmann
@ 2014-05-02 5:37 ` Florian Fainelli
0 siblings, 0 replies; 15+ messages in thread
From: Florian Fainelli @ 2014-05-02 5:37 UTC (permalink / raw)
To: linux-arm-kernel
2014-04-22 3:52 GMT-07:00 Arnd Bergmann <arnd@arndb.de>:
> On Monday 21 April 2014 18:39:16 Florian Fainelli wrote:
>>
>> +#include "skeleton.dtsi"
>> +
>> +/ {
>> + compatible = "brcm,bcm63138";
>> + model = "Broadcom BCM63138 DSL SoC";
>> + interrupt-parent = <&gic>;
>> +
>> + cpus {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + cpu at 0 {
>> + device_type = "cpu";
>> + compatible = "arm,cortex-a9";
>> + next-level-cache = <&L2>;
>> + reg = <0>;
>> + };
>> + };
>
> Even if you don't support SMP yet, I can see no reason not
> to list both CPUs here. The binding is known and the code
> should ignore the extra cores if it doesn't know how to
> turn them on.
OK.
>
>> +
>> + /* ARM bus */
>> + axi at 80000000 {
>> + compatible = "simple-bus";
>> + ranges = <0 0x80000000 0x783003>;
>> + reg = <0x80000000 0x783003>;
>
> The length seems odd, I would expect that the bus actually
> translates all addresses in the 0x80000000 range to downstream
> devices even if there is nothing connected. Just round it up
> to your best knowledge.
>
> I would also drop the 'reg' property. Since you don't have a
> specific "compatible" value, there is no way to use the registers
> in this node.
OK.
>
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> +
>> + L2: cache-controller at 1d000 {
>> + compatible = "arm,pl310-cache";
>> + reg = <0x1d000 0x1000>;
>> + cache-unified;
>> + cache-level = <2>;
>> + interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;
>> + };
>> +
>> + mpcore at 1e000 {
>> + compatible = "simple-bus";
>> + reg = <0x1e000 0x20000>;
>> + ranges = <0 0x1e000 0x20000>;
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>
>
> Same thing here.
>
> Also, can you explain why there is a separate 'mpcore' bus, and why the
> cache controller is not part of that?
>
> Do you have reason to believe that this is how the hardware actually
> looks?
I think I was just mistaken by how the register space looks like and
is named, but there probably is not a separate underlying bus, so I
will move this up one level as it should.
>
>> +
>> + /* Legacy UBUS base */
>> + ubus at fffe8000 {
>> + compatible = "simple-bus";
>> + reg = <0xfffe8000 0x8053>;
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + ranges = <0 0xfffe8000 0x8053>;
>> + };
>> +};
>
>
> Again, use a proper 'length' here and remove the 'reg' property.
>
> Arnd
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Florian
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS
2014-04-22 1:39 [PATCH RESEND 0/5] ARM: BCM63XX: add support for BCM63138 SoC Florian Fainelli
` (2 preceding siblings ...)
2014-04-22 1:39 ` [PATCH RESEND 3/5] ARM: BCM63XX: add BCM63138 minimal Device Tree Florian Fainelli
@ 2014-04-22 1:39 ` Florian Fainelli
2014-04-22 13:49 ` Jonas Gorski
2014-04-22 15:41 ` Matt Porter
2014-04-22 1:39 ` [PATCH RESEND 5/5] MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs Florian Fainelli
4 siblings, 2 replies; 15+ messages in thread
From: Florian Fainelli @ 2014-04-22 1:39 UTC (permalink / raw)
To: linux-arm-kernel
Add a DTS file for the Broadcom BCM963138DVT reference platform board
which leverages the bcm63138.dtsi SoC DTSi file.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/arm/boot/dts/Makefile | 3 +++
arch/arm/boot/dts/bcm63138dvt.dts | 18 ++++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 arch/arm/boot/dts/bcm63138dvt.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f31e46..2738fa6e950d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -53,8 +53,11 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
bcm21664-garnet.dtb
+dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
+ bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
+dtb-$(CONFIG_ARCH_BCM_63XX) += bcm63138dvt.dtb
dtb-$(CONFIG_ARCH_BERLIN) += \
berlin2-sony-nsz-gs7.dtb \
berlin2cd-google-chromecast.dtb
diff --git a/arch/arm/boot/dts/bcm63138dvt.dts b/arch/arm/boot/dts/bcm63138dvt.dts
new file mode 100644
index 000000000000..e212b4731978
--- /dev/null
+++ b/arch/arm/boot/dts/bcm63138dvt.dts
@@ -0,0 +1,18 @@
+/*
+ * Broadcom BCM63138 Reference Board DTS
+ *
+ * Copyright (C) 2014 Broadcom Corporation
+ */
+
+/dts-v1/;
+
+#include "bcm63138.dtsi"
+
+/ {
+ compatible = "BCM963138DVT", "brcm,bcm63138";
+ model = "Broadcom BCM963138DVT";
+
+ memory {
+ reg = <0x0 0x08000000>;
+ };
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS
2014-04-22 1:39 ` [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS Florian Fainelli
@ 2014-04-22 13:49 ` Jonas Gorski
2014-04-22 15:41 ` Matt Porter
1 sibling, 0 replies; 15+ messages in thread
From: Jonas Gorski @ 2014-04-22 13:49 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 22, 2014 at 3:39 AM, Florian Fainelli <f.fainelli@gmail.com> wrote:
> Add a DTS file for the Broadcom BCM963138DVT reference platform board
> which leverages the bcm63138.dtsi SoC DTSi file.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> arch/arm/boot/dts/Makefile | 3 +++
> arch/arm/boot/dts/bcm63138dvt.dts | 18 ++++++++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 arch/arm/boot/dts/bcm63138dvt.dts
Shouldn't the file be called bcm*9*63138dvt.dts, same as the board name?
Regards
Jonas
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS
2014-04-22 1:39 ` [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS Florian Fainelli
2014-04-22 13:49 ` Jonas Gorski
@ 2014-04-22 15:41 ` Matt Porter
1 sibling, 0 replies; 15+ messages in thread
From: Matt Porter @ 2014-04-22 15:41 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 21, 2014 at 06:39:17PM -0700, Florian Fainelli wrote:
> Add a DTS file for the Broadcom BCM963138DVT reference platform board
> which leverages the bcm63138.dtsi SoC DTSi file.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> arch/arm/boot/dts/Makefile | 3 +++
> arch/arm/boot/dts/bcm63138dvt.dts | 18 ++++++++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 arch/arm/boot/dts/bcm63138dvt.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 35c146f31e46..2738fa6e950d 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -53,8 +53,11 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
> dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
> dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
> bcm21664-garnet.dtb
> +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
> + bcm28155-ap.dtb
Remove this stray change.
> dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
> dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
> +dtb-$(CONFIG_ARCH_BCM_63XX) += bcm63138dvt.dtb
> dtb-$(CONFIG_ARCH_BERLIN) += \
> berlin2-sony-nsz-gs7.dtb \
> berlin2cd-google-chromecast.dtb
> diff --git a/arch/arm/boot/dts/bcm63138dvt.dts b/arch/arm/boot/dts/bcm63138dvt.dts
> new file mode 100644
> index 000000000000..e212b4731978
> --- /dev/null
> +++ b/arch/arm/boot/dts/bcm63138dvt.dts
> @@ -0,0 +1,18 @@
> +/*
> + * Broadcom BCM63138 Reference Board DTS
> + *
> + * Copyright (C) 2014 Broadcom Corporation
> + */
> +
> +/dts-v1/;
> +
> +#include "bcm63138.dtsi"
> +
> +/ {
> + compatible = "BCM963138DVT", "brcm,bcm63138";
The specific board compatible string needs a vendor prefix. Also,
there's only some rare old examples that use upper case in their
compatible strings. Let's conform to what 99% of compatible strings
do here and have:
compatible = "brcm,bcm963138dvt", "brcm,bcm63138";
Along the lines of Jonas' question? Is there really a "9" prepended in
this board name given that the filename is bcm63138dvt.dts? Either way,
this should be consistent between compatible and filename.
-Matt
> + model = "Broadcom BCM963138DVT";
> +
> + memory {
> + reg = <0x0 0x08000000>;
> + };
> +};
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH RESEND 5/5] MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
2014-04-22 1:39 [PATCH RESEND 0/5] ARM: BCM63XX: add support for BCM63138 SoC Florian Fainelli
` (3 preceding siblings ...)
2014-04-22 1:39 ` [PATCH RESEND 4/5] ARM: BCM63XX: add BCM963138DVT Reference platform DTS Florian Fainelli
@ 2014-04-22 1:39 ` Florian Fainelli
4 siblings, 0 replies; 15+ messages in thread
From: Florian Fainelli @ 2014-04-22 1:39 UTC (permalink / raw)
To: linux-arm-kernel
Add a MAINTAINERS entry covering all the Broadcom BCM63xx ARM DSL SoCs
files along with the relevant git tree and mailing-list.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
MAINTAINERS | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index e67ea2442041..135060fcf599 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1916,6 +1916,7 @@ F: arch/arm/boot/dts/bcm2835*
F: arch/arm/configs/bcm2835_defconfig
F: drivers/*/*bcm2835*
+
BROADCOM BCM5301X ARM ARCHICTURE
M: Hauke Mehrtens <hauke@hauke-m.de>
L: linux-arm-kernel at lists.infradead.org
@@ -1924,6 +1925,16 @@ F: arch/arm/mach-bcm/bcm_5301x.c
F: arch/arm/boot/dts/bcm5301x.dtsi
F: arch/arm/boot/dts/bcm470*
+BROADCOM BCM63XX ARM ARCHITECTURE
+M: Florian Fainelli <f.fainelli@gmail.com>
+L: linux-arm-kernel at lists.infradead.org
+T: git git://git.github.com/broadcom/arm-bcm63xx
+S: Maintained
+F: arch/arm/mach-bcm/board_bcm63xx.c
+F: arch/arm/mach-bcm/bcm63xx.h
+F: arch/arm/include/debug/bcm63xxx.S
+F: arch/arm/configs/bcm_defconfig
+
BROADCOM TG3 GIGABIT ETHERNET DRIVER
M: Nithin Nayak Sujir <nsujir@broadcom.com>
M: Michael Chan <mchan@broadcom.com>
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread