[PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

From: Robert Richter <rrichter@cavium.com>

This initial patches enable Cavium Thunder SoC Family. The patches add
devicetree and Kconfig support and then add Thunder to the defconfig.

The Thunder system needs more enablement patches for subsystems and
devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
We will send separate patch sets for these. All of them base on this
initial patches.

I sent a separate patch set independently that introduces support for
dts vendor subdirs. After both patch sets have been applied I will
send a patch in addition that moves the dts file into a subdirectory.

I sent another separate patch that sets NR_CPUS to 64 per default.

The first patch introduces dts files without having a Kconfig option
for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
added to defconfig in patch 4 as this is my preferred solution. If
there is still resistance having an ARCH_THUNDER option, just drop
them.

Patches are available here:

 git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init

v3 changes:
* removed setting NR_CPUS for Thunder, I sent a separate patch that
  increases this to 64 cpus per default
* reordered patches, dts files changes are know first using dtb-y
  instead of ARCH_THUNDER option
* moved soc nodes to thunder-88xx.dtsi

v2 changes:
* rebased to 3.17
* placed commas between 32-bit portions of 64 bit addresses
* removed #address-cells and size-cells in gic node
* get rid of the clocks node
* changed to gpl/x11 dual license
* removed memreserve
* moved gic to bus node

Radha Mohan Chintakuntla (3):
  arm64, thunder: Add initial dts for Cavium Thunder SoC
  arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
  arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family

Robert Richter (1):
  arm64, defconfig: Enable Cavium Thunder SoC in defconfig

 .../devicetree/bindings/arm/cavium-thunder.txt     |  10 +
 Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
 arch/arm64/Kconfig                                 |   5 +
 arch/arm64/boot/dts/Makefile                       |   1 +
 arch/arm64/boot/dts/thunder-88xx.dts               |  67 ++++
 arch/arm64/boot/dts/thunder-88xx.dtsi              | 401 +++++++++++++++++++++
 arch/arm64/configs/defconfig                       |   1 +
 7 files changed, 486 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi

-- 
2.1.0

[PATCH v3 1/4] arm64, thunder: Add initial dts for Cavium Thunder SoC

[Robert Richter]

From: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>

Add initial device tree nodes for Cavium Thunder SoCs with support of
48 cores and gicv3. The dtsi file requires further changes, esp. for
pci, gicv3-its and smmu. This changes will be added later together
with the device drivers.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 arch/arm64/boot/dts/Makefile          |   2 +
 arch/arm64/boot/dts/thunder-88xx.dts  |  67 ++++++
 arch/arm64/boot/dts/thunder-88xx.dtsi | 401 ++++++++++++++++++++++++++++++++++
 3 files changed, 470 insertions(+)
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi

diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index c52bdb051f66..c2e8e4661a90 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,6 +1,8 @@
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 
+dtb-y += thunder-88xx.dtb
+
 targets += dtbs
 targets += $(dtb-y)
 
diff --git a/arch/arm64/boot/dts/thunder-88xx.dts b/arch/arm64/boot/dts/thunder-88xx.dts
new file mode 100644
index 000000000000..800ba65991f7
--- /dev/null
+++ b/arch/arm64/boot/dts/thunder-88xx.dts
@@ -0,0 +1,67 @@
+/*
+ * Cavium Thunder DTS file - Thunder board description
+ *
+ * Copyright (C) 2014, Cavium Inc.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+/include/ "thunder-88xx.dtsi"
+
+/ {
+	model = "Cavium ThunderX CN88XX board";
+	compatible = "cavium,thunder-88xx";
+
+	aliases {
+		serial0 = &uaa0;
+		serial1 = &uaa1;
+	};
+
+	memory@00000000 {
+		device_type = "memory";
+		reg = <0x0 0x00000000 0x0 0x80000000>;
+	};
+};
diff --git a/arch/arm64/boot/dts/thunder-88xx.dtsi b/arch/arm64/boot/dts/thunder-88xx.dtsi
new file mode 100644
index 000000000000..d8c0bdc51882
--- /dev/null
+++ b/arch/arm64/boot/dts/thunder-88xx.dtsi
@@ -0,0 +1,401 @@
+/*
+ * Cavium Thunder DTS file - Thunder SoC description
+ *
+ * Copyright (C) 2014, Cavium Inc.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/ {
+	compatible = "cavium,thunder-88xx";
+	interrupt-parent = <&gic0>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	psci {
+		compatible = "arm,psci-0.2";
+		method = "smc";
+	};
+
+	cpus {
+		#address-cells = <2>;
+		#size-cells = <0>;
+
+		cpu@000 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x000>;
+			enable-method = "psci";
+		};
+		cpu@001 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x001>;
+			enable-method = "psci";
+		};
+		cpu@002 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x002>;
+			enable-method = "psci";
+		};
+		cpu@003 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x003>;
+			enable-method = "psci";
+		};
+		cpu@004 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x004>;
+			enable-method = "psci";
+		};
+		cpu@005 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x005>;
+			enable-method = "psci";
+		};
+		cpu@006 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x006>;
+			enable-method = "psci";
+		};
+		cpu@007 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x007>;
+			enable-method = "psci";
+		};
+		cpu@008 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x008>;
+			enable-method = "psci";
+		};
+		cpu@009 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x009>;
+			enable-method = "psci";
+		};
+		cpu@00a {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00a>;
+			enable-method = "psci";
+		};
+		cpu@00b {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00b>;
+			enable-method = "psci";
+		};
+		cpu@00c {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00c>;
+			enable-method = "psci";
+		};
+		cpu@00d {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00d>;
+			enable-method = "psci";
+		};
+		cpu@00e {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00e>;
+			enable-method = "psci";
+		};
+		cpu@00f {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x00f>;
+			enable-method = "psci";
+		};
+		cpu@100 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x100>;
+			enable-method = "psci";
+		};
+		cpu@101 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x101>;
+			enable-method = "psci";
+		};
+		cpu@102 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x102>;
+			enable-method = "psci";
+		};
+		cpu@103 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x103>;
+			enable-method = "psci";
+		};
+		cpu@104 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x104>;
+			enable-method = "psci";
+		};
+		cpu@105 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x105>;
+			enable-method = "psci";
+		};
+		cpu@106 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x106>;
+			enable-method = "psci";
+		};
+		cpu@107 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x107>;
+			enable-method = "psci";
+		};
+		cpu@108 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x108>;
+			enable-method = "psci";
+		};
+		cpu@109 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x109>;
+			enable-method = "psci";
+		};
+		cpu@10a {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10a>;
+			enable-method = "psci";
+		};
+		cpu@10b {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10b>;
+			enable-method = "psci";
+		};
+		cpu@10c {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10c>;
+			enable-method = "psci";
+		};
+		cpu@10d {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10d>;
+			enable-method = "psci";
+		};
+		cpu@10e {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10e>;
+			enable-method = "psci";
+		};
+		cpu@10f {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x10f>;
+			enable-method = "psci";
+		};
+		cpu@200 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x200>;
+			enable-method = "psci";
+		};
+		cpu@201 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x201>;
+			enable-method = "psci";
+		};
+		cpu@202 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x202>;
+			enable-method = "psci";
+		};
+		cpu@203 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x203>;
+			enable-method = "psci";
+		};
+		cpu@204 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x204>;
+			enable-method = "psci";
+		};
+		cpu@205 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x205>;
+			enable-method = "psci";
+		};
+		cpu@206 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x206>;
+			enable-method = "psci";
+		};
+		cpu@207 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x207>;
+			enable-method = "psci";
+		};
+		cpu@208 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x208>;
+			enable-method = "psci";
+		};
+		cpu@209 {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x209>;
+			enable-method = "psci";
+		};
+		cpu@20a {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20a>;
+			enable-method = "psci";
+		};
+		cpu@20b {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20b>;
+			enable-method = "psci";
+		};
+		cpu@20c {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20c>;
+			enable-method = "psci";
+		};
+		cpu@20d {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20d>;
+			enable-method = "psci";
+		};
+		cpu@20e {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20e>;
+			enable-method = "psci";
+		};
+		cpu@20f {
+			device_type = "cpu";
+			compatible = "cavium,thunder", "arm,armv8";
+			reg = <0x0 0x20f>;
+			enable-method = "psci";
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <1 13 0xff01>,
+		             <1 14 0xff01>,
+		             <1 11 0xff01>,
+		             <1 10 0xff01>;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		refclk50mhz: refclk50mhz {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <50000000>;
+			clock-output-names = "refclk50mhz";
+		};
+
+		gic0: interrupt-controller@8010,00000000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-controller;
+			reg = <0x8010 0x00000000 0x0 0x010000>, /* GICD */
+			      <0x8010 0x80000000 0x0 0x600000>; /* GICR */
+			interrupts = <1 9 0xf04>;
+		};
+
+		uaa0: serial@87e0,24000000 {
+			compatible = "arm,pl011", "arm,primecell";
+			reg = <0x87e0 0x24000000 0x0 0x1000>;
+			interrupts = <1 21 4>;
+			clocks = <&refclk50mhz>;
+			clock-names = "apb_pclk";
+		};
+
+		uaa1: serial@87e0,25000000 {
+			compatible = "arm,pl011", "arm,primecell";
+			reg = <0x87e0 0x25000000 0x0 0x1000>;
+			interrupts = <1 22 4>;
+			clocks = <&refclk50mhz>;
+			clock-names = "apb_pclk";
+		};
+	};
+};
-- 
2.1.0

