Initial Calxeda Highbank support

From: Rob Herring <[email protected]>

Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.

Signed-off-by Rob Herring <[email protected]>

---
?arch/arm/include/asm/hardware/cache-l2x0.h | ? ?7 +++++++ ?1 files changed, 7 insertions(+), 0 deletions(-)

arch/arm/include/asm/hardware/cache-l2x0.h +0 -0

index 4a6004a..967a808 100644
@@ -90,7 +90,14 @@
 

?#ifndef __ASSEMBLY__
?extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask); +#if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF)
?extern int l2x0_of_init(__u32 aux_val, __u32 aux_mask);

arch/arm/include/asm/hardware/cache-l2x0.h +5 -0

+#else
+static int l2x0_of_init(__u32 aux_val, __u32 aux_mask)
+{
+ ? ? ? return -ENODEV;
+}

?#endif
+#endif /* __ASSEMBLY__ */

?#endif
--
1.7.4.1

2011/9/1 Rob Herring <[email protected]>:

Quoted 5 lines

From: Rob Herring <[email protected]>

Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.

Signed-off-by Rob Herring <[email protected]>

Acked-by Barry Song <[email protected]>

it seems most people use
"
#ifdef CONFIG_CACHE_L2X0
...
l2x0 related codes
...
#endif
"
or
"
obj-$(CONFIG_CACHE_L2X0) += xxx-l2x0.o
"

to avoid l2x0 related codes compiled and linked into kernel.

but this patch provides another option. it is not bad too.

From: Rob Herring <[email protected]>

This enables SMP support on highbank processor.

Signed-off-by Rob Herring <[email protected]>

---
Changes in v2:
- drop NULL check of scu_base
- use IPI #0 instead of #1 to boot secondary
- s/a9_base_addr/scu_base_addr/
- fix muliple mapping of twd registers

 arch/arm/Kconfig                    |    2 +-
 arch/arm/mach-highbank/Makefile     |    2 +
 arch/arm/mach-highbank/localtimer.c |   38 +++++++++++++++++
 arch/arm/mach-highbank/platsmp.c    |   78 +++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-highbank/localtimer.c
 create mode 100644 arch/arm/mach-highbank/platsmp.c

arch/arm/Kconfig +1 -1

index 9019a56..6d2add5 100644
@@ -1372,7 +1372,7 @@ config SMP
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
 		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
+		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	help

arch/arm/mach-highbank/Makefile +2 -0

index 11d4010..311c0e8e 100644
@@ -1,2 +1,4 @@
 obj-y					:= clock.o highbank.o system.o
 obj-$(CONFIG_DEBUG_LL)			+= lluart.o
+obj-$(CONFIG_SMP)			+= platsmp.o
+obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-highbank/localtimer.c new file +24 -0

new file mode 100644
index 0000000..344ea29
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ * Based on localtimer.c, Copyright (C) 2002 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/init.h>
+#include <linux/clockchips.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#include <asm/smp_twd.h>
+

arch/arm/mach-highbank/localtimer.c new file +4 -0

+	evt->irq = irq_of_parse_and_map(np, 0);
+	twd_timer_setup(evt);
+	return 0;
+}

Quoted 76 lines · Rob Herring

From: Rob Herring <[email protected]>

This enables SMP support on highbank processor.

Signed-off-by Rob Herring <[email protected]>

---
Changes in v2:
- drop NULL check of scu_base
- use IPI #0 instead of #1 to boot secondary
- s/a9_base_addr/scu_base_addr/
- fix muliple mapping of twd registers

 arch/arm/Kconfig                    |    2 +-
 arch/arm/mach-highbank/Makefile     |    2 +
 arch/arm/mach-highbank/localtimer.c |   38 +++++++++++++++++
 arch/arm/mach-highbank/platsmp.c    |   78 +++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-highbank/localtimer.c
 create mode 100644 arch/arm/mach-highbank/platsmp.c

arch/arm/Kconfig +1 -1

