* [PATCH v2 1/5] arm64: add THUNDER2 processor family
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
@ 2017-02-05 0:57 ` Jayachandran C
2017-02-09 15:25 ` Arnd Bergmann
2017-02-05 0:57 ` [PATCH v2 2/5] MAINTAINERS: Add Cavium ThunderX2 entry Jayachandran C
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 0:57 UTC (permalink / raw)
To: linux-arm-kernel
Add support for ThunderX2 CN99XX arm64 server processors.
Introduce a new arm64 platform config option ARCH_THUNDER2 for these
processors.
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
---
arch/arm64/Kconfig.platforms | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 715ef12..129cc5a 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -190,6 +190,13 @@ config ARCH_THUNDER
help
This enables support for Cavium's Thunder Family of SoCs.
+config ARCH_THUNDER2
+ bool "Cavium ThunderX2 Server Processors"
+ select GPIOLIB
+ help
+ This enables support for Cavium's ThunderX2 CN99XX family of
+ server processors.
+
config ARCH_UNIPHIER
bool "Socionext UniPhier SoC Family"
select ARCH_HAS_RESET_CONTROLLER
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 1/5] arm64: add THUNDER2 processor family
2017-02-05 0:57 ` [PATCH v2 1/5] arm64: add THUNDER2 processor family Jayachandran C
@ 2017-02-09 15:25 ` Arnd Bergmann
0 siblings, 0 replies; 11+ messages in thread
From: Arnd Bergmann @ 2017-02-09 15:25 UTC (permalink / raw)
To: linux-arm-kernel
On Sunday, February 5, 2017 12:57:02 AM CET Jayachandran C wrote:
> Add support for ThunderX2 CN99XX arm64 server processors.
>
> Introduce a new arm64 platform config option ARCH_THUNDER2 for these
> processors.
>
> Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
> ---
> arch/arm64/Kconfig.platforms | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 715ef12..129cc5a 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -190,6 +190,13 @@ config ARCH_THUNDER
> help
> This enables support for Cavium's Thunder Family of SoCs.
>
> +config ARCH_THUNDER2
> + bool "Cavium ThunderX2 Server Processors"
> + select GPIOLIB
> + help
> + This enables support for Cavium's ThunderX2 CN99XX family of
> + server processors.
> +
> config ARCH_UNIPHIER
> bool "Socionext UniPhier SoC Family"
> select ARCH_HAS_RESET_CONTROLLER
>
Applied this one to next/arm64, thanks!
Arnd
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 2/5] MAINTAINERS: Add Cavium ThunderX2 entry
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
2017-02-05 0:57 ` [PATCH v2 1/5] arm64: add THUNDER2 processor family Jayachandran C
@ 2017-02-05 0:57 ` Jayachandran C
2017-02-09 15:26 ` Arnd Bergmann
2017-02-05 0:57 ` [PATCH v2 3/5] arm64: dts: add device trees for ARCH_THUNDER2 Jayachandran C
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 0:57 UTC (permalink / raw)
To: linux-arm-kernel
Add maintainer information for Cavium ThunderX2 ARM64 processor
family.
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
---
MAINTAINERS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 187b961..4f788ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2972,6 +2972,13 @@ S: Maintained
F: drivers/iio/light/cm*
F: Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst
+CAVIUM THUNDERX2 ARM64 SOC
+M: Jayachandran C <jnair@caviumnetworks.com>
+L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm64/boot/dts/cavium/thunder-99xx*
+F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt
+
CAVIUM I2C DRIVER
M: Jan Glauber <jglauber@cavium.com>
M: David Daney <david.daney@cavium.com>
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 3/5] arm64: dts: add device trees for ARCH_THUNDER2
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
2017-02-05 0:57 ` [PATCH v2 1/5] arm64: add THUNDER2 processor family Jayachandran C
2017-02-05 0:57 ` [PATCH v2 2/5] MAINTAINERS: Add Cavium ThunderX2 entry Jayachandran C
@ 2017-02-05 0:57 ` Jayachandran C
2017-02-05 0:57 ` [PATCH v2 4/5] dt-bindings: arm64 ARCH_THUNDER2 platform documentation Jayachandran C
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 0:57 UTC (permalink / raw)
To: linux-arm-kernel
Add device tree files for Cavium's ThunderX2 CN99XX arm64 server
processors. The file cavium/thunder-99xx.dtsi has been added for
the CPU and on-chip devices, and cavium/thunder-99xx.dts has been
added for the evaluation board using the chip.
Update the Makefile to build the thunder-99xx.dtb when the
ARCH_THUNDER2 option is selected.
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
---
arch/arm64/boot/dts/cavium/Makefile | 1 +
arch/arm64/boot/dts/cavium/thunder-99xx.dts | 34 +++++++
arch/arm64/boot/dts/cavium/thunder-99xx.dtsi | 147 +++++++++++++++++++++++++++
3 files changed, 182 insertions(+)
create mode 100644 arch/arm64/boot/dts/cavium/thunder-99xx.dts
create mode 100644 arch/arm64/boot/dts/cavium/thunder-99xx.dtsi
diff --git a/arch/arm64/boot/dts/cavium/Makefile b/arch/arm64/boot/dts/cavium/Makefile
index e34f89d..557c8be 100644
--- a/arch/arm64/boot/dts/cavium/Makefile
+++ b/arch/arm64/boot/dts/cavium/Makefile
@@ -1,4 +1,5 @@
dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
+dtb-$(CONFIG_ARCH_THUNDER2) += thunder-99xx.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/cavium/thunder-99xx.dts b/arch/arm64/boot/dts/cavium/thunder-99xx.dts
new file mode 100644
index 0000000..ed6715a
--- /dev/null
+++ b/arch/arm64/boot/dts/cavium/thunder-99xx.dts
@@ -0,0 +1,34 @@
+/*
+ * dts file for Cavium ThunderX2 CN99XX based Evaluation Boards
+ *
+ * Copyright (c) 2017 Cavium Inc.
+ * Copyright (c) 2013-2016 Broadcom
+ *
+ * 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; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+/dts-v1/;
+
+#include "thunder-99xx.dtsi"
+
+/ {
+ model = "Cavium ThunderX2 CN99XX";
+ compatible = "cavium,thunder-99xx";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */
+ <0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */
+ };
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
diff --git a/arch/arm64/boot/dts/cavium/thunder-99xx.dtsi b/arch/arm64/boot/dts/cavium/thunder-99xx.dtsi
new file mode 100644
index 0000000..1c07732
--- /dev/null
+++ b/arch/arm64/boot/dts/cavium/thunder-99xx.dtsi
@@ -0,0 +1,147 @@
+/*
+ * dtsi file for Cavium ThunderX2 CN99XX processor
+ *
+ * Copyright (c) 2017 Cavium Inc.
+ * Copyright (c) 2013-2016 Broadcom
+ * Author: Zi Shen Lim <zlim@broadcom.com>
+ *
+ * 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; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ model = "Cavium ThunderX2 CN99xx";
+ compatible = "cavium,thunder-99xx";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ /* just 4 cpus now, 128 needed in full config */
+ cpus {
+ #address-cells = <0x2>;
+ #size-cells = <0x0>;
+
+ cpu at 0 {
+ device_type = "cpu";
+ compatible = "cavium,thunder2", "arm,armv8";
+ reg = <0x0 0x0>;
+ enable-method = "psci";
+ };
+
+ cpu at 1 {
+ device_type = "cpu";
+ compatible = "cavium,thunder2", "arm,armv8";
+ reg = <0x0 0x1>;
+ enable-method = "psci";
+ };
+
+ cpu at 2 {
+ device_type = "cpu";
+ compatible = "cavium,thunder2", "arm,armv8";
+ reg = <0x0 0x2>;
+ enable-method = "psci";
+ };
+
+ cpu at 3 {
+ device_type = "cpu";
+ compatible = "cavium,thunder2", "arm,armv8";
+ reg = <0x0 0x3>;
+ enable-method = "psci";
+ };
+ };
+
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+ };
+
+ gic: interrupt-controller at 400080000 {
+ compatible = "arm,gic-v3";
+ #interrupt-cells = <3>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ interrupt-controller;
+ #redistributor-regions = <1>;
+ reg = <0x04 0x00080000 0x0 0x20000>, /* GICD */
+ <0x04 0x01000000 0x0 0x1000000>; /* GICR */
+ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+
+ gicits: gic-its at 40010000 {
+ compatible = "arm,gic-v3-its";
+ msi-controller;
+ reg = <0x04 0x00100000 0x0 0x20000>; /* GIC ITS */
+ };
+ };
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ pmu {
+ compatible = "arm,armv8-pmuv3";
+ interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; /* PMU overflow */
+ };
+
+ clk125mhz: uart_clk125mhz {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <125000000>;
+ clock-output-names = "clk125mhz";
+ };
+
+ pci {
+ compatible = "pci-host-ecam-generic";
+ device_type = "pci";
+ #interrupt-cells = <1>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ /* ECAM at 0x3000_0000 - 0x4000_0000 */
+ reg = <0x0 0x30000000 0x0 0x10000000>;
+ reg-names = "PCI ECAM";
+
+ /*
+ * PCI ranges:
+ * IO no supported
+ * MEM 0x4000_0000 - 0x6000_0000
+ * MEM64 pref 0x40_0000_0000 - 0x60_0000_0000
+ */
+ ranges =
+ <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000
+ 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>;
+ interrupt-map-mask = <0 0 0 7>;
+ interrupt-map =
+ /* addr pin ic icaddr icintr */
+ <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH
+ 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH
+ 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH
+ 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+ msi-parent = <&gicits>;
+ dma-coherent;
+ };
+
+ soc {
+ compatible = "simple-bus";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ uart0: serial at 402020000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0x04 0x02020000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk125mhz>;
+ clock-names = "apb_pclk";
+ };
+ };
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 4/5] dt-bindings: arm64 ARCH_THUNDER2 platform documentation
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
` (2 preceding siblings ...)
2017-02-05 0:57 ` [PATCH v2 3/5] arm64: dts: add device trees for ARCH_THUNDER2 Jayachandran C
@ 2017-02-05 0:57 ` Jayachandran C
2017-02-05 0:57 ` [PATCH v2 5/5] arm64: add ARCH_THUNDER2 to defconfig Jayachandran C
2017-02-05 3:11 ` [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Florian Fainelli
5 siblings, 0 replies; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 0:57 UTC (permalink / raw)
To: linux-arm-kernel
Add documentation for Cavium ThunderX2 CN99XX ARM64 processor family.
The processor core will use the ID "cavium,thunder2" and the SoC will use
the ID "cavium,thunder-99xx".
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
Acked-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/arm/cavium-thunder2.txt | 5 +++++
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
2 files changed, 6 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder2.txt
diff --git a/Documentation/devicetree/bindings/arm/cavium-thunder2.txt b/Documentation/devicetree/bindings/arm/cavium-thunder2.txt
new file mode 100644
index 0000000..82276a2
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/cavium-thunder2.txt
@@ -0,0 +1,5 @@
+Cavium Thunder2 Family device tree bindings
+-------------------------------------------
+
+Boards with Cavium ThunderX2 CN99XX shall have the root property:
+ compatible = "cavium,thunder-99xx";
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index a1bcfee..74f0b23 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -169,6 +169,7 @@ nodes to be present and contain the properties described below.
"brcm,brahma-b15"
"brcm,vulcan"
"cavium,thunder"
+ "cavium,thunder2"
"faraday,fa526"
"intel,sa110"
"intel,sa1100"
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 5/5] arm64: add ARCH_THUNDER2 to defconfig
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
` (3 preceding siblings ...)
2017-02-05 0:57 ` [PATCH v2 4/5] dt-bindings: arm64 ARCH_THUNDER2 platform documentation Jayachandran C
@ 2017-02-05 0:57 ` Jayachandran C
2017-02-09 15:26 ` Arnd Bergmann
2017-02-05 3:11 ` [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Florian Fainelli
5 siblings, 1 reply; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 0:57 UTC (permalink / raw)
To: linux-arm-kernel
This will allow the default kernel build to boot on Cavium ThunderX2
CN99XX processors.
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 33b744d..7a9c262 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -53,6 +53,7 @@ CONFIG_ARCH_STRATIX10=y
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_SPRD=y
CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
CONFIG_ARCH_UNIPHIER=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VULCAN=y
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform
2017-02-05 0:57 [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Jayachandran C
` (4 preceding siblings ...)
2017-02-05 0:57 ` [PATCH v2 5/5] arm64: add ARCH_THUNDER2 to defconfig Jayachandran C
@ 2017-02-05 3:11 ` Florian Fainelli
2017-02-05 9:19 ` Jayachandran C
5 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2017-02-05 3:11 UTC (permalink / raw)
To: linux-arm-kernel
Le 02/04/17 ? 16:57, Jayachandran C a ?crit :
> Here's the updated patchset, please let me know if thereare any
> comments. If a pull request is needed(with a public git tree), I
> can set one up on github.
>
> This patchset adds support for the new ThunderX2 CN99XX processor
> family.
>
> Changes are to add: the config option, the required device tree files,
> the device tree bindings documentation and the defconfig entry.
>
> Changes from v1 -> v2:
> * split Kconfig.platforms changes and device tree changes
> * Added MAINTAINERS entry
Does that mean support for Broadcom Vulcan should be removed then? If
do, do you mind doing that?
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform
2017-02-05 3:11 ` [PATCH v2 0/5] Add Cavium ARCH_THUNDER2 platform Florian Fainelli
@ 2017-02-05 9:19 ` Jayachandran C
0 siblings, 0 replies; 11+ messages in thread
From: Jayachandran C @ 2017-02-05 9:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Feb 04, 2017 at 07:11:17PM -0800, Florian Fainelli wrote:
> Le 02/04/17 ? 16:57, Jayachandran C a ?crit :
> > Here's the updated patchset, please let me know if thereare any
> > comments. If a pull request is needed(with a public git tree), I
> > can set one up on github.
> >
> > This patchset adds support for the new ThunderX2 CN99XX processor
> > family.
> >
> > Changes are to add: the config option, the required device tree files,
> > the device tree bindings documentation and the defconfig entry.
> >
> > Changes from v1 -> v2:
> > * split Kconfig.platforms changes and device tree changes
> > * Added MAINTAINERS entry
>
> Does that mean support for Broadcom Vulcan should be removed then? If
> do, do you mind doing that?
I will send patches for removing ARCH_VULCAN once ARCH_THUNDER2 is
merged and the driver dependencies are updated by another set of patches.
Otherwise we have a problem (especially in distribution config files)
of not being able to select the drivers (for SPI, GPIO and I2C) for the
platform.
Thanks,
JC.
^ permalink raw reply [flat|nested] 11+ messages in thread