[PATCH v3 2/4] arm64, thunder: Document devicetree bindings for Cavium Thunder SoC

[Robert Richter]

From: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>

This patch adds documentation for the devicetree bindings used by the
DT files of Cavium Thunder SoC platforms.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 Documentation/devicetree/bindings/arm/cavium-thunder.txt | 10 ++++++++++
 Documentation/devicetree/bindings/arm/cpus.txt           |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt

diff --git a/Documentation/devicetree/bindings/arm/cavium-thunder.txt b/Documentation/devicetree/bindings/arm/cavium-thunder.txt
new file mode 100644
index 000000000000..6f63a5866902
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/cavium-thunder.txt
@@ -0,0 +1,10 @@
+Cavium Thunder platform device tree bindings
+--------------------------------------------
+
+Boards with Cavium's Thunder SoC shall have following properties.
+
+Root Node
+---------
+Required root node properties:
+
+  - compatible = "cavium,thunder-88xx";
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 298e2f6b33c6..578796a2cfa9 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -166,6 +166,7 @@ nodes to be present and contain the properties described below.
 			    "arm,cortex-r5"
 			    "arm,cortex-r7"
 			    "brcm,brahma-b15"
+			    "cavium,thunder"
 			    "faraday,fa526"
 			    "intel,sa110"
 			    "intel,sa1100"
