* [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 3:36 ` Barry Song
2011-09-01 1:44 ` [PATCH v2 2/7] ARM: highbank: add devicetree source Rob Herring
` (7 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/include/asm/hardware/cache-l2x0.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
index 4a6004a..967a808 100644
--- a/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@ -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);
+#else
+static int l2x0_of_init(__u32 aux_val, __u32 aux_mask)
+{
+ return -ENODEV;
+}
#endif
+#endif /* __ASSEMBLY__ */
#endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init
2011-09-01 1:44 ` [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init Rob Herring
@ 2011-09-01 3:36 ` Barry Song
2011-09-01 3:58 ` Rob Herring
0 siblings, 1 reply; 18+ messages in thread
From: Barry Song @ 2011-09-01 3:36 UTC (permalink / raw)
To: linux-arm-kernel
2011/9/1 Rob Herring <robherring2@gmail.com>:
> From: Rob Herring <rob.herring@calxeda.com>
>
> Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Barry Song <21cnbao@gmail.com>
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.
> ---
> ?arch/arm/include/asm/hardware/cache-l2x0.h | ? ?7 +++++++
> ?1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
> index 4a6004a..967a808 100644
> --- a/arch/arm/include/asm/hardware/cache-l2x0.h
> +++ b/arch/arm/include/asm/hardware/cache-l2x0.h
> @@ -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);
> +#else
> +static int l2x0_of_init(__u32 aux_val, __u32 aux_mask)
> +{
> + ? ? ? return -ENODEV;
> +}
> ?#endif
> +#endif /* __ASSEMBLY__ */
>
> ?#endif
> --
> 1.7.4.1
-barry
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init
2011-09-01 3:36 ` Barry Song
@ 2011-09-01 3:58 ` Rob Herring
0 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 3:58 UTC (permalink / raw)
To: linux-arm-kernel
Barry,
On 08/31/2011 10:36 PM, Barry Song wrote:
> 2011/9/1 Rob Herring <robherring2@gmail.com>:
>> From: Rob Herring <rob.herring@calxeda.com>
>>
>> Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.
>>
>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>
> Acked-by: Barry Song <21cnbao@gmail.com>
>
Thanks.
> 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.
>
The difference with existing platforms and l2x0_init is the ioremap or
static mapping and latency register setup for pl310 is outside the
function, so you still need an ifdef around all that. With l2x0_of_init,
all the setup is done inside the function, so having an empty version is
useful.
Rob
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/7] ARM: highbank: add devicetree source
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
2011-09-01 1:44 ` [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 1:44 ` [PATCH v2 3/7] ARM: add Highbank core platform support Rob Herring
` (6 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
This adds the devicetree source and documentation for the Calxeda highbank
platform.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
Changes in v2:
- Change gic interrupt-cell size to 2 and update entries to high level
triggered.
Documentation/devicetree/bindings/arm/calxeda.txt | 8 +
arch/arm/boot/dts/highbank.dts | 224 +++++++++++++++++++++
2 files changed, 232 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/calxeda.txt
create mode 100644 arch/arm/boot/dts/highbank.dts
diff --git a/Documentation/devicetree/bindings/arm/calxeda.txt b/Documentation/devicetree/bindings/arm/calxeda.txt
new file mode 100644
index 0000000..4755caa
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/calxeda.txt
@@ -0,0 +1,8 @@
+Calxeda Highbank Platforms Device Tree Bindings
+-----------------------------------------------
+
+Boards with Calxeda Cortex-A9 based Highbank SOC shall have the following
+properties.
+
+Required root node properties:
+ - compatible = "calxeda,highbank";
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
new file mode 100644
index 0000000..40fe013
--- /dev/null
+++ b/arch/arm/boot/dts/highbank.dts
@@ -0,0 +1,224 @@
+/*
+ * 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/>.
+ */
+
+/dts-v1/;
+
+/* First 4KB has pen for secondary cores. */
+/memreserve/ 0x00000000 0x0001000;
+
+/ {
+ model = "Calxeda Highbank";
+ compatible = "calxeda,highbank";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu at 0 {
+ compatible = "arm,cortex-a9";
+ reg = <0>;
+ next-level-cache = <&L2>;
+ };
+
+ cpu at 1 {
+ compatible = "arm,cortex-a9";
+ reg = <1>;
+ next-level-cache = <&L2>;
+ };
+
+ cpu at 2 {
+ compatible = "arm,cortex-a9";
+ reg = <2>;
+ next-level-cache = <&L2>;
+ };
+
+ cpu at 3 {
+ compatible = "arm,cortex-a9";
+ reg = <3>;
+ next-level-cache = <&L2>;
+ };
+ };
+
+ memory {
+ name = "memory";
+ device_type = "memory";
+ reg = <0x00000000 0xff900000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyAMA0";
+ };
+
+ intc: interrupt-controller at fff11000 {
+ compatible = "arm,cortex-a9-gic";
+ #interrupt-cells = <2>;
+ #size-cells = <0>;
+ #address-cells = <1>;
+ interrupt-controller;
+ reg = <0xfff11000 0x1000>,
+ <0xfff10100 0x100>;
+
+ gicppi0: gic-ppi at 0 {
+ compatible = "arm,cortex-a9-gic-ppi";
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ reg = <0>;
+ };
+ gicppi1: gic-ppi at 1 {
+ compatible = "arm,cortex-a9-gic-ppi";
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ reg = <1>;
+ };
+ gicppi2: gic-ppi at 2 {
+ compatible = "arm,cortex-a9-gic-ppi";
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ reg = <2>;
+ };
+ gicppi3: gic-ppi at 3 {
+ compatible = "arm,cortex-a9-gic-ppi";
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ reg = <3>;
+ };
+ };
+
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "simple-bus";
+ interrupt-parent = <&intc>;
+ ranges;
+
+ timer at fff10600 {
+ compatible = "arm,smp-twd";
+ reg = <0xfff10600 0x20>;
+ interrupt-parent = <&gicppi0>;
+ interrupts = <29>;
+ };
+
+ watchdog at fff10620 {
+ compatible = "arm,cortex-a9-wdt";
+ reg = <0xfff10620 0x20>;
+ interrupt-parent = <&gicppi0>;
+ interrupts = <30>;
+ };
+
+ L2: l2-cache {
+ compatible = "arm,pl310-cache";
+ reg = <0xfff12000 0x1000>;
+ interrupts = <102 4>;
+ cache-unified;
+ cache-level = <2>;
+ };
+
+ pmu {
+ compatible = "arm,cortex-a9-pmu";
+ interrupts = <108 4 107 4 106 4 105 4>;
+ };
+
+ sata at ffe08000 {
+ compatible = "calxeda,hb-ahci";
+ reg = <0xffe08000 0x10000>;
+ interrupts = <115 4>;
+ };
+
+ sdhci at ffe0e000 {
+ compatible = "calxeda,hb-sdhci";
+ reg = <0xffe0e000 0x1000>;
+ interrupts = <122 4>;
+ };
+
+ ipc at fff20000 {
+ compatible = "arm,pl320", "arm,primecell";
+ reg = <0xfff20000 0x1000>;
+ interrupts = <39 4>;
+ };
+
+ gpioe: gpio at fff30000 {
+ #gpio-cells = <2>;
+ compatible = "arm,pl061", "arm,primecell";
+ gpio-controller;
+ reg = <0xfff30000 0x1000>;
+ interrupts = <46 4>;
+ };
+
+ gpiof: gpio at fff31000 {
+ #gpio-cells = <2>;
+ compatible = "arm,pl061", "arm,primecell";
+ gpio-controller;
+ reg = <0xfff31000 0x1000>;
+ interrupts = <47 4>;
+ };
+
+ gpiog: gpio at fff32000 {
+ #gpio-cells = <2>;
+ compatible = "arm,pl061", "arm,primecell";
+ gpio-controller;
+ reg = <0xfff32000 0x1000>;
+ interrupts = <48 4>;
+ };
+
+ gpioh: gpio at fff33000 {
+ #gpio-cells = <2>;
+ compatible = "arm,pl061", "arm,primecell";
+ gpio-controller;
+ reg = <0xfff33000 0x1000>;
+ interrupts = <49 4>;
+ };
+
+ timer {
+ compatible = "arm,sp804", "arm,primecell";
+ reg = <0xfff34000 0x1000>;
+ interrupts = <50 4>;
+ };
+
+ rtc at fff35000 {
+ compatible = "arm,pl031", "arm,primecell";
+ reg = <0xfff35000 0x1000>;
+ interrupts = <51 4>;
+ };
+
+ serial at fff36000 {
+ compatible = "arm,pl011", "arm,primecell";
+ reg = <0xfff36000 0x1000>;
+ interrupts = <52 4>;
+ };
+
+ smic at fff3a000 {
+ compatible = "ipmi-smic";
+ device_type = "ipmi";
+ reg = <0xfff3a000 0x1000>;
+ interrupts = <56 4>;
+ reg-size = <4>;
+ reg-spacing = <4>;
+ };
+
+ sregs at fff3c000 {
+ compatible = "calxeda,hb-sregs";
+ reg = <0xfff3c000 0x1000>;
+ };
+
+ dma at fff3d000 {
+ compatible = "arm,pl330", "arm,primecell";
+ reg = <0xfff3d000 0x1000>;
+ interrupts = <124 4>;
+ };
+ };
+};
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 3/7] ARM: add Highbank core platform support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
2011-09-01 1:44 ` [PATCH 1/7] ARM: l2x0: add empty l2x0_of_init Rob Herring
2011-09-01 1:44 ` [PATCH v2 2/7] ARM: highbank: add devicetree source Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 1:44 ` [PATCH v2 4/7] MAINTAINERS: add Calxeda Highbank ARM platform Rob Herring
` (5 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
This adds basic support for the Calxeda Highbank platform.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
Changes in v2:
- s/a9_base_addr/scu_base_addr/
- Move DEBUG_LL io mapping to lluart.c
- Convert direct sysregs accesses to inline helper functions
- drop gpio interrupt mapping for now
- Remove IO_SPACE_LIMIT and fix warnings from inb, outb, etc. due parameter
being unused in __io
- sort Kconfig select entries
- Add WARN_ON for ioremap failures
- drop unneeded include from entry-macro.S
- remove #ifdef around l2x0_of_init
- Add "/* empty */" to empty headers
arch/arm/Kconfig | 16 +++
arch/arm/Makefile | 1 +
arch/arm/mach-highbank/Makefile | 2 +
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/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/sysregs.h | 52 +++++++
arch/arm/mach-highbank/system.c | 33 +++++
arch/arm/mm/Kconfig | 2 +-
21 files changed, 449 insertions(+), 1 deletions(-)
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/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/sysregs.h
create mode 100644 arch/arm/mach-highbank/system.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 63cbd86..9019a56 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -314,6 +314,22 @@ config ARCH_BCMRING
help
Support for Broadcom's BCMRing platform.
+config ARCH_HIGHBANK
+ bool "Calxeda Highbank-based"
+ select ARCH_WANT_OPTIONAL_GPIOLIB
+ select ARM_AMBA
+ select ARM_GIC
+ select ARM_PATCH_PHYS_VIRT
+ select ARM_TIMER_SP804
+ select AUTO_ZRELADDR
+ select CLKDEV_LOOKUP
+ select CPU_V7
+ select GENERIC_CLOCKEVENTS
+ select HAVE_ARM_SCU
+ select USE_OF
+ help
+ Support for the Calxeda Highbank SoC based boards.
+
config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x-based"
select CPU_ARM720T
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5665c2a..98c3c22 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -144,6 +144,7 @@ machine-$(CONFIG_ARCH_EBSA110) := ebsa110
machine-$(CONFIG_ARCH_EP93XX) := ep93xx
machine-$(CONFIG_ARCH_GEMINI) := gemini
machine-$(CONFIG_ARCH_H720X) := h720x
+machine-$(CONFIG_ARCH_HIGHBANK) := highbank
machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
machine-$(CONFIG_ARCH_IOP32X) := iop32x
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
new file mode 100644
index 0000000..11d4010
--- /dev/null
+++ b/arch/arm/mach-highbank/Makefile
@@ -0,0 +1,2 @@
+obj-y := clock.o highbank.o system.o
+obj-$(CONFIG_DEBUG_LL) += lluart.o
diff --git a/arch/arm/mach-highbank/Makefile.boot b/arch/arm/mach-highbank/Makefile.boot
new file mode 100644
index 0000000..dae9661
--- /dev/null
+++ b/arch/arm/mach-highbank/Makefile.boot
@@ -0,0 +1 @@
+zreladdr-y := 0x00008000
diff --git a/arch/arm/mach-highbank/clock.c b/arch/arm/mach-highbank/clock.c
new file mode 100644
index 0000000..c25a2ae
--- /dev/null
+++ b/arch/arm/mach-highbank/clock.c
@@ -0,0 +1,62 @@
+/*
+ * 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/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+
+struct clk {
+ unsigned long rate;
+};
+
+int clk_enable(struct clk *clk)
+{
+ return 0;
+}
+
+void clk_disable(struct clk *clk)
+{}
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+ return clk->rate;
+}
+
+long clk_round_rate(struct clk *clk, unsigned long rate)
+{
+ return clk->rate;
+}
+
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+ return 0;
+}
+
+static struct clk eclk = { .rate = 200000000 };
+static struct clk pclk = { .rate = 150000000 };
+
+static struct clk_lookup lookups[] = {
+ { .clk = &pclk, .con_id = "apb_pclk", },
+ { .clk = &pclk, .dev_id = "sp804", },
+ { .clk = &eclk, .dev_id = "ffe0e000.sdhci", },
+ { .clk = &pclk, .dev_id = "fff36000.serial", },
+};
+
+void __init highbank_clocks_init(void)
+{
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+}
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
new file mode 100644
index 0000000..9df3fc7
--- /dev/null
+++ b/arch/arm/mach-highbank/core.h
@@ -0,0 +1,9 @@
+extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
+extern void highbank_clocks_init(void);
+extern void __iomem *scu_base_addr;
+#ifdef CONFIG_DEBUG_LL
+extern void highbank_lluart_map_io(void);
+#else
+static inline void highbank_lluart_map_io(void) {}
+#endif
+
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
new file mode 100644
index 0000000..fb257e0
--- /dev/null
+++ b/arch/arm/mach-highbank/highbank.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2010-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/clk.h>
+#include <linux/clkdev.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+
+#include <asm/cacheflush.h>
+#include <asm/unified.h>
+#include <asm/smp_scu.h>
+#include <asm/hardware/arm_timer.h>
+#include <asm/hardware/timer-sp.h>
+#include <asm/hardware/gic.h>
+#include <asm/hardware/cache-l2x0.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/time.h>
+#include <mach/irqs.h>
+
+#include "core.h"
+#include "sysregs.h"
+
+void __iomem *sregs_base;
+
+#define HB_SCU_VIRT_BASE 0xfee00000
+void __iomem *scu_base_addr = ((void __iomem *)(HB_SCU_VIRT_BASE));
+
+static struct map_desc scu_io_desc __initdata = {
+ .virtual = HB_SCU_VIRT_BASE,
+ .pfn = 0, /* run-time */
+ .length = SZ_4K,
+ .type = MT_DEVICE,
+};
+
+static void __init highbank_scu_map_io(void)
+{
+ unsigned long base;
+
+ /* Get SCU base */
+ asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
+
+ scu_io_desc.pfn = __phys_to_pfn(base);
+ iotable_init(&scu_io_desc, 1);
+}
+
+static void __init highbank_map_io(void)
+{
+ highbank_scu_map_io();
+ highbank_lluart_map_io();
+}
+
+#define HB_JUMP_TABLE_PHYS(cpu) (0x40 + (0x10 * (cpu)))
+#define HB_JUMP_TABLE_VIRT(cpu) phys_to_virt(HB_JUMP_TABLE_PHYS(cpu))
+
+void highbank_set_cpu_jump(int cpu, void *jump_addr)
+{
+ writel(BSYM(virt_to_phys(jump_addr)), HB_JUMP_TABLE_VIRT(cpu));
+ __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
+ outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),
+ HB_JUMP_TABLE_PHYS(cpu) + 15);
+}
+
+void highbank_init_irq(void)
+{
+ struct device_node *node;
+ struct of_intc_desc desc;
+
+ memset(&desc, 0, sizeof(desc));
+ desc.controller = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-gic");
+ gic_of_init(&desc);
+ node = desc.controller;
+ for_each_child_of_node(node, desc.controller)
+ gic_of_ppi_init(&desc);
+
+ l2x0_of_init(0, ~0UL);
+}
+
+static void __init highbank_timer_init(void)
+{
+ int irq;
+ struct device_node *np;
+ void __iomem *timer_base;
+
+ /* Map system registers */
+ np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
+ sregs_base = of_iomap(np, 0);
+ WARN_ON(!sregs_base);
+
+ np = of_find_compatible_node(NULL, NULL, "arm,sp804");
+ timer_base = of_iomap(np, 0);
+ WARN_ON(!timer_base);
+ irq = irq_of_parse_and_map(np, 0);
+
+ highbank_clocks_init();
+
+ sp804_clocksource_init(timer_base + 0x20, "timer1");
+ sp804_clockevents_init(timer_base, irq, "timer0");
+}
+
+static struct sys_timer highbank_timer = {
+ .init = highbank_timer_init,
+};
+
+static void highbank_power_off(void)
+{
+ hignbank_set_pwr_shutdown();
+ scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+
+ while (1)
+ cpu_do_idle();
+}
+
+static void __init highbank_init(void)
+{
+ pm_power_off = highbank_power_off;
+
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *highbank_match[] __initconst = {
+ "calxeda,highbank",
+ NULL,
+};
+
+DT_MACHINE_START(HIGHBANK, "Highbank")
+ .map_io = highbank_map_io,
+ .init_irq = highbank_init_irq,
+ .nr_irqs = NR_IRQS,
+ .timer = &highbank_timer,
+ .init_machine = highbank_init,
+ .dt_compat = highbank_match,
+MACHINE_END
diff --git a/arch/arm/mach-highbank/include/mach/debug-macro.S b/arch/arm/mach-highbank/include/mach/debug-macro.S
new file mode 100644
index 0000000..2f3e344
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/debug-macro.S
@@ -0,0 +1,19 @@
+/*
+ * Debugging macro include header
+ *
+ * Copyright (C) 1994-1999 Russell King
+ * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+ .macro addruart,rp,rv
+ movw \rv, #0x6000
+ movt \rv, #0xfee3
+ movw \rp, #0x6000
+ movt \rp, #0xfff3
+ .endm
+
+#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-highbank/include/mach/entry-macro.S b/arch/arm/mach-highbank/include/mach/entry-macro.S
new file mode 100644
index 0000000..73c1129
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/entry-macro.S
@@ -0,0 +1,7 @@
+#include <asm/hardware/entry-macro-gic.S>
+
+ .macro disable_fiq
+ .endm
+
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm
diff --git a/arch/arm/mach-highbank/include/mach/gpio.h b/arch/arm/mach-highbank/include/mach/gpio.h
new file mode 100644
index 0000000..40a8c17
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */
diff --git a/arch/arm/mach-highbank/include/mach/io.h b/arch/arm/mach-highbank/include/mach/io.h
new file mode 100644
index 0000000..70cfa3b
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/io.h
@@ -0,0 +1,7 @@
+#ifndef __MACH_IO_H
+#define __MACH_IO_H
+
+#define __io(a) ({ (void)(a); __typesafe_io(0); })
+#define __mem_pci(a) (a)
+
+#endif
diff --git a/arch/arm/mach-highbank/include/mach/irqs.h b/arch/arm/mach-highbank/include/mach/irqs.h
new file mode 100644
index 0000000..9746aab
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/irqs.h
@@ -0,0 +1,6 @@
+#ifndef __MACH_IRQS_H
+#define __MACH_IRQS_H
+
+#define NR_IRQS 192
+
+#endif
diff --git a/arch/arm/mach-highbank/include/mach/memory.h b/arch/arm/mach-highbank/include/mach/memory.h
new file mode 100644
index 0000000..40a8c17
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/memory.h
@@ -0,0 +1 @@
+/* empty */
diff --git a/arch/arm/mach-highbank/include/mach/system.h b/arch/arm/mach-highbank/include/mach/system.h
new file mode 100644
index 0000000..7e81922
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/system.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-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/>.
+ */
+#ifndef __MACH_SYSTEM_H
+#define __MACH_SYSTEM_H
+
+static inline void arch_idle(void)
+{
+ cpu_do_idle();
+}
+
+extern void arch_reset(char mode, const char *cmd);
+
+#endif
diff --git a/arch/arm/mach-highbank/include/mach/timex.h b/arch/arm/mach-highbank/include/mach/timex.h
new file mode 100644
index 0000000..88dac7a
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/timex.h
@@ -0,0 +1,6 @@
+#ifndef __MACH_TIMEX_H
+#define __MACH_TIMEX_H
+
+#define CLOCK_TICK_RATE 1000000
+
+#endif
diff --git a/arch/arm/mach-highbank/include/mach/uncompress.h b/arch/arm/mach-highbank/include/mach/uncompress.h
new file mode 100644
index 0000000..bbe20e6
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/uncompress.h
@@ -0,0 +1,9 @@
+#ifndef __MACH_UNCOMPRESS_H
+#define __MACH_UNCOMPRESS_H
+
+#define putc(c)
+#define flush()
+#define arch_decomp_setup()
+#define arch_decomp_wdog()
+
+#endif
diff --git a/arch/arm/mach-highbank/include/mach/vmalloc.h b/arch/arm/mach-highbank/include/mach/vmalloc.h
new file mode 100644
index 0000000..1a3e398
--- /dev/null
+++ b/arch/arm/mach-highbank/include/mach/vmalloc.h
@@ -0,0 +1,6 @@
+#ifndef __MACH_VMALLOC_H
+#define __MACH_VMALLOC_H
+
+#define VMALLOC_END 0xFEE00000UL
+
+#endif
diff --git a/arch/arm/mach-highbank/lluart.c b/arch/arm/mach-highbank/lluart.c
new file mode 100644
index 0000000..3715750
--- /dev/null
+++ b/arch/arm/mach-highbank/lluart.c
@@ -0,0 +1,34 @@
+/*
+ * 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 <asm/page.h>
+#include <asm/sizes.h>
+#include <asm/mach/map.h>
+
+#define HB_DEBUG_LL_PHYS_BASE 0xfff36000
+#define HB_DEBUG_LL_VIRT_BASE 0xfee36000
+
+static struct map_desc lluart_io_desc __initdata = {
+ .virtual = HB_DEBUG_LL_VIRT_BASE,
+ .pfn = __phys_to_pfn(HB_DEBUG_LL_PHYS_BASE),
+ .length = SZ_4K,
+ .type = MT_DEVICE,
+};
+
+void __init highbank_lluart_map_io(void)
+{
+ iotable_init(&lluart_io_desc, 1);
+}
diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h
new file mode 100644
index 0000000..0e91338
--- /dev/null
+++ b/arch/arm/mach-highbank/sysregs.h
@@ -0,0 +1,52 @@
+/*
+ * 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/>.
+ */
+#ifndef _MACH_HIGHBANK__SYSREGS_H_
+#define _MACH_HIGHBANK__SYSREGS_H_
+
+#include <linux/io.h>
+
+extern void __iomem *sregs_base;
+
+#define HB_SREG_A9_PWR_REQ 0xf00
+#define HB_SREG_A9_BOOT_STAT 0xf04
+#define HB_SREG_A9_BOOT_DATA 0xf08
+
+#define HB_PWR_SUSPEND 0
+#define HB_PWR_SOFT_RESET 1
+#define HB_PWR_HARD_RESET 2
+#define HB_PWR_SHUTDOWN 3
+
+static inline void hignbank_set_pwr_suspend(void)
+{
+ writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ);
+}
+
+static inline void hignbank_set_pwr_shutdown(void)
+{
+ writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ);
+}
+
+static inline void hignbank_set_pwr_soft_reset(void)
+{
+ writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+}
+
+static inline void hignbank_set_pwr_hard_reset(void)
+{
+ writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+}
+
+#endif
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c
new file mode 100644
index 0000000..53f0c4c
--- /dev/null
+++ b/arch/arm/mach-highbank/system.c
@@ -0,0 +1,33 @@
+/*
+ * 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/io.h>
+#include <asm/smp_scu.h>
+#include <asm/proc-fns.h>
+
+#include "core.h"
+#include "sysregs.h"
+
+void arch_reset(char mode, const char *cmd)
+{
+ if (mode == 'h')
+ hignbank_set_pwr_hard_reset();
+ else
+ hignbank_set_pwr_soft_reset();
+
+ scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+ cpu_do_idle();
+}
+
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 88633fe..7d5fff7 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -822,7 +822,7 @@ config CACHE_L2X0
REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
- ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
+ ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK
default y
select OUTER_CACHE
select OUTER_CACHE_SYNC
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 4/7] MAINTAINERS: add Calxeda Highbank ARM platform
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (2 preceding siblings ...)
2011-09-01 1:44 ` [PATCH v2 3/7] ARM: add Highbank core platform support Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 1:44 ` [PATCH v2 5/7] ARM: highbank: add SMP support Rob Herring
` (4 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Adding maintainer for arch/arm/mach-highbank/
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
MAINTAINERS | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a8cc60..6c036ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -688,6 +688,12 @@ F: drivers/mtd/nand/bcm_umi_nand.c
F: drivers/mtd/nand/bcm_umi_bch.c
F: drivers/mtd/nand/nand_bcm_umi.h
+ARM/CALXEDA HIGHBANK ARCHITECTURE
+M: Rob Herring <rob.herring@calxeda.com>
+L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-highbank/
+
ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
M: Anton Vorontsov <avorontsov@mvista.com>
S: Maintained
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 5/7] ARM: highbank: add SMP support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (3 preceding siblings ...)
2011-09-01 1:44 ` [PATCH v2 4/7] MAINTAINERS: add Calxeda Highbank ARM platform Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-06 1:01 ` Shawn Guo
2011-09-01 1:44 ` [PATCH v2 6/7] ARM: highbank: Add cpu hotplug support Rob Herring
` (3 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
This enables SMP support on highbank processor.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9019a56..6d2add5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
index 11d4010..311c0e8e 100644
--- a/arch/arm/mach-highbank/Makefile
+++ b/arch/arm/mach-highbank/Makefile
@@ -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
diff --git a/arch/arm/mach-highbank/localtimer.c b/arch/arm/mach-highbank/localtimer.c
new file mode 100644
index 0000000..344ea29
--- /dev/null
+++ b/arch/arm/mach-highbank/localtimer.c
@@ -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)
+{
+ struct device_node *np;
+
+ np = of_find_compatible_node(NULL, NULL, "arm,smp-twd");
+ if (!twd_base)
+ twd_base = of_iomap(np, 0);
+ evt->irq = irq_of_parse_and_map(np, 0);
+ twd_timer_setup(evt);
+ return 0;
+}
diff --git a/arch/arm/mach-highbank/platsmp.c b/arch/arm/mach-highbank/platsmp.c
new file mode 100644
index 0000000..d01364c
--- /dev/null
+++ b/arch/arm/mach-highbank/platsmp.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ * Based on platsmp.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/smp.h>
+#include <linux/io.h>
+
+#include <asm/smp_scu.h>
+#include <asm/hardware/gic.h>
+
+#include "core.h"
+
+extern void secondary_startup(void);
+
+void __cpuinit platform_secondary_init(unsigned int cpu)
+{
+ gic_secondary_init(0);
+}
+
+int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+ gic_raise_softirq(cpumask_of(cpu), 0);
+ return 0;
+}
+
+/*
+ * Initialise the CPU possible map early - this describes the CPUs
+ * which may be present or become present in the system.
+ */
+void __init smp_init_cpus(void)
+{
+ unsigned int i, ncores;
+
+ ncores = scu_get_core_count(scu_base_addr);
+
+ /* sanity check */
+ if (ncores > NR_CPUS) {
+ printk(KERN_WARNING
+ "highbank: no. of cores (%d) greater than configured "
+ "maximum of %d - clipping\n",
+ ncores, NR_CPUS);
+ ncores = NR_CPUS;
+ }
+
+ for (i = 0; i < ncores; i++)
+ set_cpu_possible(i, true);
+
+ set_smp_cross_call(gic_raise_softirq);
+}
+
+void __init platform_smp_prepare_cpus(unsigned int max_cpus)
+{
+ int i;
+
+ scu_enable(scu_base_addr);
+
+ /*
+ * Write the address of secondary startup into the jump table
+ * The cores are in wfi and wait until they receive a soft interrupt
+ * and a non-zero value to jump to. Then the secondary CPU branches
+ * to this address.
+ */
+ for (i = 1; i < max_cpus; i++)
+ highbank_set_cpu_jump(i, secondary_startup);
+}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 5/7] ARM: highbank: add SMP support
2011-09-01 1:44 ` [PATCH v2 5/7] ARM: highbank: add SMP support Rob Herring
@ 2011-09-06 1:01 ` Shawn Guo
2011-10-05 16:00 ` Rob Herring
0 siblings, 1 reply; 18+ messages in thread
From: Shawn Guo @ 2011-09-06 1:01 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 31, 2011 at 08:44:04PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> This enables SMP support on highbank processor.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> ---
> 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
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 9019a56..6d2add5 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -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
> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> index 11d4010..311c0e8e 100644
> --- a/arch/arm/mach-highbank/Makefile
> +++ b/arch/arm/mach-highbank/Makefile
> @@ -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
> diff --git a/arch/arm/mach-highbank/localtimer.c b/arch/arm/mach-highbank/localtimer.c
> new file mode 100644
> index 0000000..344ea29
> --- /dev/null
> +++ b/arch/arm/mach-highbank/localtimer.c
> @@ -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)
> +{
> + 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)?
Regards,
Shawn
> + evt->irq = irq_of_parse_and_map(np, 0);
> + twd_timer_setup(evt);
> + return 0;
> +}
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 5/7] ARM: highbank: add SMP support
2011-09-06 1:01 ` Shawn Guo
@ 2011-10-05 16:00 ` Rob Herring
2011-10-07 12:40 ` Shawn Guo
0 siblings, 1 reply; 18+ messages in thread
From: Rob Herring @ 2011-10-05 16:00 UTC (permalink / raw)
To: linux-arm-kernel
Shawn,
On 09/05/2011 08:01 PM, Shawn Guo wrote:
> On Wed, Aug 31, 2011 at 08:44:04PM -0500, Rob Herring wrote:
>> From: Rob Herring <rob.herring@calxeda.com>
>>
>> This enables SMP support on highbank processor.
>>
>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>> ---
>> 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
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index 9019a56..6d2add5 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -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
>> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
>> index 11d4010..311c0e8e 100644
>> --- a/arch/arm/mach-highbank/Makefile
>> +++ b/arch/arm/mach-highbank/Makefile
>> @@ -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
>> diff --git a/arch/arm/mach-highbank/localtimer.c b/arch/arm/mach-highbank/localtimer.c
>> new file mode 100644
>> index 0000000..344ea29
>> --- /dev/null
>> +++ b/arch/arm/mach-highbank/localtimer.c
>> @@ -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)
>> +{
>> + 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?
Rob
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 5/7] ARM: highbank: add SMP support
2011-10-05 16:00 ` Rob Herring
@ 2011-10-07 12:40 ` Shawn Guo
0 siblings, 0 replies; 18+ messages in thread
From: Shawn Guo @ 2011-10-07 12:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 05, 2011 at 11:00:16AM -0500, Rob Herring wrote:
> Shawn,
>
> On 09/05/2011 08:01 PM, Shawn Guo wrote:
> > On Wed, Aug 31, 2011 at 08:44:04PM -0500, Rob Herring wrote:
> >> From: Rob Herring <rob.herring@calxeda.com>
> >>
> >> This enables SMP support on highbank processor.
> >>
> >> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> >> ---
> >> 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
> >>
> >> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> >> index 9019a56..6d2add5 100644
> >> --- a/arch/arm/Kconfig
> >> +++ b/arch/arm/Kconfig
> >> @@ -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
> >> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> >> index 11d4010..311c0e8e 100644
> >> --- a/arch/arm/mach-highbank/Makefile
> >> +++ b/arch/arm/mach-highbank/Makefile
> >> @@ -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
> >> diff --git a/arch/arm/mach-highbank/localtimer.c b/arch/arm/mach-highbank/localtimer.c
> >> new file mode 100644
> >> index 0000000..344ea29
> >> --- /dev/null
> >> +++ b/arch/arm/mach-highbank/localtimer.c
> >> @@ -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)
> >> +{
> >> + 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?
>
Yes, if you'd like to ;)
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 6/7] ARM: highbank: Add cpu hotplug support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (4 preceding siblings ...)
2011-09-01 1:44 ` [PATCH v2 5/7] ARM: highbank: add SMP support Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 1:44 ` [PATCH v2 7/7] ARM: highbank: add suspend support Rob Herring
` (2 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Martin Bogomolni <martin@calxeda.com>
This adds cpu hotplug for highbank. On highbank, a core is always reset and
boots up the same path as a cold boot.
Signed-off-by: Martin Bogomolni <martin@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
Changes in v2:
- s/a9_base_addr/scu_base_addr/
arch/arm/mach-highbank/Makefile | 1 +
arch/arm/mach-highbank/hotplug.c | 56 ++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-highbank/hotplug.c
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
index 311c0e8e..df30b0d 100644
--- a/arch/arm/mach-highbank/Makefile
+++ b/arch/arm/mach-highbank/Makefile
@@ -2,3 +2,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
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
new file mode 100644
index 0000000..977cebb
--- /dev/null
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -0,0 +1,56 @@
+/*
+ * 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/kernel.h>
+#include <linux/errno.h>
+#include <linux/smp.h>
+
+#include <asm/smp_scu.h>
+#include <asm/cacheflush.h>
+
+#include "core.h"
+
+extern void secondary_startup(void);
+
+int platform_cpu_kill(unsigned int cpu)
+{
+ return 1;
+}
+
+/*
+ * platform-specific code to shutdown a CPU
+ *
+ */
+void platform_cpu_die(unsigned int cpu)
+{
+ flush_cache_all();
+
+ highbank_set_cpu_jump(cpu, secondary_startup);
+ scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+
+ cpu_do_idle();
+
+ /* We should never return from idle */
+ panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
+}
+
+int platform_cpu_disable(unsigned int cpu)
+{
+ /*
+ * CPU0 should not be shut down via hotplug. cpu_idle can WFI
+ * or a proper shutdown or hibernate should be used.
+ */
+ return cpu == 0 ? -EPERM : 0;
+}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 7/7] ARM: highbank: add suspend support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (5 preceding siblings ...)
2011-09-01 1:44 ` [PATCH v2 6/7] ARM: highbank: Add cpu hotplug support Rob Herring
@ 2011-09-01 1:44 ` Rob Herring
2011-09-01 12:22 ` Shawn Guo
2011-09-01 14:00 ` [PATCH v2 0/7] Initial Calxeda Highbank support Jamie Iles
2011-09-26 18:39 ` Rob Herring
8 siblings, 1 reply; 18+ messages in thread
From: Rob Herring @ 2011-09-01 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Add the platform suspend ops for highbank.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
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
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
index df30b0d..daeb3d8 100644
--- a/arch/arm/mach-highbank/Makefile
+++ b/arch/arm/mach-highbank/Makefile
@@ -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
diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
new file mode 100644
index 0000000..33b3beb
--- /dev/null
+++ b/arch/arm/mach-highbank/pm.c
@@ -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;
+}
+
+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);
+
+ 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);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 7/7] ARM: highbank: add suspend support
2011-09-01 1:44 ` [PATCH v2 7/7] ARM: highbank: add suspend support Rob Herring
@ 2011-09-01 12:22 ` Shawn Guo
2011-09-01 21:39 ` Rob Herring
0 siblings, 1 reply; 18+ messages in thread
From: Shawn Guo @ 2011-09-01 12:22 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 31, 2011 at 08:44:06PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> Add the platform suspend ops for highbank.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> ---
> 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
>
> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> index df30b0d..daeb3d8 100644
> --- a/arch/arm/mach-highbank/Makefile
> +++ b/arch/arm/mach-highbank/Makefile
> @@ -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
> diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
> new file mode 100644
> index 0000000..33b3beb
> --- /dev/null
> +++ b/arch/arm/mach-highbank/pm.c
> @@ -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;
> +}
> +
> +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?
Regards,
Shawn
> + 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);
> --
> 1.7.4.1
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 7/7] ARM: highbank: add suspend support
2011-09-01 12:22 ` Shawn Guo
@ 2011-09-01 21:39 ` Rob Herring
0 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2011-09-01 21:39 UTC (permalink / raw)
To: linux-arm-kernel
Shawn,
On 09/01/2011 07:22 AM, Shawn Guo wrote:
> On Wed, Aug 31, 2011 at 08:44:06PM -0500, Rob Herring wrote:
>> From: Rob Herring <rob.herring@calxeda.com>
>>
>> Add the platform suspend ops for highbank.
>>
>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>> ---
>> 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
>>
>> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
>> index df30b0d..daeb3d8 100644
>> --- a/arch/arm/mach-highbank/Makefile
>> +++ b/arch/arm/mach-highbank/Makefile
>> @@ -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
>> diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
>> new file mode 100644
>> index 0000000..33b3beb
>> --- /dev/null
>> +++ b/arch/arm/mach-highbank/pm.c
>> @@ -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;
>> +}
>> +
>> +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?
>
They are not powergated yet, so it's really just wfi ATM. The L2 and SCU
will be re-initialized by boot code. The GIC will need some save and
restore.
Rob
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 0/7] Initial Calxeda Highbank support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (6 preceding siblings ...)
2011-09-01 1:44 ` [PATCH v2 7/7] ARM: highbank: add suspend support Rob Herring
@ 2011-09-01 14:00 ` Jamie Iles
2011-09-26 18:39 ` Rob Herring
8 siblings, 0 replies; 18+ messages in thread
From: Jamie Iles @ 2011-09-01 14:00 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 31, 2011 at 08:43:59PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> 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
Nice series!
Reviewed-by: Jamie Iles <jamie@jamieiles.com>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 0/7] Initial Calxeda Highbank support
2011-09-01 1:43 [PATCH v2 0/7] Initial Calxeda Highbank support Rob Herring
` (7 preceding siblings ...)
2011-09-01 14:00 ` [PATCH v2 0/7] Initial Calxeda Highbank support Jamie Iles
@ 2011-09-26 18:39 ` Rob Herring
2011-09-30 20:31 ` Arnd Bergmann
8 siblings, 1 reply; 18+ messages in thread
From: Rob Herring @ 2011-09-26 18:39 UTC (permalink / raw)
To: linux-arm-kernel
Arnd,
On 08/31/2011 08:43 PM, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> 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.
Rob
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 0/7] Initial Calxeda Highbank support
2011-09-26 18:39 ` Rob Herring
@ 2011-09-30 20:31 ` Arnd Bergmann
0 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2011-09-30 20:31 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 26 September 2011, Rob Herring wrote:
> 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.
Looks all good as far as I can tell. Please send the pull requests.
Arnd
^ permalink raw reply [flat|nested] 18+ messages in thread