Skip to contentSkip to conversation

Split mach-msm into legacy and mach-qcom (multiplatform)

PATCH Superseded Kumar Gala 2 participants 5 messages Feb 4, 2014 – Feb 11, 2014

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

v2 cover Split mach-msm into legacy and mach-qcom (multiplatform)

This is the splits the Qualcomm MSM platform into legacy support that we will not try and convert to multiplatform and multiplatform support.

- k

Changes from v1:
* Added patch to remove hotplug.c
* Added patch to rename msm_ to qcom_
* Changes the Kconfig to drop CPU_V7
* used wfi() in cpu_die function
* Added git tree to MAINTAINERS file

Kumar Gala (5):
ARM: msm: kill off hotplug.c
clocksource: qcom: Move clocksource code out of mach-msm
arm: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Rename various msm prefixed functions to qcom

 arch/arm/mach-msm/board-dt.c       |   41 ----
 arch/arm/mach-msm/hotplug.c        |   51 -----
 arch/arm/mach-msm/platsmp.c        |  130 --------------
 arch/arm/mach-msm/scm-boot.c       |   39 ----
 arch/arm/mach-msm/scm-boot.h       |   22 --
 arch/arm/mach-msm/scm.c            |  299 ---------------------------------
 arch/arm/mach-msm/scm.h            |   25 --
 arch/arm/mach-msm/timer.c          |  333 -------------------------------------
 b/MAINTAINERS                      |    8 
 b/arch/arm/Kconfig                 |    7 
 b/arch/arm/Kconfig.debug           |    2 
 b/arch/arm/Makefile                |    1 
 b/arch/arm/boot/dts/Makefile       |    6 
 b/arch/arm/mach-msm/Kconfig        |   54 ------
 b/arch/arm/mach-msm/Makefile       |    8 
 b/arch/arm/mach-msm/common.h       |    1 
 b/arch/arm/mach-qcom/Kconfig       |   33 +++
 b/arch/arm/mach-qcom/Makefile      |    5 
 b/arch/arm/mach-qcom/board.c       |   40 ++++
 b/arch/arm/mach-qcom/scm-boot.c    |   39 ++++
 b/arch/arm/mach-qcom/scm-boot.h    |   22 ++
 b/arch/arm/mach-qcom/scm.c         |  299 +++++++++++++++++++++++++++++++++
 b/arch/arm/mach-qcom/scm.h         |   25 ++
 b/arch/arm/mach-qcom/smp.c         |  137 +++++++++++++++
 b/drivers/clocksource/Kconfig      |    4 
 b/drivers/clocksource/Makefile     |    1 
 b/drivers/clocksource/qcom-timer.c |  330 ++++++++++++++++++++++++++++++++++++
 27 files changed, 957 insertions(+), 1005 deletions(-)
author
#1 lore raw

PATCH v2 1/5 ARM: msm: kill off hotplug.c

Right now hotplug.c only really implements msm_cpu_die as a wfi. Just move that implementation into platsmp.c. At the same time we use the existing wfi() instead of inline asm.

---
 arch/arm/mach-msm/Makefile  |  1 -
 arch/arm/mach-msm/common.h  |  1 -
 arch/arm/mach-msm/hotplug.c | 51 ---------------------------------------------
 arch/arm/mach-msm/platsmp.c |  7 +++++++
 4 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 arch/arm/mach-msm/hotplug.c
arch/arm/mach-msm/Makefile +0 -1
index 721f27f..8327f60 100644
@@ -18,7 +18,6 @@ obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
 
 CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
 
-obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
 obj-$(CONFIG_SMP) += platsmp.o
 
 obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
arch/arm/mach-msm/common.h +0 -1
index 33c7725..0a4899b 100644
@@ -24,7 +24,6 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
 					  unsigned int mtype, void *caller);
 
 extern struct smp_operations msm_smp_ops;
-extern void msm_cpu_die(unsigned int cpu);
 
 struct msm_mmc_platform_data;
 
arch/arm/mach-msm/hotplug.c deleted +0 -51

51 lines not on this page · raw message

arch/arm/mach-msm/platsmp.c +7 -0
index 3721b31..251a91e 100644
@@ -29,6 +29,13 @@ extern void secondary_startup(void);
 
 static DEFINE_SPINLOCK(boot_lock);
 
