Skip to contentSkip to conversation

MSM patches for 3.14

PATCH In review David Brown 4 participants 11 messages Dec 20, 2013 – Jan 2, 2014

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover MSM patches for 3.14

The following series contains a warning fix, a bit of cleanup, adds a few more boards. There are still numerous patches floating with issues, but things seem to be moving in the right direction.

These have all been sent previously to the lists, and received reviews and necessary acks.

Josh Cartwright (1):
ARM: msm: trout: fix uninit var warning

Rohit Vaswani (2):
ARM: msm: Add support for APQ8074 Dragonboard
defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974

Stephen Boyd (4):
ARM: msm: Simplify ARCH_MSM_DT config
ARM: dts: MSM8974: Add restart node
ARM: dts: MSM8974: Add MMIO architected timer node
ARM: msm_defconfig: Enable restart driver

 arch/arm/boot/dts/Makefile                     |  3 +-
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts |  6 ++
 arch/arm/boot/dts/qcom-msm8974.dtsi            | 97 ++++++++++++++++++++++++++
 arch/arm/configs/msm_defconfig                 |  3 +
 arch/arm/mach-msm/Kconfig                      | 15 +++-
 arch/arm/mach-msm/board-dt.c                   |  9 +++
 arch/arm/mach-msm/board-trout.c                | 12 ++--
 7 files changed, 136 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
 create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

PATCH 1/7 ARM: msm: trout: fix uninit var warning

From: Josh Cartwright <[email protected]>

Fix the following warning when !CONFIG_MMC:

arch/arm/mach-msm/board-trout.c: In function 'trout_init':
arch/arm/mach-msm/board-trout.c:67:6: warning: unused variable 'rc' [-Wunused-variable]

  int rc;
      ^

Also, while we're here, rework explicit printk(KERN_CRIT..) to use pr_crit.

---
 arch/arm/mach-msm/board-trout.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-msm/board-trout.c +6 -6
index ccf6621..015d544 100644
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  *
  */
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -68,12 +69,11 @@ static void __init trout_init(void)
 
 	platform_add_devices(devices, ARRAY_SIZE(devices));
 
-#ifdef CONFIG_MMC
-        rc = trout_init_mmc(system_rev);
-        if (rc)
-                printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);
-#endif
-
+	if (IS_ENABLED(CONFIG_MMC)) {
+		rc = trout_init_mmc(system_rev);
+		if (rc)
+			pr_crit("MMC init failure (%d)\n", rc);
+	}
 }
 
 static struct map_desc trout_io_desc[] __initdata = {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#2 lore raw

PATCH 2/7 ARM: msm: Add support for APQ8074 Dragonboard

In reply to David Brown

From: Rohit Vaswani <[email protected]>

This patch adds basic board support for APQ8074 Dragonboard which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.

---
 arch/arm/boot/dts/Makefile                     |  3 ++-
 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts |  6 +++++
 arch/arm/boot/dts/qcom-msm8974.dtsi            | 33 ++++++++++++++++++++++++++
 arch/arm/mach-msm/Kconfig                      | 11 ++++++++-
 arch/arm/mach-msm/board-dt.c                   |  9 +++++++
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
 create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi
arch/arm/boot/dts/Makefile +2 -1
index d57c1a6..5b37694 100644
@@ -105,7 +105,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-ts219-6282.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
-	qcom-msm8960-cdp.dtb
+	qcom-msm8960-cdp.dtb \
+	qcom-apq8074-dragonboard.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-370-netgear-rn102.dtb \
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts new file +6 -0
new file mode 100644
index 0000000..13ac3e2
@@ -0,0 +1,6 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Qualcomm APQ8074 Dragonboard";
+	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
+};
arch/arm/boot/dts/qcom-msm8974.dtsi new file +33 -0
new file mode 100644
index 0000000..2ebb4f0
@@ -0,0 +1,33 @@
+/dts-v1/;
+
+#include "skeleton.dtsi"
+
+/ {
+	model = "Qualcomm MSM8974";
+	compatible = "qcom,msm8974";
+	interrupt-parent = <&intc>;
+
+	soc: soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		compatible = "simple-bus";
+
+		intc: interrupt-controller at f9000000 {
+			compatible = "qcom,msm-qgic2";
+			interrupt-controller;
+			#interrupt-cells = <3>;
+			reg = <0xf9000000 0x1000>,
+			      <0xf9002000 0x1000>;
+		};
+
+		timer {
+			compatible = "arm,armv7-timer";
+			interrupts = <1 2 0xf08>,
+				     <1 3 0xf08>,
+				     <1 4 0xf08>,
+				     <1 1 0xf08>;
+			clock-frequency = <19200000>;
+		};
+	};
+};
arch/arm/mach-msm/Kconfig +10 -1
index 2586c28..5e5782d 100644
@@ -58,9 +58,18 @@ config ARCH_MSM8960
 	select GPIO_MSM_V2
 	select MSM_SCM if SMP
 