index 9019a56..6d2add5 100644
@@ -1372,7 +1372,7 @@ config SMP
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
 		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
+		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	help

arch/arm/mach-highbank/Makefile +2 -0

index 11d4010..311c0e8e 100644
@@ -1,2 +1,4 @@
 obj-y					:= clock.o highbank.o system.o
 obj-$(CONFIG_DEBUG_LL)			+= lluart.o
+obj-$(CONFIG_SMP)			+= platsmp.o
+obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-highbank/localtimer.c new file +28 -0

new file mode 100644
index 0000000..344ea29
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ * Based on localtimer.c, Copyright (C) 2002 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/init.h>
+#include <linux/clockchips.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#include <asm/smp_twd.h>
+
+/*
+ * Setup the local clock events for a CPU.
+ */
+int __cpuinit local_timer_setup(struct clock_event_device *evt)

arch/arm/mach-highbank/localtimer.c line 34

Quoted 6 lines

arch/arm/mach-highbank/localtimer.c new file +6 -0

+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "arm,smp-twd");
+	if (!twd_base)
+		twd_base = of_iomap(np, 0);

WARN_ON(!twd_base)?

Shawn,

Quoted 77 lines · Shawn Guo

Quoted 76 lines · Rob Herring

From: Rob Herring <[email protected]>

This enables SMP support on highbank processor.

Signed-off-by Rob Herring <[email protected]>

---
Changes in v2:
- drop NULL check of scu_base
- use IPI #0 instead of #1 to boot secondary
- s/a9_base_addr/scu_base_addr/
- fix muliple mapping of twd registers

 arch/arm/Kconfig                    |    2 +-
 arch/arm/mach-highbank/Makefile     |    2 +
 arch/arm/mach-highbank/localtimer.c |   38 +++++++++++++++++
 arch/arm/mach-highbank/platsmp.c    |   78 +++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-highbank/localtimer.c
 create mode 100644 arch/arm/mach-highbank/platsmp.c

arch/arm/Kconfig +1 -1

index 9019a56..6d2add5 100644
@@ -1372,7 +1372,7 @@ config SMP
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
 		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
+		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	help

arch/arm/mach-highbank/Makefile +2 -0

index 11d4010..311c0e8e 100644
@@ -1,2 +1,4 @@
 obj-y					:= clock.o highbank.o system.o
 obj-$(CONFIG_DEBUG_LL)			+= lluart.o
+obj-$(CONFIG_SMP)			+= platsmp.o
+obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-highbank/localtimer.c new file +28 -0

new file mode 100644
index 0000000..344ea29
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ * Based on localtimer.c, Copyright (C) 2002 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/init.h>
+#include <linux/clockchips.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#include <asm/smp_twd.h>
+
+/*
+ * Setup the local clock events for a CPU.
+ */
+int __cpuinit local_timer_setup(struct clock_event_device *evt)

Quoted 9 lines

arch/arm/mach-highbank/localtimer.c line 34

Quoted 6 lines

arch/arm/mach-highbank/localtimer.c new file +6 -0

+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "arm,smp-twd");
+	if (!twd_base)
+		twd_base = of_iomap(np, 0);

WARN_ON(!twd_base)?

Okay, will add it. Can I add your Reviewed-by for the series?

From: Rob Herring <[email protected]>

Add the platform suspend ops for highbank.

Signed-off-by Rob Herring <[email protected]>

---
Changes in v2:
- s/a9_base_addr/scu_base_addr/
- use sysregs helper functions
- add __init to highbank_pm_init

 arch/arm/mach-highbank/Makefile |    1 +
 arch/arm/mach-highbank/pm.c     |   55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-highbank/pm.c

arch/arm/mach-highbank/Makefile +1 -0

index df30b0d..daeb3d8 100644
@@ -3,3 +3,4 @@ obj-$(CONFIG_DEBUG_LL)			+= lluart.o
 obj-$(CONFIG_SMP)			+= platsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
+obj-$(CONFIG_PM_SLEEP)			+= pm.o