-- 
2.1.0

[PATCH v3 3/4] arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family

[Robert Richter]

From: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>

This introduces ARCH_THUNDER to enable soc specific drivers and dtb
files.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 arch/arm64/Kconfig           | 5 +++++
 arch/arm64/boot/dts/Makefile | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 67fca2ea81a7..ff9179ba63fb 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -134,6 +134,11 @@ source "kernel/Kconfig.freezer"
 
 menu "Platform selection"
 
+config ARCH_THUNDER
+	bool "Cavium Inc. Thunder SoC Family"
+	help
+	  This enables support for Cavium's Thunder Family of SoCs.
+
 config ARCH_VEXPRESS
 	bool "ARMv8 software model (Versatile Express)"
 	select ARCH_REQUIRE_GPIOLIB
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index c2e8e4661a90..f8001a62029c 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,8 +1,7 @@
+dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 
-dtb-y += thunder-88xx.dtb
-
 targets += dtbs
 targets += $(dtb-y)
 
-- 
2.1.0

[PATCH v3 4/4] arm64, defconfig: Enable Cavium Thunder SoC in defconfig

[Robert Richter]

From: Robert Richter <rrichter@cavium.com>

This patch enables Thunder SoCs in the arm64 defconfig. This is
esp. useful to add Thunder platforms to automated builds based on
arm64 defconfig.

Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index d92ef3c54161..9cd37de9aa8d 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -32,6 +32,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_SMP=y
-- 
2.1.0