+config ARCH_MSM8974
+	bool "MSM8974"
+	select ARM_GIC
+	select CPU_V7
+	select HAVE_ARM_ARCH_TIMER
+	select HAVE_SMP
+	select MSM_SCM if SMP
+	select USE_OF
+
 config ARCH_MSM_DT
 	def_bool y
-	depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+	depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
 	select SPARSE_IRQ
 	select USE_OF
 
arch/arm/mach-msm/board-dt.c +9 -0
index 16e6183..1f11d93 100644
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {
 	NULL
 };
 
+static const char * const apq8074_dt_match[] __initconst = {
+	"qcom,apq8074-dragonboard",
+	NULL
+};
+
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
 	.smp = smp_ops(msm_smp_ops),
 	.dt_compat = msm_dt_match,
 MACHINE_END
+
+DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.dt_compat = apq8074_dt_match,
+MACHINE_END
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
maintainer
#3 lore raw

Re: [PATCH 2/7] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 12 lines · David Brown
arch/arm/mach-msm/board-dt.c +3 -0
index 16e6183..1f11d93 100644
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {
        NULL
 };
 
+static const char * const apq8074_dt_match[] __initconst = {
+       "qcom,apq8074-dragonboard",
+       NULL

arch/arm/mach-msm/board-dt.c static const char * const msm_dt_match[] __initconst = { · line 41

Quoted 10 lines
arch/arm/mach-msm/board-dt.c +6 -0
+};
+
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
        .smp = smp_ops(msm_smp_ops),
        .dt_compat = msm_dt_match,
 MACHINE_END
+
+DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)")
+       .dt_compat = apq8074_dt_match,
+MACHINE_END

Why can't you reuse the MSM_DT definition and just add the dragonboard to the list of compatible machines? The presence of the smp_ops pointer should not matter if you don't support SMP.

Arnd

#4 lore raw

Re: [PATCH 2/7] ARM: msm: Add support for APQ8074 Dragonboard

Quoted 19 lines · Arnd Bergmann
Quoted 18 lines · David Brown
arch/arm/mach-msm/board-dt.c +6 -0
index 16e6183..1f11d93 100644
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {
        NULL
 };
 
+static const char * const apq8074_dt_match[] __initconst = {
+       "qcom,apq8074-dragonboard",
+       NULL
+};
+
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
        .smp = smp_ops(msm_smp_ops),
        .dt_compat = msm_dt_match,
 MACHINE_END
+
Quoted 9 lines

arch/arm/mach-msm/board-dt.c static const char * const msm_dt_match[] __initconst = { · line 41

Quoted 4 lines
arch/arm/mach-msm/board-dt.c +3 -0
+DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)")
+       .dt_compat = apq8074_dt_match,
+MACHINE_END

Why can't you reuse the MSM_DT definition and just add the dragonboard to the list of compatible machines? The presence of the smp_ops pointer should not matter if you don't support SMP.

If the smp_ops are present we'll try to boot the secondary CPUs with the Scorpion boot sequence instead of the Krait boot sequence. This will quickly hang the system. We can properly handle this with my SMP patches[1]. In fact, we can delete this entire file if those patches are accepted. Please take a look. I'll Cc you on them when I resend.

[1] https://lkml.org/lkml/2013/11/1/622

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
#5 lore raw

PATCH 3/7 defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974

In reply to David Brown

From: Rohit Vaswani <[email protected]>

This patch enables MSM8974 build support.

---
 arch/arm/configs/msm_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/msm_defconfig +1 -0
index 690b5f9..0ed32e5 100644
@@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MSM=y
 CONFIG_ARCH_MSM8X60=y
 CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#6 lore raw

PATCH 4/7 ARM: msm: Simplify ARCH_MSM_DT config

In reply to David Brown

From: Stephen Boyd <[email protected]>

This doesn't need to be a def_bool y. Instead we can have every DT supported platform select ARCH_MSM_DT and we achieve the same thing with less chance of conflicts.

---
 arch/arm/mach-msm/Kconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-msm/Kconfig +4 -2
index 5e5782d..702553b 100644
@@ -44,6 +44,7 @@ endchoice
 
 config ARCH_MSM8X60
 	bool "MSM8X60"