arch/arm/mach-highbank/pm.c new file +31 -0

new file mode 100644
index 0000000..33b3beb
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011 Calxeda, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/suspend.h>
+
+#include <asm/proc-fns.h>
+#include <asm/smp_scu.h>
+#include <asm/suspend.h>
+
+#include "core.h"
+#include "sysregs.h"
+
+static int highbank_suspend_finish(unsigned long val)
+{
+	cpu_do_idle();
+	return 0;

arch/arm/mach-highbank/pm.c new file +14 -0

+	return 0;
+}
+
+static const struct platform_suspend_ops highbank_pm_ops = {
+	.enter = highbank_pm_enter,
+	.valid = suspend_valid_only_mem,
+};
+
+static int __init highbank_pm_init(void)
+{
+	suspend_set_ops(&highbank_pm_ops);
+	return 0;
+}
+module_init(highbank_pm_init);

Signature · 1 line

1.7.4.1

Quoted 62 lines · Rob Herring

From: Rob Herring <[email protected]>

Add the platform suspend ops for highbank.

Signed-off-by Rob Herring <[email protected]>

---
Changes in v2:
- s/a9_base_addr/scu_base_addr/
- use sysregs helper functions
- add __init to highbank_pm_init

 arch/arm/mach-highbank/Makefile |    1 +
 arch/arm/mach-highbank/pm.c     |   55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-highbank/pm.c

arch/arm/mach-highbank/Makefile +1 -0

index df30b0d..daeb3d8 100644
@@ -3,3 +3,4 @@ obj-$(CONFIG_DEBUG_LL)			+= lluart.o
 obj-$(CONFIG_SMP)			+= platsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
+obj-$(CONFIG_PM_SLEEP)			+= pm.o

arch/arm/mach-highbank/pm.c new file +31 -0