Re: [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

On 12.09.14 19:49:43, Robert Richter wrote:
> From: Robert Richter <rrichter@cavium.com>
> 
> This initial patches enable Cavium Thunder SoC Family. The patches add
> devicetree and Kconfig support and then add Thunder to the defconfig.
> 
> The Thunder system needs more enablement patches for subsystems and
> devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> We will send separate patch sets for these. All of them base on this
> initial patches.
> 
> I sent a separate patch set independently that introduces support for
> dts vendor subdirs. After both patch sets have been applied I will
> send a patch in addition that moves the dts file into a subdirectory.
> 
> I sent another separate patch that sets NR_CPUS to 64 per default.
> 
> The first patch introduces dts files without having a Kconfig option
> for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> added to defconfig in patch 4 as this is my preferred solution. If
> there is still resistance having an ARCH_THUNDER option, just drop
> them.
> 
> Patches are available here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init

Will,

it would be good if these patches could be applied.

Thanks,

-Robert

> 
> v3 changes:
> * removed setting NR_CPUS for Thunder, I sent a separate patch that
>   increases this to 64 cpus per default
> * reordered patches, dts files changes are know first using dtb-y
>   instead of ARCH_THUNDER option
> * moved soc nodes to thunder-88xx.dtsi
> 
> v2 changes:
> * rebased to 3.17
> * placed commas between 32-bit portions of 64 bit addresses
> * removed #address-cells and size-cells in gic node
> * get rid of the clocks node
> * changed to gpl/x11 dual license
> * removed memreserve
> * moved gic to bus node
> 
> Radha Mohan Chintakuntla (3):
>   arm64, thunder: Add initial dts for Cavium Thunder SoC
>   arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
>   arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family
> 
> Robert Richter (1):
>   arm64, defconfig: Enable Cavium Thunder SoC in defconfig
> 
>  .../devicetree/bindings/arm/cavium-thunder.txt     |  10 +
>  Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
>  arch/arm64/Kconfig                                 |   5 +
>  arch/arm64/boot/dts/Makefile                       |   1 +
>  arch/arm64/boot/dts/thunder-88xx.dts               |  67 ++++
>  arch/arm64/boot/dts/thunder-88xx.dtsi              | 401 +++++++++++++++++++++
>  arch/arm64/configs/defconfig                       |   1 +
>  7 files changed, 486 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
>  create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
>  create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi
> 
> -- 
> 2.1.0
> 

Re: [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Will Deacon]

Hi Robert,

On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> On 12.09.14 19:49:43, Robert Richter wrote:
> > From: Robert Richter <rrichter@cavium.com>
> > 
> > This initial patches enable Cavium Thunder SoC Family. The patches add
> > devicetree and Kconfig support and then add Thunder to the defconfig.
> > 
> > The Thunder system needs more enablement patches for subsystems and
> > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > We will send separate patch sets for these. All of them base on this
> > initial patches.
> > 
> > I sent a separate patch set independently that introduces support for
> > dts vendor subdirs. After both patch sets have been applied I will
> > send a patch in addition that moves the dts file into a subdirectory.
> > 
> > I sent another separate patch that sets NR_CPUS to 64 per default.
> > 
> > The first patch introduces dts files without having a Kconfig option
> > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > added to defconfig in patch 4 as this is my preferred solution. If
> > there is still resistance having an ARCH_THUNDER option, just drop
> > them.
> > 
> > Patches are available here:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> 
> Will,
> 
> it would be good if these patches could be applied.

Catalin's handling the 3.18 merge window, but this looks like arm-soc
material anyway and should go via Olof/Arnd.

Will

Re: [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Catalin Marinas]

On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > On 12.09.14 19:49:43, Robert Richter wrote:
> > > From: Robert Richter <rrichter@cavium.com>
> > > 
> > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > 
> > > The Thunder system needs more enablement patches for subsystems and
> > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > We will send separate patch sets for these. All of them base on this
> > > initial patches.
> > > 
> > > I sent a separate patch set independently that introduces support for
> > > dts vendor subdirs. After both patch sets have been applied I will
> > > send a patch in addition that moves the dts file into a subdirectory.
> > > 
> > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > 
> > > The first patch introduces dts files without having a Kconfig option
> > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > added to defconfig in patch 4 as this is my preferred solution. If
> > > there is still resistance having an ARCH_THUNDER option, just drop
> > > them.
> > > 
> > > Patches are available here:
> > > 
> > >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > 
> > it would be good if these patches could be applied.
> 
> Catalin's handling the 3.18 merge window, but this looks like arm-soc
> material anyway and should go via Olof/Arnd.

Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
send him a pull request).

-- 
Catalin

Re: [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

Olof,

On 23.09.14 12:21:05, Catalin Marinas wrote:
> On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> > On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > > On 12.09.14 19:49:43, Robert Richter wrote:
> > > > From: Robert Richter <rrichter@cavium.com>
> > > > 
> > > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > > 
> > > > The Thunder system needs more enablement patches for subsystems and
> > > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > > We will send separate patch sets for these. All of them base on this
> > > > initial patches.
> > > > 
> > > > I sent a separate patch set independently that introduces support for
> > > > dts vendor subdirs. After both patch sets have been applied I will
> > > > send a patch in addition that moves the dts file into a subdirectory.
> > > > 
> > > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > > 
> > > > The first patch introduces dts files without having a Kconfig option
> > > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > > added to defconfig in patch 4 as this is my preferred solution. If
> > > > there is still resistance having an ARCH_THUNDER option, just drop
> > > > them.
> > > > 
> > > > Patches are available here:
> > > > 
> > > >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > > 
> > > it would be good if these patches could be applied.
> > 
> > Catalin's handling the 3.18 merge window, but this looks like arm-soc
> > material anyway and should go via Olof/Arnd.
> 
> Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
> send him a pull request).