+	select ARCH_MSM_DT
 	select ARM_GIC
 	select CPU_V7
 	select GPIO_MSM_V2
@@ -52,6 +53,7 @@ config ARCH_MSM8X60
 
 config ARCH_MSM8960
 	bool "MSM8960"
+	select ARCH_MSM_DT
 	select ARM_GIC
 	select CPU_V7
 	select HAVE_SMP
@@ -60,6 +62,7 @@ config ARCH_MSM8960
 
 config ARCH_MSM8974
 	bool "MSM8974"
+	select ARCH_MSM_DT
 	select ARM_GIC
 	select CPU_V7
 	select HAVE_ARM_ARCH_TIMER
@@ -68,8 +71,7 @@ config ARCH_MSM8974
 	select USE_OF
 
 config ARCH_MSM_DT
-	def_bool y
-	depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
+	bool
 	select SPARSE_IRQ
 	select USE_OF
 
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#7 lore raw

PATCH 5/7 ARM: dts: MSM8974: Add restart node

In reply to David Brown

From: Stephen Boyd <[email protected]>

Add the restart node so we can reboot the device.

---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +5 -0
index 2ebb4f0..df18637 100644
@@ -29,5 +29,10 @@
 				     <1 1 0xf08>;
 			clock-frequency = <19200000>;
 		};
+
+		restart at fc4ab000 {
+			compatible = "qcom,pshold";
+			reg = <0xfc4ab000 0x4>;
+		};
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#8 lore raw

PATCH 6/7 ARM: dts: MSM8974: Add MMIO architected timer node

In reply to David Brown

From: Stephen Boyd <[email protected]>

Add the mmio architected timer node.

---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 59 +++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
arch/arm/boot/dts/qcom-msm8974.dtsi +59 -0
index df18637..6ac9496 100644
@@ -30,6 +30,65 @@
 			clock-frequency = <19200000>;
 		};
 
+		timer at f9020000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			compatible = "arm,armv7-timer-mem";
+			reg = <0xf9020000 0x1000>;
+			clock-frequency = <19200000>;
+
+			frame at f9021000 {
+				frame-number = <0>;
+				interrupts = <0 8 0x4>,
+					     <0 7 0x4>;
+				reg = <0xf9021000 0x1000>,
+				      <0xf9022000 0x1000>;
+			};
+
+			frame at f9023000 {
+				frame-number = <1>;
+				interrupts = <0 9 0x4>;
+				reg = <0xf9023000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9024000 {
+				frame-number = <2>;
+				interrupts = <0 10 0x4>;
+				reg = <0xf9024000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9025000 {
+				frame-number = <3>;
+				interrupts = <0 11 0x4>;
+				reg = <0xf9025000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9026000 {
+				frame-number = <4>;
+				interrupts = <0 12 0x4>;
+				reg = <0xf9026000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9027000 {
+				frame-number = <5>;
+				interrupts = <0 13 0x4>;
+				reg = <0xf9027000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9028000 {
+				frame-number = <6>;
+				interrupts = <0 14 0x4>;
+				reg = <0xf9028000 0x1000>;
+				status = "disabled";
+			};
+		};
+
 		restart at fc4ab000 {
 			compatible = "qcom,pshold";
 			reg = <0xfc4ab000 0x4>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#9 lore raw

PATCH 7/7 ARM: msm_defconfig: Enable restart driver

In reply to David Brown

From: Stephen Boyd <[email protected]>

---
 arch/arm/configs/msm_defconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/configs/msm_defconfig +2 -0
index 0ed32e5..c5698b7 100644
@@ -89,6 +89,8 @@ CONFIG_SSBI=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_MSM=y
 CONFIG_THERMAL=y
 CONFIG_REGULATOR=y
 CONFIG_MEDIA_SUPPORT=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#10 lore raw
In reply to David Brown
Quoted 7 lines · David Brown

The following series contains a warning fix, a bit of cleanup, adds a few more boards. There are still numerous patches floating with issues, but things seem to be moving in the right direction.

These have all been sent previously to the lists, and received reviews and necessary acks.

Hi,

I've applied these across the various branches, i.e I split the series up into fixes, soc, dt and board changes.

I chose to split the Dragonboard patch up into two patches instead of one:
One that adds SoC support, and a second that adds the board support. I rephrased commit messages accordingly but the contents was untouched (just split up).

I hope the clock stuff can be sorted out real quick so we get working support for more useful IP on the SoC in time for 3.14.

-Olof