+#ifdef CONFIG_HOTPLUG_CPU
+static void __ref msm_cpu_die(unsigned int cpu)
+{
+	wfi();
+}
+#endif
+
 static inline int get_core_count(void)
 {
 	/* 1 + the PART[1:0] field of MIDR */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#2 lore raw

PATCH v2 2/5 clocksource: qcom: Move clocksource code out of mach-msm

In reply to Kumar Gala

We intent to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs.

---
 arch/arm/mach-msm/Kconfig        |  13 +-
 arch/arm/mach-msm/Makefile       |   1 -
 arch/arm/mach-msm/timer.c        | 333 ---------------------------------------
 drivers/clocksource/Kconfig      |   4 +
 drivers/clocksource/Makefile     |   1 +
 drivers/clocksource/qcom-timer.c | 329 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 339 insertions(+), 342 deletions(-)
 delete mode 100644 arch/arm/mach-msm/timer.c
 create mode 100644 drivers/clocksource/qcom-timer.c
arch/arm/mach-msm/Kconfig +5 -8
index 9625cf3..3c4eca7 100644
@@ -21,7 +21,7 @@ config ARCH_MSM8X60
 	select CPU_V7
 	select HAVE_SMP
 	select MSM_SCM if SMP
-	select MSM_TIMER
+	select CLKSRC_QCOM
 
 config ARCH_MSM8960
 	bool "Enable support for MSM8960"
@@ -29,7 +29,7 @@ config ARCH_MSM8960
 	select CPU_V7
 	select HAVE_SMP
 	select MSM_SCM if SMP
-	select MSM_TIMER
+	select CLKSRC_QCOM
 
 config ARCH_MSM8974
 	bool "Enable support for MSM8974"
@@ -54,7 +54,7 @@ config ARCH_MSM7X00A
 	select MACH_TROUT if !MACH_HALIBUT
 	select MSM_PROC_COMM
 	select MSM_SMD
-	select MSM_TIMER
+	select CLKSRC_QCOM
 	select MSM_SMD_PKG3
 
 config ARCH_MSM7X30
@@ -66,7 +66,7 @@ config ARCH_MSM7X30
 	select MSM_GPIOMUX
 	select MSM_PROC_COMM
 	select MSM_SMD
-	select MSM_TIMER
+	select CLKSRC_QCOM
 	select MSM_VIC
 
 config ARCH_QSD8X50
@@ -78,7 +78,7 @@ config ARCH_QSD8X50
 	select MSM_GPIOMUX
 	select MSM_PROC_COMM
 	select MSM_SMD
-	select MSM_TIMER
+	select CLKSRC_QCOM
 	select MSM_VIC
 
 endchoice
@@ -153,7 +153,4 @@ config MSM_GPIOMUX
 config MSM_SCM
 	bool
 
-config MSM_TIMER
-	bool
-
 endif
arch/arm/mach-msm/Makefile +0 -1
index 8327f60..04b1bee 100644
@@ -1,4 +1,3 @@
-obj-$(CONFIG_MSM_TIMER) += timer.o
 obj-$(CONFIG_MSM_PROC_COMM) += clock.o
 
 obj-$(CONFIG_MSM_VIC) += irq-vic.o
arch/arm/mach-msm/timer.c deleted +0 -333

333 lines not on this page · raw message

drivers/clocksource/Kconfig +4 -0
index cd6950f..81caa16 100644
@@ -140,3 +140,7 @@ config VF_PIT_TIMER
 	bool
 	help
 	  Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
+
+config CLKSRC_QCOM
+	bool
+	depends on ARCH_MSM
drivers/clocksource/Makefile +1 -0
index c7ca50a..2e0c0cc 100644
@@ -32,6 +32,7 @@ obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32.o
 obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o
 obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o
+obj-$(CONFIG_CLKSRC_QCOM)	+= qcom-timer.o
 
 obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o
 obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o
drivers/clocksource/qcom-timer.c new file +329 -0

329 lines not on this page · raw message

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

Re: [PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm

Quoted 5 lines · Kumar Gala

We intent to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs.

Hi Kumar,

through which tree do you expect this patch to be upstream ?

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author
#4 lore raw

Re: [PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm

Quoted 10 lines · Daniel Lezcano
Quoted 5 lines · Kumar Gala

We intent to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs.

Hi Kumar,

through which tree do you expect this patch to be upstream ?

The linux-qcom to keep things sane there. So an ack would be great.

- k

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