just in case you want to pull, please pull from:

 git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18

Thanks,

-Robert




The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:

  Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18

for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:

  arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)

----------------------------------------------------------------
Enablement patches for Cavium Thunder SoC Family. The patches add
devicetree and Kconfig support and then add Thunder to the defconfig.

----------------------------------------------------------------
Radha Mohan Chintakuntla (3):
      arm64, thunder: Add initial dts for Cavium Thunder SoC
      arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
      arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family

Robert Richter (1):
      arm64, defconfig: Enable Cavium Thunder SoC in defconfig

 .../devicetree/bindings/arm/cavium-thunder.txt     |  10 +
 Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
 arch/arm64/Kconfig                                 |   5 +
 arch/arm64/boot/dts/Makefile                       |   1 +
 arch/arm64/boot/dts/thunder-88xx.dts               |  67 ++++
 arch/arm64/boot/dts/thunder-88xx.dtsi              | 401 +++++++++++++++++++++
 arch/arm64/configs/defconfig                       |   1 +
 7 files changed, 486 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi

Re: [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

On 23.09.14 16:14:29, Robert Richter wrote:
> On 23.09.14 12:21:05, Catalin Marinas wrote:
> > On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> > > On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > > > On 12.09.14 19:49:43, Robert Richter wrote:
> > > > > From: Robert Richter <rrichter@cavium.com>
> > > > > 
> > > > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > > > 
> > > > > The Thunder system needs more enablement patches for subsystems and
> > > > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > > > We will send separate patch sets for these. All of them base on this
> > > > > initial patches.
> > > > > 
> > > > > I sent a separate patch set independently that introduces support for
> > > > > dts vendor subdirs. After both patch sets have been applied I will
> > > > > send a patch in addition that moves the dts file into a subdirectory.
> > > > > 
> > > > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > > > 
> > > > > The first patch introduces dts files without having a Kconfig option
> > > > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > > > added to defconfig in patch 4 as this is my preferred solution. If
> > > > > there is still resistance having an ARCH_THUNDER option, just drop
> > > > > them.
> > > > > 
> > > > > Patches are available here:
> > > > > 
> > > > >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > > > 
> > > > it would be good if these patches could be applied.
> > > 
> > > Catalin's handling the 3.18 merge window, but this looks like arm-soc
> > > material anyway and should go via Olof/Arnd.
> > 
> > Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
> > send him a pull request).
> 
> just in case you want to pull, please pull from:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18

Olof, Arnd,

please pull or apply.

Thanks,

-Robert

[GIT PULL] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

([GIT PULL] in the subject)

On 02.10.14 09:29:38, Robert Richter wrote:
> On 23.09.14 16:14:29, Robert Richter wrote:
> > On 23.09.14 12:21:05, Catalin Marinas wrote:
> > > On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> > > > On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > > > > On 12.09.14 19:49:43, Robert Richter wrote:
> > > > > > From: Robert Richter <rrichter@cavium.com>
> > > > > > 
> > > > > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > > > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > > > > 
> > > > > > The Thunder system needs more enablement patches for subsystems and
> > > > > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > > > > We will send separate patch sets for these. All of them base on this
> > > > > > initial patches.
> > > > > > 
> > > > > > I sent a separate patch set independently that introduces support for
> > > > > > dts vendor subdirs. After both patch sets have been applied I will
> > > > > > send a patch in addition that moves the dts file into a subdirectory.
> > > > > > 
> > > > > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > > > > 
> > > > > > The first patch introduces dts files without having a Kconfig option
> > > > > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > > > > added to defconfig in patch 4 as this is my preferred solution. If
> > > > > > there is still resistance having an ARCH_THUNDER option, just drop
> > > > > > them.
> > > > > > 
> > > > > > Patches are available here:
> > > > > > 
> > > > > >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > > > > 
> > > > > it would be good if these patches could be applied.
> > > > 
> > > > Catalin's handling the 3.18 merge window, but this looks like arm-soc
> > > > material anyway and should go via Olof/Arnd.
> > > 
> > > Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
> > > send him a pull request).
> > 
> > just in case you want to pull, please pull from:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18