new file mode 100644
index 0000000..33b3beb
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011 Calxeda, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/suspend.h>
+
+#include <asm/proc-fns.h>
+#include <asm/smp_scu.h>
+#include <asm/suspend.h>
+
+#include "core.h"
+#include "sysregs.h"
+
+static int highbank_suspend_finish(unsigned long val)
+{
+	cpu_do_idle();
+	return 0;

arch/arm/mach-highbank/pm.c line 41

Quoted 10 lines

arch/arm/mach-highbank/pm.c new file +10 -0

+}
+
+static int highbank_pm_enter(suspend_state_t state)
+{
+	hignbank_set_pwr_suspend();
+	highbank_set_cpu_jump(0, cpu_resume);
+
+	scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+	cpu_suspend(0, highbank_suspend_finish);
+

Rob,

Just out of curiosity, how can you resume back without taking care of GIC, L2 and SCU which will lose power during suspend?

From: Rob Herring <[email protected]>

This adds initial platform support for Calxeda's Highbank ARM SOC including SMP, hotplug, and suspend support. One new patch to add empty version of l2x0_of_init. Changes for v2 are listed in each patch.

Based on rmk's for-next branch with gpio.h and io.h clean-ups plus previously posted GIC devicetree binding support. The GIC patches are here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/060570.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/060790.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/062735.html

From: Rob Herring <[email protected]>

This adds initial platform support for Calxeda's Highbank ARM SOC including SMP, hotplug, and suspend support. One new patch to add empty version of l2x0_of_init. Changes for v2 are listed in each patch.

Based on rmk's for-next branch with gpio.h and io.h clean-ups plus previously posted GIC devicetree binding support. The GIC patches are here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/060570.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/060790.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2011-August/062735.html

Rob

Martin Bogomolni (1):
ARM: highbank: Add cpu hotplug support

Rob Herring (6):
ARM: l2x0: add empty l2x0_of_init
ARM: highbank: add devicetree source
ARM: add Highbank core platform support
MAINTAINERS: add Calxeda Highbank ARM platform
ARM: highbank: add SMP support
ARM: highbank: add suspend support

 Documentation/devicetree/bindings/arm/calxeda.txt |    8 +
 MAINTAINERS                                       |    6 +
 arch/arm/Kconfig                                  |   18 ++-
 arch/arm/Makefile                                 |    1 +
 arch/arm/boot/dts/highbank.dts                    |  224 +++++++++++++++++++++
 arch/arm/include/asm/hardware/cache-l2x0.h        |    7 +
 arch/arm/mach-highbank/Makefile                   |    6 +
 arch/arm/mach-highbank/Makefile.boot              |    1 +
 arch/arm/mach-highbank/clock.c                    |   62 ++++++
 arch/arm/mach-highbank/core.h                     |    9 +
 arch/arm/mach-highbank/highbank.c                 |  150 ++++++++++++++
 arch/arm/mach-highbank/hotplug.c                  |   56 +++++
 arch/arm/mach-highbank/include/mach/debug-macro.S |   19 ++
 arch/arm/mach-highbank/include/mach/entry-macro.S |    7 +
 arch/arm/mach-highbank/include/mach/gpio.h        |    1 +
 arch/arm/mach-highbank/include/mach/io.h          |    7 +
 arch/arm/mach-highbank/include/mach/irqs.h        |    6 +
 arch/arm/mach-highbank/include/mach/memory.h      |    1 +
 arch/arm/mach-highbank/include/mach/system.h      |   26 +++
 arch/arm/mach-highbank/include/mach/timex.h       |    6 +
 arch/arm/mach-highbank/include/mach/uncompress.h  |    9 +
 arch/arm/mach-highbank/include/mach/vmalloc.h     |    6 +
 arch/arm/mach-highbank/lluart.c                   |   34 +++
 arch/arm/mach-highbank/localtimer.c               |   38 ++++
 arch/arm/mach-highbank/platsmp.c                  |   78 +++++++
 arch/arm/mach-highbank/pm.c                       |   55 +++++
 arch/arm/mach-highbank/sysregs.h                  |   52 +++++
 arch/arm/mach-highbank/system.c                   |   33 +++
 arch/arm/mm/Kconfig                               |    2 +-
 29 files changed, 926 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/calxeda.txt
 create mode 100644 arch/arm/boot/dts/highbank.dts
 create mode 100644 arch/arm/mach-highbank/Makefile
 create mode 100644 arch/arm/mach-highbank/Makefile.boot
 create mode 100644 arch/arm/mach-highbank/clock.c
 create mode 100644 arch/arm/mach-highbank/core.h
 create mode 100644 arch/arm/mach-highbank/highbank.c
 create mode 100644 arch/arm/mach-highbank/hotplug.c
 create mode 100644 arch/arm/mach-highbank/include/mach/debug-macro.S
 create mode 100644 arch/arm/mach-highbank/include/mach/entry-macro.S
 create mode 100644 arch/arm/mach-highbank/include/mach/gpio.h
 create mode 100644 arch/arm/mach-highbank/include/mach/io.h
 create mode 100644 arch/arm/mach-highbank/include/mach/irqs.h
 create mode 100644 arch/arm/mach-highbank/include/mach/memory.h
 create mode 100644 arch/arm/mach-highbank/include/mach/system.h
 create mode 100644 arch/arm/mach-highbank/include/mach/timex.h

 create mode 100644 arch/arm/mach-highbank/include/mach/uncompress.h
 create mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h
 create mode 100644 arch/arm/mach-highbank/lluart.c
 create mode 100644 arch/arm/mach-highbank/localtimer.c
 create mode 100644 arch/arm/mach-highbank/platsmp.c
 create mode 100644 arch/arm/mach-highbank/pm.c
 create mode 100644 arch/arm/mach-highbank/sysregs.h
 create mode 100644 arch/arm/mach-highbank/system.c

Any comments on v2?

The GIC binding series seems to be firming up. As myself and several others are dependent on it, I was planning to send both through arm-soc tree as 2 pulls. I also have some dependencies on rmk's tree with l2x0 DT support and mach header clean-ups.