Olof, Arnd,

please pull or apply.

Thanks,

-Robert



The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:

  Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18

for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:

  arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)

----------------------------------------------------------------
Enablement patches for Cavium Thunder SoC Family. The patches add
devicetree and Kconfig support and then add Thunder to the defconfig.

----------------------------------------------------------------
Radha Mohan Chintakuntla (3):
      arm64, thunder: Add initial dts for Cavium Thunder SoC
      arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
      arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family

Robert Richter (1):
      arm64, defconfig: Enable Cavium Thunder SoC in defconfig

 Documentation/devicetree/bindings/arm/cavium-thunder.txt |  10 ++++
 Documentation/devicetree/bindings/arm/cpus.txt           |   1 +
 arch/arm64/Kconfig                                       |   5 ++
 arch/arm64/boot/dts/Makefile                             |   1 +
 arch/arm64/boot/dts/thunder-88xx.dts                     |  67 +++++++++++++++++++++
 arch/arm64/boot/dts/thunder-88xx.dtsi                    | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm64/configs/defconfig                             |   1 +
 7 files changed, 486 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi

Re: [GIT PULL] arm64, thunder: Enable Cavium Thunder SoC Family

[Arnd Bergmann]

On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
> 
>   Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
> 
> for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
> 
>   arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
> 
> ----------------------------------------------------------------
> Enablement patches for Cavium Thunder SoC Family. The patches add
> devicetree and Kconfig support and then add Thunder to the defconfig.

I've pulled them into a new next/arm64 branch in the arm-soc tree,
but noticed that you had based them on top of -rc5. If you have no
strong reasons to pick a newer -rc, it's better to base on top of
-rc1, to save us trouble with backmerges.

I ended up rebasing to -rc1, since you gave the option to apply the
patches directly.

I originally missed the patches because they were not sent to
arm@kernel.org but only to our personal addresses. Please include
the arm@kernel.org address whenever you want patches or pull requests
to get applied (as opposed to reviewed). We are not really taking
new code for arm-soc any more, but this one was first submitted
for inclusion a while back, so I'm making an exception.

Finally, I also wanted to pull your "dts, kbuild: Implement support
for dtb vendor subdirs", but that clearly conflicts with this series,
and I decided not to pull that and take this one instead.

I'm guessing we'd see conflicts with other patches in linux-next,
so I'd rather not do the merge any more now, we can take that one
for 3.19.

	Arnd

Re: [GIT PULL] arm64, thunder: Enable Cavium Thunder SoC Family

[Robert Richter]

Arnd,

On 02.10.14 17:44:48, Arnd Bergmann wrote:
> On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> > The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
> > 
> >   Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
> > 
> > for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
> > 
> >   arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
> > 
> > ----------------------------------------------------------------
> > Enablement patches for Cavium Thunder SoC Family. The patches add
> > devicetree and Kconfig support and then add Thunder to the defconfig.
> 
> I've pulled them into a new next/arm64 branch in the arm-soc tree,
> but noticed that you had based them on top of -rc5. If you have no
> strong reasons to pick a newer -rc, it's better to base on top of
> -rc1, to save us trouble with backmerges.
> 
> I ended up rebasing to -rc1, since you gave the option to apply the
> patches directly.

thanks for applying the patches.

Ok, I think a reason to update to -rc5 was a conflict in another patch
of my patch stack unrelated to this series. Wasn't aware of
backmerging conflicts you might get and will avoid unnecessary updates
in the future.

> I originally missed the patches because they were not sent to
> arm@kernel.org but only to our personal addresses. Please include
> the arm@kernel.org address whenever you want patches or pull requests
> to get applied (as opposed to reviewed). We are not really taking
> new code for arm-soc any more, but this one was first submitted
> for inclusion a while back, so I'm making an exception.

Will use arm@kernel.org in next requests.

> Finally, I also wanted to pull your "dts, kbuild: Implement support
> for dtb vendor subdirs", but that clearly conflicts with this series,
> and I decided not to pull that and take this one instead.

I was hoping one or the other patch set would have applied earlier,
then I could have rebased them. Anyway, will do this now and let you
know after the merge window closed.

> I'm guessing we'd see conflicts with other patches in linux-next,
> so I'd rather not do the merge any more now, we can take that one
> for 3.19.

Fine with me.

-Robert