* [PATCH v2] bring up pxa988 with DT @ 2013-05-31 2:58 Neil Zhang 2013-05-31 2:58 ` [PATCH v2] ARM: mmp: bring up pxa988 with device tree support Neil Zhang 0 siblings, 1 reply; 13+ messages in thread From: Neil Zhang @ 2013-05-31 2:58 UTC (permalink / raw) To: linux-arm-kernel This patch is supposed to bring up pxa988 SMP. will change to use CLOCKSOURCE later. ChangeLog V2: 1. use early_init call for handler init. 2. Add sanity check for maximum core count. Neil Zhang (1): ARM: mmp: bring up pxa988 with device tree support arch/arm/boot/dts/pxa988-dkb.dts | 36 ++++++ arch/arm/boot/dts/pxa988.dtsi | 189 +++++++++++++++++++++++++++++ arch/arm/mach-mmp/Kconfig | 27 ++++ arch/arm/mach-mmp/Makefile | 2 + arch/arm/mach-mmp/common.c | 11 ++- arch/arm/mach-mmp/common.h | 2 + arch/arm/mach-mmp/headsmp.S | 104 ++++++++++++++++ arch/arm/mach-mmp/include/mach/addr-map.h | 6 + arch/arm/mach-mmp/mmpx-dt.c | 74 +++++++++++ arch/arm/mach-mmp/platsmp.c | 167 +++++++++++++++++++++++++ arch/arm/mach-mmp/reset.c | 68 ++++++++++ arch/arm/mach-mmp/reset.h | 28 +++++ drivers/clk/mmp/Makefile | 1 + 13 files changed, 714 insertions(+), 1 deletions(-) create mode 100644 arch/arm/boot/dts/pxa988-dkb.dts create mode 100644 arch/arm/boot/dts/pxa988.dtsi create mode 100644 arch/arm/mach-mmp/headsmp.S create mode 100644 arch/arm/mach-mmp/mmpx-dt.c create mode 100644 arch/arm/mach-mmp/platsmp.c create mode 100644 arch/arm/mach-mmp/reset.c create mode 100644 arch/arm/mach-mmp/reset.h -- 1.7.4.1 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-05-31 2:58 [PATCH v2] bring up pxa988 with DT Neil Zhang @ 2013-05-31 2:58 ` Neil Zhang 2013-05-31 11:24 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Neil Zhang @ 2013-05-31 2:58 UTC (permalink / raw) To: linux-arm-kernel bring up pxa988 with device tree support. Change-Id: I6fc869b7d5ff8dc6e4eb0042a89429200f7a9fb1 Signed-off-by: Neil Zhang <zhangwm@marvell.com> --- arch/arm/boot/dts/pxa988-dkb.dts | 36 ++++++ arch/arm/boot/dts/pxa988.dtsi | 189 +++++++++++++++++++++++++++++ arch/arm/mach-mmp/Kconfig | 27 ++++ arch/arm/mach-mmp/Makefile | 2 + arch/arm/mach-mmp/common.c | 11 ++- arch/arm/mach-mmp/common.h | 2 + arch/arm/mach-mmp/headsmp.S | 104 ++++++++++++++++ arch/arm/mach-mmp/include/mach/addr-map.h | 6 + arch/arm/mach-mmp/mmpx-dt.c | 74 +++++++++++ arch/arm/mach-mmp/platsmp.c | 167 +++++++++++++++++++++++++ arch/arm/mach-mmp/reset.c | 68 ++++++++++ arch/arm/mach-mmp/reset.h | 28 +++++ drivers/clk/mmp/Makefile | 1 + 13 files changed, 714 insertions(+), 1 deletions(-) create mode 100644 arch/arm/boot/dts/pxa988-dkb.dts create mode 100644 arch/arm/boot/dts/pxa988.dtsi create mode 100644 arch/arm/mach-mmp/headsmp.S create mode 100644 arch/arm/mach-mmp/mmpx-dt.c create mode 100644 arch/arm/mach-mmp/platsmp.c create mode 100644 arch/arm/mach-mmp/reset.c create mode 100644 arch/arm/mach-mmp/reset.h diff --git a/arch/arm/boot/dts/pxa988-dkb.dts b/arch/arm/boot/dts/pxa988-dkb.dts new file mode 100644 index 0000000..2cee3ed --- /dev/null +++ b/arch/arm/boot/dts/pxa988-dkb.dts @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2012 Marvell Technology Group Ltd. + * Author: Haojian Zhuang <haojian.zhuang@marvell.com> + * + * 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 + * publishhed by the Free Software Foundation. + */ + +/dts-v1/; +/include/ "pxa988.dtsi" + +/ { + model = "Marvell PXA988 DKB Development Board"; + compatible = "mrvl,pxa988-dkb", "mrvl,pxa988"; + + chosen { + bootargs = "console=ttyS0,115200 root=/dev/nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; + }; + + memory { + reg = <0x00000000 0x10000000>; + }; + + soc { + apb at d4000000 { + uart1: uart at d4017000 { + status = "okay"; + }; + + rtc: rtc at d4010000 { + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/pxa988.dtsi b/arch/arm/boot/dts/pxa988.dtsi new file mode 100644 index 0000000..567d33d --- /dev/null +++ b/arch/arm/boot/dts/pxa988.dtsi @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2013 Marvell Technology Group Ltd. + * Author: Chao Xie <chao.xie@marvell.com> + * + * 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 + * publishhed by the Free Software Foundation. + */ + +/include/ "skeleton.dtsi" + +/ { + interrupt-parent = <&gic>; + + aliases { + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + i2c0 = &twsi1; + i2c1 = &twsi2; + }; + + cpus { + cpu at 0 { + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + }; + cpu at 1 { + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + }; + }; + + gic: interrupt-controller at d1dfe100 { + compatible = "arm,cortex-a9-gic"; + interrupt-controller; + #interrupt-cells = <3>; + reg = <0xd1dff000 0x1000>, + <0xd1dfe100 0x0100>; + }; + + L2: l2-cache-controller at d1dfb000 { + compatible = "arm,pl310-cache"; + reg = <0xd1dfb000 0x1000>; + arm,data-latency = <2 1 1>; + arm,tag-latency = <2 1 1>; + arm,pwr-dynamic-clk-gating; + arm,pwr-standby-mode; + cache-unified; + cache-level = <2>; + }; + + local-timer at d1dfe600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0xd1dfe600 0x20>; + interrupts = <1 13 0x304>; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges; + + axi at d4200000 { /* AXI */ + compatible = "mrvl,axi-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0xd4200000 0x00200000>; + ranges; + + intc: wakeupgen at d4282000 { + compatible = "mrvl,mmp-intc"; + reg = <0xd4282000 0x1000>; + mrvl,intc-wakeup = <0x114 0x3 + 0x144 0x3>; + }; + + }; + + apb at d4000000 { /* APB */ + compatible = "mrvl,apb-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0xd4000000 0x00200000>; + ranges; + + timer0: timer at d4014000 { + compatible = "mrvl,mmp-timer"; + reg = <0xd4014000 0x100>; + interrupts = <0 13 0x4>; + }; + + uart1: uart at d4017000 { + compatible = "mrvl,mmp-uart"; + reg = <0xd4017000 0x1000>; + interrupts = <0 27 0x4>; + status = "disabled"; + }; + + uart2: uart at d4018000 { + compatible = "mrvl,mmp-uart"; + reg = <0xd4018000 0x1000>; + interrupts = <0 28 0x4>; + status = "disabled"; + }; + + uart3: uart at d4036000 { + compatible = "mrvl,mmp-uart"; + reg = <0xd4036000 0x1000>; + interrupts = <0 59 0x4>; + status = "disabled"; + }; + + gpio at d4019000 { + compatible = "marvell,mmp-gpio"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0xd4019000 0x1000>; + gpio-controller; + #gpio-cells = <2>; + interrupts = <49>; + interrupt-names = "gpio_mux"; + interrupt-controller; + #interrupt-cells = <1>; + ranges; + + gcb0: gpio at d4019000 { + reg = <0xd4019000 0x4>; + }; + + gcb1: gpio at d4019004 { + reg = <0xd4019004 0x4>; + }; + + gcb2: gpio at d4019008 { + reg = <0xd4019008 0x4>; + }; + + gcb3: gpio at d4019100 { + reg = <0xd4019100 0x4>; + }; + }; + + twsi1: i2c at d4011000 { + compatible = "mrvl,mmp-twsi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xd4011000 0x1000>; + interrupts = <0 7 0x4>; + mrvl,i2c-fast-mode; + status = "disabled"; + }; + + twsi2: i2c at d4037000 { + compatible = "mrvl,mmp-twsi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xd4037000 0x1000>; + interrupts = <0 54 0x4>; + status = "disabled"; + }; + + rtc: rtc at d4010000 { + compatible = "mrvl,mmp-rtc"; + reg = <0xd4010000 0x1000>; + interrupts = <0 5 0x4>,<0 6 0x4>; + interrupt-names = "rtc 1Hz", "rtc alarm"; + status = "disabled"; + }; + pmx: pinmux at d401e000 { + compatible = "pinconf-single"; + reg = <0xd401e000 0x330>; + #address-cells = <1>; + #size-cells = <1>; + #gpio-range-cells = <3>; + ranges; + + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <7>; + + range: gpio-range { + #pinctrl-single,gpio-range-cells = <3>; + }; + }; + }; + }; +}; diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index ebdda83..0955191 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -107,6 +107,16 @@ config MACH_MMP2_DT Include support for Marvell MMP2 based platforms using the device tree. +config MACH_MMPX_DT + bool "Support no-PJ/PJ4(ARMv7) platforms from device tree" + depends on !CPU_MOHAWK && !CPU_PJ4 + select CPU_PXA988 + select USE_OF + select PINCTRL + select PINCTRL_SINGLE + help + Include support for Marvell MMP2 based platforms using + the device tree. endmenu config CPU_PXA168 @@ -123,6 +133,23 @@ config CPU_PXA910 help Select code specific to PXA910 +config CPU_PXA988 + bool + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select HAVE_ARM_SCU + select LOCAL_TIMERS + select HAVE_ARM_TWD + select COMMON_CLK + select CLKSRC_OF + select MIGHT_HAVE_CACHE_L2X0 + help + Say 'Y' here if you want to support the Marvell pxa988-base + platforms. + PXA988 is an SoC with dual-core Cotex-A9 and comunication + processor, code name "Emei". + config CPU_MMP2 bool select COMMON_CLK diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 095c155..e572786 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -8,6 +8,7 @@ obj-y += common.o devices.o time.o irq.o obj-$(CONFIG_CPU_PXA168) += pxa168.o obj-$(CONFIG_CPU_PXA910) += pxa910.o obj-$(CONFIG_CPU_MMP2) += mmp2.o sram.o +obj-$(CONFIG_CPU_PXA988) += platsmp.o headsmp.o reset.o ifeq ($(CONFIG_COMMON_CLK), ) obj-y += clock.o @@ -31,5 +32,6 @@ obj-$(CONFIG_MACH_FLINT) += flint.o obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o obj-$(CONFIG_MACH_MMP_DT) += mmp-dt.o obj-$(CONFIG_MACH_MMP2_DT) += mmp2-dt.o +obj-$(CONFIG_MACH_MMPX_DT) += mmpx-dt.o obj-$(CONFIG_MACH_TETON_BGA) += teton_bga.o obj-$(CONFIG_MACH_GPLUGD) += gplugd.o diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c index 9292b79..0c621bc 100644 --- a/arch/arm/mach-mmp/common.c +++ b/arch/arm/mach-mmp/common.c @@ -11,6 +11,10 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> +#include <linux/io.h> +#include <linux/ioport.h> +#include <linux/of_address.h> #include <asm/page.h> #include <asm/mach/map.h> @@ -36,7 +40,12 @@ static struct map_desc standard_io_desc[] __initdata = { .virtual = (unsigned long)AXI_VIRT_BASE, .length = AXI_PHYS_SIZE, .type = MT_DEVICE, - }, + }, { + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, + .length = MMP_CORE_PERIPH_PHYS_SIZE, + .type = MT_DEVICE, + } }; void __init mmp_map_io(void) diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index 0bdc50b..ea0225f 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -1,5 +1,7 @@ #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) +extern struct smp_operations mmp_smp_ops; + extern void timer_init(int irq); extern void __init icu_init_irq(void); diff --git a/arch/arm/mach-mmp/headsmp.S b/arch/arm/mach-mmp/headsmp.S new file mode 100644 index 0000000..2b6177e --- /dev/null +++ b/arch/arm/mach-mmp/headsmp.S @@ -0,0 +1,104 @@ +/* + * linux/arch/arm/mach-mmp/headsmp.S + * + * Copyright (C) 2012 Marvell, Inc. + * + * Author: Neil Zhang <zhangwm@marvell.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#include <linux/linkage.h> +#include <linux/init.h> +#include <asm/memory.h> +#include <asm/cache.h> +#include <asm/assembler.h> +#include <mach/addr-map.h> + + __CPUINIT + +/* + * Marvell specific entry point for secondary CPUs. + * The secondary kernel init calls v7_flush_dcache_all before it enables + * the L1; however, the L1 comes out of reset in an undefined state, so + * the clean + invalidate performed by v7_flush_dcache_all causes a bunch + * of cache lines with uninitialized data and uninitialized tags to get + * written out to memory, which does really unpleasant things to the main + * processor. We fix this by performing an invalidate, rather than a + * clean + invalidate for secondary core, before jumping into the kernel. + * + * This funciton is cloned from arch/arm/mach-tegra/headsmp.S, and needs + * to be called for both secondary cores startup and primary core resume + * procedures. + */ + .align L1_CACHE_SHIFT + + +/* + * PXA specific entry point for secondary CPUs. This provides + * a "holding pen" into which all secondary cores are held until we're + * ready for them to initialise. + */ +ENTRY(mmp_secondary_startup) + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 +pen: ldr r7, [r6] + cmp r7, r0 + bne pen + + /* + * we've been released from the holding pen: secondary_stack + * should now contain the SVC stack for this core + */ + bl v7_invalidate_l1 + b secondary_startup +ENDPROC(mmp_secondary_startup) + + .align 2 +1: .long . + .long pen_release + + +/* + * Note: The following code is located into the .data section. This is to + * allow sw_reset_flag and cpu_plugin_handler to be accessed with a + * relative load while we can't rely on any MMU translation. + * Reference from: arch/arm/kernel/sleep.S + */ + + .data + .align + +/* + * ROM code jumps to this function while waking up from CPU + * OFF or software reset state. Physical address of the function is + * stored at CA9_WARM_RESET_VECTOR while system is bring up. + */ +ENTRY(mmp_cpu_reset_entry) + adr r1, mmp_entry_vectors + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 @ fetch CPUID +1: + ldr r2, [r1, r0, lsl #2] @ get the handler addr for this core + cmp r2, #0 + movne pc, r2 @ jump to the handler + beq 1b +ENDPROC(mmp_cpu_reset_entry) + + /* Point to the address that save handlers for each core */ + .global mmp_entry_vectors +mmp_entry_vectors: + .rept CONFIG_NR_CPUS + .long 0 @ preserve stack phys ptr here + .endr diff --git a/arch/arm/mach-mmp/include/mach/addr-map.h b/arch/arm/mach-mmp/include/mach/addr-map.h index f88a44c..092005b 100644 --- a/arch/arm/mach-mmp/include/mach/addr-map.h +++ b/arch/arm/mach-mmp/include/mach/addr-map.h @@ -25,6 +25,10 @@ #define AXI_VIRT_BASE IOMEM(0xfe200000) #define AXI_PHYS_SIZE 0x00200000 +#define MMP_CORE_PERIPH_PHYS_BASE 0xd1dfe000 +#define MMP_CORE_PERIPH_VIRT_BASE IOMEM(0xfe400000) +#define MMP_CORE_PERIPH_PHYS_SIZE 0x00002000 + /* Static Memory Controller - Chip Select 0 and 1 */ #define SMC_CS0_PHYS_BASE 0x80000000 #define SMC_CS0_PHYS_SIZE 0x10000000 @@ -43,4 +47,6 @@ #define CIU_VIRT_BASE (AXI_VIRT_BASE + 0x82c00) #define CIU_REG(x) (CIU_VIRT_BASE + (x)) +#define SCU_VIRT_BASE (MMP_CORE_PERIPH_VIRT_BASE) + #endif /* __ASM_MACH_ADDR_MAP_H */ diff --git a/arch/arm/mach-mmp/mmpx-dt.c b/arch/arm/mach-mmp/mmpx-dt.c new file mode 100644 index 0000000..2ebd057 --- /dev/null +++ b/arch/arm/mach-mmp/mmpx-dt.c @@ -0,0 +1,74 @@ +/* + * linux/arch/arm/mach-mmp/mmpx-dt.c + * + * Copyright (C) 2012 Marvell Technology Group Ltd. + * Author: Haojian Zhuang <haojian.zhuang@marvell.com> + * + * 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 + * publishhed by the Free Software Foundation. + */ + +#include <linux/clocksource.h> +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/irqdomain.h> +#include <linux/irqchip.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <asm/smp_twd.h> +#include <asm/hardware/cache-l2x0.h> +#include <asm/mach/arch.h> +#include <asm/mach/time.h> +#include <mach/irqs.h> +#include <mach/regs-apbc.h> + +#include "common.h" + +/* PXA988 */ +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst = { + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL), + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL), + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL), + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL), + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL), + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), + {} +}; + +void __init pxa988_dt_init_timer(void) +{ + extern void __init mmp_dt_init_timer(void); + /* + * Is is a SOC timer, and will be used for broadcasting + * when local timers are disabled. + */ + mmp_dt_init_timer(); + + clocksource_of_init(); +} + +static void __init pxa988_dt_init_machine(void) +{ + l2x0_of_init(0x30800000, 0xFE7FFFFF); + + pxa910_clk_init(); + + of_platform_populate(NULL, of_default_bus_match_table, + pxa988_auxdata_lookup, NULL); +} + +static const char *pxa988_dt_board_compat[] __initdata = { + "mrvl,pxa988-dkb", + NULL, +}; + +DT_MACHINE_START(PXA988_DT, "Marvell PXA988 (Device Tree Support)") + .smp = smp_ops(mmp_smp_ops), + .map_io = mmp_map_io, + .init_irq = irqchip_init, + .init_time = pxa988_dt_init_timer, + .init_machine = pxa988_dt_init_machine, + .dt_compat = pxa988_dt_board_compat, +MACHINE_END diff --git a/arch/arm/mach-mmp/platsmp.c b/arch/arm/mach-mmp/platsmp.c new file mode 100644 index 0000000..f341a67 --- /dev/null +++ b/arch/arm/mach-mmp/platsmp.c @@ -0,0 +1,167 @@ +/* + * linux/arch/arm/mach-mmp/platsmp.c + * + * Copyright (C) 2002 ARM Ltd. + * All Rights Reserved + * + * 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. + */ +#include <linux/init.h> +#include <linux/errno.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/jiffies.h> +#include <linux/smp.h> +#include <linux/io.h> +#include <linux/irq.h> + +#include <asm/cacheflush.h> +#include <mach/hardware.h> +#include <linux/irqchip/arm-gic.h> +#include <asm/mach-types.h> +#include <asm/localtimer.h> +#include <asm/smp_scu.h> + +#include <mach/irqs.h> +#include <mach/addr-map.h> + +#include "common.h" +#include "reset.h" + +/* + * Write pen_release in a way that is guaranteed to be visible to all + * observers, irrespective of whether they're taking part in coherency + * or not. This is necessary for the hotplug code to work reliably. + */ +static void __cpuinit write_pen_release(int val) +{ + pen_release = val; + smp_wmb(); + __cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release)); + outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1)); +} + +#ifdef CONFIG_HAVE_ARM_SCU +static void __iomem *scu_get_base_addr(void) +{ + return SCU_VIRT_BASE; +} +#endif + +static inline unsigned int get_core_count(void) +{ + u32 ret = 1; +#ifdef CONFIG_HAVE_ARM_SCU + ret = scu_get_core_count(scu_get_base_addr()); +#endif + + return ret; +} + +static DEFINE_SPINLOCK(boot_lock); + +static void __cpuinit mmp_secondary_init(unsigned int cpu) +{ + /* + * let the primary processor know we're out of the + * pen, then head off into the C entry point + */ + write_pen_release(-1); + + /* + * Synchronise with the boot thread. + */ + spin_lock(&boot_lock); + spin_unlock(&boot_lock); +} + +static int __cpuinit mmp_boot_secondary(unsigned int cpu, struct task_struct *idle) +{ + unsigned long timeout; + + /* + * Avoid timer calibration on slave cpus. Use the value calibrated + * on master cpu. Referenced from tegra3 + */ + preset_lpj = loops_per_jiffy; + + /* + * set synchronisation state between this boot processor + * and the secondary one + */ + + spin_lock(&boot_lock); + + /* + * The secondary processor is waiting to be released from + * the holding pen - release it, then wait for it to flag + * that it has been released by resetting pen_release. + * + * Note that "pen_release" is the hardware CPU ID, whereas + * "cpu" is Linux's internal ID. + */ + write_pen_release(cpu); + + /* reset the cpu, let it branch to the kernel entry */ + mmp_cpu_power_up(cpu); + + timeout = jiffies + (1 * HZ); + while (time_before(jiffies, timeout)) { + smp_rmb(); + if (pen_release == -1) + break; + + udelay(10); + } + + /* + * now the secondary core is starting up let it run its + * calibrations, then wait for it to finish + */ + spin_unlock(&boot_lock); + + return pen_release != -1 ? -ENOSYS : 0; +} + +/* + * Initialise the CPU possible map early - this describes the CPUs + * which may be present or become present in the system. + */ +static void __init mmp_smp_init_cpus(void) +{ + unsigned int i, ncores = get_core_count(); + + if (ncores > nr_cpu_ids) { + pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; + } + + for (i = 0; i < ncores; i++) + set_cpu_possible(i, true); +} + +static void __init mmp_smp_prepare_cpus(unsigned int max_cpus) +{ + int i; + + /* + * Initialise the present map, which describes the set of CPUs + * actually populated at the present time. + */ + for (i = 0; i < max_cpus; i++) + set_cpu_present(i, true); + +#ifdef CONFIG_HAVE_ARM_SCU + scu_enable(scu_get_base_addr()); +#endif +} + +struct smp_operations mmp_smp_ops __initdata = { + .smp_init_cpus = mmp_smp_init_cpus, + .smp_prepare_cpus = mmp_smp_prepare_cpus, + .smp_secondary_init = mmp_secondary_init, + .smp_boot_secondary = mmp_boot_secondary, +}; diff --git a/arch/arm/mach-mmp/reset.c b/arch/arm/mach-mmp/reset.c new file mode 100644 index 0000000..5eab6cf --- /dev/null +++ b/arch/arm/mach-mmp/reset.c @@ -0,0 +1,68 @@ +/* + * linux/arch/arm/mach-mmp/reset.c + * + * Author: Neil Zhang <zhangwm@marvell.com> + * Copyright: (C) 2012 Marvell International Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/kernel.h> +#include <linux/smp.h> + +#include <asm/io.h> +#include <asm/cacheflush.h> +#include <asm/mach/map.h> + +#include <mach/addr-map.h> + +#include "reset.h" + +#define PMU_CC2_AP APMU_REG(0x0100) +#define CIU_CA9_WARM_RESET_VECTOR CIU_REG(0x00d8) + +/* + * This function is called from boot_secondary to bootup the secondary cpu. + */ +void mmp_cpu_power_up(u32 cpu) +{ + u32 tmp; + + BUG_ON(cpu == 0); + + tmp = readl(PMU_CC2_AP); + if (tmp & CPU_CORE_RST(cpu)) { + /* Release secondary core from reset */ + tmp &= ~(CPU_CORE_RST(cpu) + | CPU_DBG_RST(cpu) | CPU_WDOG_RST(cpu)); + writel(tmp, PMU_CC2_AP); + } +} + +void mmp_set_entry_vector(u32 cpu, u32 addr) +{ + BUG_ON(cpu >= CONFIG_NR_CPUS); + + mmp_entry_vectors[cpu] = addr; + smp_wmb(); + __cpuc_flush_dcache_area((void *)&mmp_entry_vectors[cpu], + sizeof(mmp_entry_vectors[cpu])); + outer_clean_range(__pa(&mmp_entry_vectors[cpu]), + __pa(&mmp_entry_vectors[cpu + 1])); +} + +static int __init mmp_entry_vector_init(void) +{ + int cpu; + + /* We will reset from DDR directly by default */ + writel(__pa(mmp_cpu_reset_entry), CIU_CA9_WARM_RESET_VECTOR); + + for (cpu = 1; cpu < CONFIG_NR_CPUS; cpu++) + mmp_set_entry_vector(cpu, __pa(mmp_secondary_startup)); +} + +early_initcall(mmp_entry_vector_init); diff --git a/arch/arm/mach-mmp/reset.h b/arch/arm/mach-mmp/reset.h new file mode 100644 index 0000000..5c88c1a --- /dev/null +++ b/arch/arm/mach-mmp/reset.h @@ -0,0 +1,28 @@ +/* + * linux/arch/arm/mach-mmp/include/mach/reset.h + * + * Author: Neil Zhang <zhangwm@marvell.com> + * Copyright: (C) 2012 Marvell International Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef __RESET_PXA988_H__ +#define __RESET_PXA988_H__ + +#define CPU_CORE_RST(n) (1 << ((n) * 4 + 16)) +#define CPU_DBG_RST(n) (1 << ((n) * 4 + 18)) +#define CPU_WDOG_RST(n) (1 << ((n) * 4 + 19)) + +extern u32 mmp_entry_vectors[CONFIG_NR_CPUS]; + +void mmp_secondary_startup(void); +void mmp_cpu_reset_entry(void); + +void mmp_cpu_power_up(u32 cpu); +void mmp_set_entry_vector(u32 cpu, u32 addr); + +#endif /* __RESET_PXA988_H__ */ diff --git a/drivers/clk/mmp/Makefile b/drivers/clk/mmp/Makefile index 392d780..59a3f9f7 100644 --- a/drivers/clk/mmp/Makefile +++ b/drivers/clk/mmp/Makefile @@ -7,3 +7,4 @@ obj-y += clk-apbc.o clk-apmu.o clk-frac.o obj-$(CONFIG_CPU_PXA168) += clk-pxa168.o obj-$(CONFIG_CPU_PXA910) += clk-pxa910.o obj-$(CONFIG_CPU_MMP2) += clk-mmp2.o +obj-$(CONFIG_CPU_PXA988) += clk-pxa910.o -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-05-31 2:58 ` [PATCH v2] ARM: mmp: bring up pxa988 with device tree support Neil Zhang @ 2013-05-31 11:24 ` Arnd Bergmann 2013-06-06 2:48 ` Neil Zhang 0 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2013-05-31 11:24 UTC (permalink / raw) To: linux-arm-kernel On Friday 31 May 2013 10:58:35 Neil Zhang wrote: > bring up pxa988 with device tree support. > > Change-Id: I6fc869b7d5ff8dc6e4eb0042a89429200f7a9fb1 Please don't post silly extra headers like that. > Signed-off-by: Neil Zhang <zhangwm@marvell.com> A couple of comments on the DT structure: > + gic: interrupt-controller at d1dfe100 { > + compatible = "arm,cortex-a9-gic"; > + interrupt-controller; > + #interrupt-cells = <3>; > + reg = <0xd1dff000 0x1000>, > + <0xd1dfe100 0x0100>; > + }; > + > + L2: l2-cache-controller at d1dfb000 { > + compatible = "arm,pl310-cache"; > + reg = <0xd1dfb000 0x1000>; > + arm,data-latency = <2 1 1>; > + arm,tag-latency = <2 1 1>; > + arm,pwr-dynamic-clk-gating; > + arm,pwr-standby-mode; > + cache-unified; > + cache-level = <2>; > + }; > + > + local-timer at d1dfe600 { > + compatible = "arm,cortex-a9-twd-timer"; > + reg = <0xd1dfe600 0x20>; > + interrupts = <1 13 0x304>; > + }; Why are these all top-level devices, rather than part of the 'soc' node? > + soc { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "simple-bus"; > + interrupt-parent = <&gic>; > + ranges; > + > + axi at d4200000 { /* AXI */ > + compatible = "mrvl,axi-bus", "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0xd4200000 0x00200000>; > + ranges; > + > + intc: wakeupgen at d4282000 { > + compatible = "mrvl,mmp-intc"; > + reg = <0xd4282000 0x1000>; > + mrvl,intc-wakeup = <0x114 0x3 > + 0x144 0x3>; > + }; > + > + }; What is a 'mrvl,axi-bus'? Is that different from ARM's AXI bus? The documented vendor prefix for Marvell is 'marvell', not 'mrvl', please be consistent with that. What is the purpose of the 'reg' property in the axi bus? I notice that it overlaps with its own children, wich seens very strange. Maybe you meant this: axi { ranges = <0xd4200000 0xd4200000 0x00200000>; ... }; > + apb at d4000000 { /* APB */ > + compatible = "mrvl,apb-bus", "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0xd4000000 0x00200000>; > + ranges; Same comments apply here. > diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig > index ebdda83..0955191 100644 > --- a/arch/arm/mach-mmp/Kconfig > +++ b/arch/arm/mach-mmp/Kconfig > @@ -107,6 +107,16 @@ config MACH_MMP2_DT > Include support for Marvell MMP2 based platforms using > the device tree. > > +config MACH_MMPX_DT > + bool "Support no-PJ/PJ4(ARMv7) platforms from device tree" > + depends on !CPU_MOHAWK && !CPU_PJ4 > + select CPU_PXA988 > + select USE_OF > + select PINCTRL > + select PINCTRL_SINGLE Why would this be mutually exclusive with PJ4? Cortex-A9 and PJ4 are both ARMv7 based, so we should be able to have them in the same kernel. > + help > + Include support for Marvell MMP2 based platforms using > + the device tree. > endmenu You should probably change the help texts to say different things here, e.g. list the models supported under these. > diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c > index 9292b79..0c621bc 100644 > --- a/arch/arm/mach-mmp/common.c > +++ b/arch/arm/mach-mmp/common.c > @@ -11,6 +11,10 @@ > #include <linux/init.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/of.h> > +#include <linux/io.h> > +#include <linux/ioport.h> > +#include <linux/of_address.h> > > #include <asm/page.h> > #include <asm/mach/map.h> > @@ -36,7 +40,12 @@ static struct map_desc standard_io_desc[] __initdata = { > .virtual = (unsigned long)AXI_VIRT_BASE, > .length = AXI_PHYS_SIZE, > .type = MT_DEVICE, > - }, > + }, { > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, > + .length = MMP_CORE_PERIPH_PHYS_SIZE, > + .type = MT_DEVICE, > + } > }; > > void __init mmp_map_io(void) What is this needed for? > +/* PXA988 */ > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst = { > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), > + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > + {} > +}; Why do you need auxdata? > +void __init pxa988_dt_init_timer(void) > +{ > + extern void __init mmp_dt_init_timer(void); You should never put 'extern' declarations into a .c file. > + /* > + * Is is a SOC timer, and will be used for broadcasting > + * when local timers are disabled. > + */ > + mmp_dt_init_timer(); > + > + clocksource_of_init(); > +} Please just change the mmp_dt_init_timer function to use CLOCKSOURCE_OF_DECLARE(), and if possible move the file to drivers/clocksource. > +static const char *pxa988_dt_board_compat[] __initdata = { > + "mrvl,pxa988-dkb", > + NULL, > +}; > + > +DT_MACHINE_START(PXA988_DT, "Marvell PXA988 (Device Tree Support)") > + .smp = smp_ops(mmp_smp_ops), > + .map_io = mmp_map_io, > + .init_irq = irqchip_init, You can leave out the init_irq, it's implicit. > + .init_time = pxa988_dt_init_timer, > + .init_machine = pxa988_dt_init_machine, > + .dt_compat = pxa988_dt_board_compat, > +MACHINE_END > + > +static int __init mmp_entry_vector_init(void) > +{ > + int cpu; > + > + /* We will reset from DDR directly by default */ > + writel(__pa(mmp_cpu_reset_entry), CIU_CA9_WARM_RESET_VECTOR); > + > + for (cpu = 1; cpu < CONFIG_NR_CPUS; cpu++) > + mmp_set_entry_vector(cpu, __pa(mmp_secondary_startup)); > +} > + > +early_initcall(mmp_entry_vector_init); You need to check which machine you are running on here. Best just move the call into one of the init functions of the machine descriptor, e.g. init_machine or init_late. CONFIG_NR_CPUS is probably the wrong constant to use here, it does not have to match the physically present CPU cores. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-05-31 11:24 ` Arnd Bergmann @ 2013-06-06 2:48 ` Neil Zhang 2013-06-06 16:26 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Neil Zhang @ 2013-06-06 2:48 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd, > -----Original Message----- > From: Arnd Bergmann [mailto:arnd at arndb.de] > Sent: 2013?5?31? 19:25 > To: linux-arm-kernel at lists.infradead.org > Cc: Neil Zhang; haojian.zhuang at gmail.com; linux-kernel at vger.kernel.org > Subject: Re: [PATCH v2] ARM: mmp: bring up pxa988 with device tree support > > On Friday 31 May 2013 10:58:35 Neil Zhang wrote: > > bring up pxa988 with device tree support. > > > > Change-Id: I6fc869b7d5ff8dc6e4eb0042a89429200f7a9fb1 > > Please don't post silly extra headers like that. Sorry for the noise, will remove it. > > > Signed-off-by: Neil Zhang <zhangwm@marvell.com> > > A couple of comments on the DT structure: > > > + gic: interrupt-controller at d1dfe100 { > > + compatible = "arm,cortex-a9-gic"; > > + interrupt-controller; > > + #interrupt-cells = <3>; > > + reg = <0xd1dff000 0x1000>, > > + <0xd1dfe100 0x0100>; > > + }; > > + > > + L2: l2-cache-controller at d1dfb000 { > > + compatible = "arm,pl310-cache"; > > + reg = <0xd1dfb000 0x1000>; > > + arm,data-latency = <2 1 1>; > > + arm,tag-latency = <2 1 1>; > > + arm,pwr-dynamic-clk-gating; > > + arm,pwr-standby-mode; > > + cache-unified; > > + cache-level = <2>; > > + }; > > + > > + local-timer at d1dfe600 { > > + compatible = "arm,cortex-a9-twd-timer"; > > + reg = <0xd1dfe600 0x20>; > > + interrupts = <1 13 0x304>; > > + }; > > Why are these all top-level devices, rather than part of the 'soc' node? Yes, we can move it as child of soc. > > > + soc { > > + #address-cells = <1>; > > + #size-cells = <1>; > > + compatible = "simple-bus"; > > + interrupt-parent = <&gic>; > > + ranges; > > + > > + axi at d4200000 { /* AXI */ > > + compatible = "mrvl,axi-bus", "simple-bus"; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + reg = <0xd4200000 0x00200000>; > > + ranges; > > + > > + intc: wakeupgen at d4282000 { > > + compatible = "mrvl,mmp-intc"; > > + reg = <0xd4282000 0x1000>; > > + mrvl,intc-wakeup = <0x114 0x3 > > + 0x144 0x3>; > > + }; > > + > > + }; > > What is a 'mrvl,axi-bus'? Is that different from ARM's AXI bus? > > The documented vendor prefix for Marvell is 'marvell', not 'mrvl', please be > consistent with that. > > What is the purpose of the 'reg' property in the axi bus? I notice that it > overlaps with its own children, wich seens very strange. > Maybe you meant this: > > axi { > ranges = <0xd4200000 0xd4200000 0x00200000>; > ... > }; > > > + apb at d4000000 { /* APB */ > > + compatible = "mrvl,apb-bus", "simple-bus"; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + reg = <0xd4000000 0x00200000>; > > + ranges; > > Same comments apply here. > Thanks for the comments here, will modify it later. > > diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig > > index ebdda83..0955191 100644 > > --- a/arch/arm/mach-mmp/Kconfig > > +++ b/arch/arm/mach-mmp/Kconfig > > @@ -107,6 +107,16 @@ config MACH_MMP2_DT > > Include support for Marvell MMP2 based platforms using > > the device tree. > > > > +config MACH_MMPX_DT > > + bool "Support no-PJ/PJ4(ARMv7) platforms from device tree" > > + depends on !CPU_MOHAWK && !CPU_PJ4 > > + select CPU_PXA988 > > + select USE_OF > > + select PINCTRL > > + select PINCTRL_SINGLE > > Why would this be mutually exclusive with PJ4? Cortex-A9 and PJ4 are both > ARMv7 based, so we should be able to have them in the same kernel. The MACH_MMPX_DT here is for standard ARM core based SoC. But PJ4 is modified by Marvell, which includes IWMMXT. > > > + help > > + Include support for Marvell MMP2 based platforms using > > + the device tree. > > endmenu > > You should probably change the help texts to say different things here, e.g. > list the models supported under these. Thanks for the remind, will modify it later. > > > diff --git a/arch/arm/mach-mmp/common.c > b/arch/arm/mach-mmp/common.c > > index 9292b79..0c621bc 100644 > > --- a/arch/arm/mach-mmp/common.c > > +++ b/arch/arm/mach-mmp/common.c > > @@ -11,6 +11,10 @@ > > #include <linux/init.h> > > #include <linux/kernel.h> > > #include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/io.h> > > +#include <linux/ioport.h> > > +#include <linux/of_address.h> > > > > #include <asm/page.h> > > #include <asm/mach/map.h> > > @@ -36,7 +40,12 @@ static struct map_desc standard_io_desc[] > __initdata = { > > .virtual = (unsigned long)AXI_VIRT_BASE, > > .length = AXI_PHYS_SIZE, > > .type = MT_DEVICE, > > - }, > > + }, { > > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), > > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, > > + .length = MMP_CORE_PERIPH_PHYS_SIZE, > > + .type = MT_DEVICE, > > + } > > }; > > > > void __init mmp_map_io(void) > > What is this needed for? This function is used to static map the device registers. > > > +/* PXA988 */ > > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst > = { > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), > > + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + {} > > +}; > > Why do you need auxdata? Two reasons: 1. some of the device still need platform data at this time. 2. we use device name as clk name. Will change it later, but need some time. > > > +void __init pxa988_dt_init_timer(void) { > > + extern void __init mmp_dt_init_timer(void); > > You should never put 'extern' declarations into a .c file. > > > + /* > > + * Is is a SOC timer, and will be used for broadcasting > > + * when local timers are disabled. > > + */ > > + mmp_dt_init_timer(); > > + > > + clocksource_of_init(); > > +} > > Please just change the mmp_dt_init_timer function to use > CLOCKSOURCE_OF_DECLARE(), and if possible move the file to > drivers/clocksource. Yes, we will change to use CLOCKSOURCE_OF_DECLARE later. But it need time, so let's keep it at this time. > > > +static const char *pxa988_dt_board_compat[] __initdata = { > > + "mrvl,pxa988-dkb", > > + NULL, > > +}; > > + > > +DT_MACHINE_START(PXA988_DT, "Marvell PXA988 (Device Tree > Support)") > > + .smp = smp_ops(mmp_smp_ops), > > + .map_io = mmp_map_io, > > + .init_irq = irqchip_init, > > You can leave out the init_irq, it's implicit. > > > + .init_time = pxa988_dt_init_timer, > > + .init_machine = pxa988_dt_init_machine, > > + .dt_compat = pxa988_dt_board_compat, > > +MACHINE_END > > > > + > > +static int __init mmp_entry_vector_init(void) { > > + int cpu; > > + > > + /* We will reset from DDR directly by default */ > > + writel(__pa(mmp_cpu_reset_entry), CIU_CA9_WARM_RESET_VECTOR); > > + > > + for (cpu = 1; cpu < CONFIG_NR_CPUS; cpu++) > > + mmp_set_entry_vector(cpu, __pa(mmp_secondary_startup)); } > > + > > +early_initcall(mmp_entry_vector_init); > > You need to check which machine you are running on here. Best just move > the call into one of the init functions of the machine descriptor, e.g. > init_machine or init_late. Thanks for the remind, will use init_early for it. > > CONFIG_NR_CPUS is probably the wrong constant to use here, it does not > have to match the physically present CPU cores. Thanks, will use nr_cpu_ids here. > > Arnd Best Regards, Neil Zhang ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-06 2:48 ` Neil Zhang @ 2013-06-06 16:26 ` Arnd Bergmann 2013-06-08 1:07 ` Chao Xie 0 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2013-06-06 16:26 UTC (permalink / raw) To: linux-arm-kernel On Thursday 06 June 2013, Neil Zhang wrote: > > > diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig > > > index ebdda83..0955191 100644 > > > --- a/arch/arm/mach-mmp/Kconfig > > > +++ b/arch/arm/mach-mmp/Kconfig > > > @@ -107,6 +107,16 @@ config MACH_MMP2_DT > > > Include support for Marvell MMP2 based platforms using > > > the device tree. > > > > > > +config MACH_MMPX_DT > > > + bool "Support no-PJ/PJ4(ARMv7) platforms from device tree" > > > + depends on !CPU_MOHAWK && !CPU_PJ4 > > > + select CPU_PXA988 > > > + select USE_OF > > > + select PINCTRL > > > + select PINCTRL_SINGLE > > > > Why would this be mutually exclusive with PJ4? Cortex-A9 and PJ4 are both > > ARMv7 based, so we should be able to have them in the same kernel. > > The MACH_MMPX_DT here is for standard ARM core based SoC. > But PJ4 is modified by Marvell, which includes IWMMXT. That should not stop us from supporting them with the same kernel. We can already build a kernel that will work with IWMMXT on ArmadaXP (PJ4B) and Calxeda Highbank (Cortex-A9) for instance. > > __initdata = { > > > .virtual = (unsigned long)AXI_VIRT_BASE, > > > .length = AXI_PHYS_SIZE, > > > .type = MT_DEVICE, > > > - }, > > > + }, { > > > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), > > > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, > > > + .length = MMP_CORE_PERIPH_PHYS_SIZE, > > > + .type = MT_DEVICE, > > > + } > > > }; > > > > > > void __init mmp_map_io(void) > > > > What is this needed for? > > This function is used to static map the device registers. I understand what map_io does. Why do you need a static mapping? > > > +/* PXA988 */ > > > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst > > = { > > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > > NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > > NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > > NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > > NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > > NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), > > > + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > > + {} > > > +}; > > > > Why do you need auxdata? > > Two reasons: > 1. some of the device still need platform data at this time. None of the ones above do apparently. > 2. we use device name as clk name. > Will change it later, but need some time. If you have no platform_data, I think you should modify the clkdev lookup table to refer to the DT based names so you no longer have to pass auxdata. The long term solution of course is to describe the clocks in the device tree as well. > > > +void __init pxa988_dt_init_timer(void) { > > > + extern void __init mmp_dt_init_timer(void); > > > > You should never put 'extern' declarations into a .c file. > > > > > + /* > > > + * Is is a SOC timer, and will be used for broadcasting > > > + * when local timers are disabled. > > > + */ > > > + mmp_dt_init_timer(); > > > + > > > + clocksource_of_init(); > > > +} > > > > Please just change the mmp_dt_init_timer function to use > > CLOCKSOURCE_OF_DECLARE(), and if possible move the file to > > drivers/clocksource. > > Yes, we will change to use CLOCKSOURCE_OF_DECLARE later. > But it need time, so let's keep it at this time. It should be a trivial change, I'm not asking you to put the clocks in the DT right away, just change the way that this function gets called. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-06 16:26 ` Arnd Bergmann @ 2013-06-08 1:07 ` Chao Xie 2013-06-10 8:35 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Chao Xie @ 2013-06-08 1:07 UTC (permalink / raw) To: linux-arm-kernel hi, Arnd Thanks for your review. On Fri, Jun 7, 2013 at 12:26 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Thursday 06 June 2013, Neil Zhang wrote: >> > > diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig >> > > index ebdda83..0955191 100644 >> > > --- a/arch/arm/mach-mmp/Kconfig >> > > +++ b/arch/arm/mach-mmp/Kconfig >> > > @@ -107,6 +107,16 @@ config MACH_MMP2_DT >> > > Include support for Marvell MMP2 based platforms using >> > > the device tree. >> > > >> > > +config MACH_MMPX_DT >> > > + bool "Support no-PJ/PJ4(ARMv7) platforms from device tree" >> > > + depends on !CPU_MOHAWK && !CPU_PJ4 >> > > + select CPU_PXA988 >> > > + select USE_OF >> > > + select PINCTRL >> > > + select PINCTRL_SINGLE >> > >> > Why would this be mutually exclusive with PJ4? Cortex-A9 and PJ4 are both >> > ARMv7 based, so we should be able to have them in the same kernel. >> >> The MACH_MMPX_DT here is for standard ARM core based SoC. >> But PJ4 is modified by Marvell, which includes IWMMXT. > > That should not stop us from supporting them with the same kernel. > We can already build a kernel that will work with IWMMXT on > ArmadaXP (PJ4B) and Calxeda Highbank (Cortex-A9) for instance. > Yes. We can compile it, because will fail to boot up the core. The correct way to adding device tree support for iwmmx(arch/arm/kernel/pj4-cp0.c). I think we can do it if you agree with us. >> > __initdata = { >> > > .virtual = (unsigned long)AXI_VIRT_BASE, >> > > .length = AXI_PHYS_SIZE, >> > > .type = MT_DEVICE, >> > > - }, >> > > + }, { >> > > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), >> > > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, >> > > + .length = MMP_CORE_PERIPH_PHYS_SIZE, >> > > + .type = MT_DEVICE, >> > > + } >> > > }; >> > > >> > > void __init mmp_map_io(void) >> > >> > What is this needed for? >> >> This function is used to static map the device registers. > > I understand what map_io does. Why do you need a static mapping? > The AXI and APB bus register mapping, It does not need to be static mapping. Because we define the registers for each peripharals in device tree. The device driver can map it. There is a exception. The address space used by core for example CPU SCU registers for CA9. We have to read/write the registers even device tree has not been build up in kernel, for example ->smp_prepare_cpus. At this point, how can we get the base address for SCU? >> > > +/* PXA988 */ >> > > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst >> > = { >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", >> > NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", >> > NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", >> > NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", >> > NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", >> > NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), >> > > + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), >> > > + {} >> > > +}; >> > >> > Why do you need auxdata? >> >> Two reasons: >> 1. some of the device still need platform data at this time. > > None of the ones above do apparently. > Now, some devices are not added. For example, USB. I am trying to modify the USB driver to make it support device tree. For example, separate the phy and PMIC support from USB driver. The patches have been reviewed in USB maillist for a long time. Now it is hold because the maintainer think HCD and PHY need do some fix. So as a temporaty solution before us pushing USB patches, we have to use platform data for USB. >> 2. we use device name as clk name. >> Will change it later, but need some time. > > If you have no platform_data, I think you should modify the clkdev > lookup table to refer to the DT based names so you no longer have > to pass auxdata. > > The long term solution of course is to describe the clocks in the > device tree as well. > Thanks for your comments. Now we are doing the clock tree changing. Haojian has sent some patches adding device tree support for clock tree, but pxa988 are not included. We will do the clock changes for pxa988 after Haojian's patches been reviewed and merged. I hope that we can fully support device tree for pxa988 and the next generation SOCes including all the peripahrals. In our local code base for development, we are doing this, but it is not that easy. >> > > +void __init pxa988_dt_init_timer(void) { >> > > + extern void __init mmp_dt_init_timer(void); >> > >> > You should never put 'extern' declarations into a .c file. >> > >> > > + /* >> > > + * Is is a SOC timer, and will be used for broadcasting >> > > + * when local timers are disabled. >> > > + */ >> > > + mmp_dt_init_timer(); >> > > + >> > > + clocksource_of_init(); >> > > +} >> > >> > Please just change the mmp_dt_init_timer function to use >> > CLOCKSOURCE_OF_DECLARE(), and if possible move the file to >> > drivers/clocksource. >> >> Yes, we will change to use CLOCKSOURCE_OF_DECLARE later. >> But it need time, so let's keep it at this time. > > It should be a trivial change, I'm not asking you to put the clocks > in the DT right away, just change the way that this function gets > called. > > Arnd > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-08 1:07 ` Chao Xie @ 2013-06-10 8:35 ` Arnd Bergmann 2013-06-14 9:15 ` Chao Xie 0 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2013-06-10 8:35 UTC (permalink / raw) To: linux-arm-kernel On Saturday 08 June 2013, Chao Xie wrote: > hi, Arnd > Thanks for your review. > > On Fri, Jun 7, 2013 at 12:26 AM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Thursday 06 June 2013, Neil Zhang wrote: > >> > >> The MACH_MMPX_DT here is for standard ARM core based SoC. > >> But PJ4 is modified by Marvell, which includes IWMMXT. > > > > That should not stop us from supporting them with the same kernel. > > We can already build a kernel that will work with IWMMXT on > > ArmadaXP (PJ4B) and Calxeda Highbank (Cortex-A9) for instance. > > > Yes. We can compile it, because will fail to boot up the core. > The correct way to adding device tree support for > iwmmx(arch/arm/kernel/pj4-cp0.c). > I think we can do it if you agree with us. Ah, you mean the initcall in that file breaks when executed on a CPU that doesn't have iWMMXT? The easiest way for that is probably to call pj4_cp0_init() from the machine_descriptor init_late() callback. To do it properly, I think it should be hooked up with the CPU identification code in arch/arm/mm/proc-v7.S. > >> > __initdata = { > >> > > .virtual = (unsigned long)AXI_VIRT_BASE, > >> > > .length = AXI_PHYS_SIZE, > >> > > .type = MT_DEVICE, > >> > > - }, > >> > > + }, { > >> > > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), > >> > > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, > >> > > + .length = MMP_CORE_PERIPH_PHYS_SIZE, > >> > > + .type = MT_DEVICE, > >> > > + } > >> > > }; > >> > > > >> > > void __init mmp_map_io(void) > >> > > >> > What is this needed for? > >> > >> This function is used to static map the device registers. > > > > I understand what map_io does. Why do you need a static mapping? > > > > The AXI and APB bus register mapping, It does not need to be static mapping. > Because we define the registers for each peripharals in device tree. > The device driver can map it. Ok. Please try if it all keeps working without these mappings (aside from the SCU). You can leave them in as a performance optimization since the registers will get mapped as large pages this way, but it should really work without them. I would also suggest defining the virtual base addresses locally in this file rather than globally, just to ensure that no driver starts relying on the static mapping. > There is a exception. The address space used by core for example CPU > SCU registers for CA9. > We have to read/write the registers even device tree has not been > build up in kernel, for example ->smp_prepare_cpus. > At this point, how can we get the base address for SCU? I guess that is a problem we have on other platforms as well, we should find a generic solution for that. It would be nice to reserve a page in "fixmap" and have common code map the SCU page into that. > >> > > +/* PXA988 */ > >> > > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst > >> > = { > >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > >> > NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > >> > NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > >> > NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > >> > NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > >> > NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL), > >> > > + OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > >> > > + {} > >> > > +}; > >> > > >> > Why do you need auxdata? > >> > >> Two reasons: > >> 1. some of the device still need platform data at this time. > > > > None of the ones above do apparently. > > > Now, some devices are not added. For example, USB. > I am trying to modify the USB driver to make it support device tree. > For example, separate the phy and PMIC support from USB driver. > The patches have been reviewed in USB maillist for a long time. > Now it is hold because the maintainer think HCD and PHY need do some fix. > So as a temporaty solution before us pushing USB patches, we have to > use platform data for USB. Ok, I see. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-10 8:35 ` Arnd Bergmann @ 2013-06-14 9:15 ` Chao Xie 2013-06-14 12:56 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Chao Xie @ 2013-06-14 9:15 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jun 10, 2013 at 4:35 PM, Arnd Bergmann <arnd@arndb.de> wrote: > >> >> > __initdata = { >> >> > > .virtual = (unsigned long)AXI_VIRT_BASE, >> >> > > .length = AXI_PHYS_SIZE, >> >> > > .type = MT_DEVICE, >> >> > > - }, >> >> > > + }, { >> >> > > + .pfn = __phys_to_pfn(MMP_CORE_PERIPH_PHYS_BASE), >> >> > > + .virtual = (unsigned long)MMP_CORE_PERIPH_VIRT_BASE, >> >> > > + .length = MMP_CORE_PERIPH_PHYS_SIZE, >> >> > > + .type = MT_DEVICE, >> >> > > + } >> >> > > }; >> >> > > >> >> > > void __init mmp_map_io(void) >> >> > >> >> > What is this needed for? >> >> >> >> This function is used to static map the device registers. >> > >> > I understand what map_io does. Why do you need a static mapping? >> > >> >> The AXI and APB bus register mapping, It does not need to be static mapping. >> Because we define the registers for each peripharals in device tree. >> The device driver can map it. > > Ok. Please try if it all keeps working without these mappings (aside > from the SCU). You can leave them in as a performance optimization > since the registers will get mapped as large pages this way, but it > should really work without them. > > I would also suggest defining the virtual base addresses locally in this > file rather than globally, just to ensure that no driver starts relying > on the static mapping. > >> There is a exception. The address space used by core for example CPU >> SCU registers for CA9. >> We have to read/write the registers even device tree has not been >> build up in kernel, for example ->smp_prepare_cpus. >> At this point, how can we get the base address for SCU? > > I guess that is a problem we have on other platforms as well, we should > find a generic solution for that. It would be nice to reserve a page > in "fixmap" and have common code map the SCU page into that. > So you mean that reserve a page in arch/arm/asm/include/fixmap.h? This reserve will depend on the cpu type beacuse only A9 will have SCU part. I do not know that in fixmap, the #ifdef is acceptable or not. For the common code to map the SCU page, where do you suggest to put it? >> >> > > +/* PXA988 */ >> >> > > +static const struct of_dev_auxdata pxa988_auxdata_lookup[] __initconst > > Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-14 9:15 ` Chao Xie @ 2013-06-14 12:56 ` Arnd Bergmann 2013-06-17 4:17 ` Chao Xie 0 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2013-06-14 12:56 UTC (permalink / raw) To: linux-arm-kernel On Friday 14 June 2013 17:15:33 Chao Xie wrote: > On Mon, Jun 10, 2013 at 4:35 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > I guess that is a problem we have on other platforms as well, we should > > find a generic solution for that. It would be nice to reserve a page > > in "fixmap" and have common code map the SCU page into that. > > > > So you mean that reserve a page in arch/arm/asm/include/fixmap.h? Yes. > This reserve will depend on the cpu type beacuse only A9 will have SCU part. I think A5 and ARM11MPCore as well. > I do not know that in fixmap, the #ifdef is acceptable or not. Yes, it is. We don't really use fixmap on ARM for anything other than kmap_atomic at the moment. Please have a look at the powerpc and x86 implementations. > For the common code to map the SCU page, where do you suggest to put it? arch/arm/kernel/smp_scu.c. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-14 12:56 ` Arnd Bergmann @ 2013-06-17 4:17 ` Chao Xie 2013-06-17 21:34 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Chao Xie @ 2013-06-17 4:17 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jun 14, 2013 at 8:56 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Friday 14 June 2013 17:15:33 Chao Xie wrote: >> On Mon, Jun 10, 2013 at 4:35 PM, Arnd Bergmann <arnd@arndb.de> wrote: > >> > I guess that is a problem we have on other platforms as well, we should >> > find a generic solution for that. It would be nice to reserve a page >> > in "fixmap" and have common code map the SCU page into that. >> > >> >> So you mean that reserve a page in arch/arm/asm/include/fixmap.h? > > Yes. > >> This reserve will depend on the cpu type beacuse only A9 will have SCU part. > > I think A5 and ARM11MPCore as well. > >> I do not know that in fixmap, the #ifdef is acceptable or not. > > Yes, it is. We don't really use fixmap on ARM for anything other than > kmap_atomic at the moment. Please have a look at the powerpc and x86 > implementations. > >> For the common code to map the SCU page, where do you suggest to put it? > > arch/arm/kernel/smp_scu.c. > I think smp_scu.c may not be good place to put the mapping for SCU page. As you know that the fix map will make use of the mapping that set up by vector page. It will make use of top_pmd, and some APIs only provided under arch/arm/mm/. For example get_mem_type: for the pgprot for MT_DEVICE set_top_pte: Is that possible to add a file fixmap.c under arch/arm/mm/? It can including all the fix mapping except highmem. So SCU is one of it. > Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-17 4:17 ` Chao Xie @ 2013-06-17 21:34 ` Arnd Bergmann 2013-06-20 0:55 ` Chao Xie 0 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2013-06-17 21:34 UTC (permalink / raw) To: linux-arm-kernel On Monday 17 June 2013, Chao Xie wrote: > On Fri, Jun 14, 2013 at 8:56 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Friday 14 June 2013 17:15:33 Chao Xie wrote: > >> On Mon, Jun 10, 2013 at 4:35 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > > >> > I guess that is a problem we have on other platforms as well, we should > >> > find a generic solution for that. It would be nice to reserve a page > >> > in "fixmap" and have common code map the SCU page into that. > >> > > >> > >> So you mean that reserve a page in arch/arm/asm/include/fixmap.h? > > > > Yes. > > > >> This reserve will depend on the cpu type beacuse only A9 will have SCU part. > > > > I think A5 and ARM11MPCore as well. > > > >> I do not know that in fixmap, the #ifdef is acceptable or not. > > > > Yes, it is. We don't really use fixmap on ARM for anything other than > > kmap_atomic at the moment. Please have a look at the powerpc and x86 > > implementations. > > > >> For the common code to map the SCU page, where do you suggest to put it? > > > > arch/arm/kernel/smp_scu.c. > > > I think smp_scu.c may not be good place to put the mapping for SCU page. > As you know that the fix map will make use of the mapping that set up > by vector page. > It will make use of top_pmd, and some APIs only provided under arch/arm/mm/. > For example > get_mem_type: for the pgprot for MT_DEVICE > set_top_pte: > Is that possible to add a file fixmap.c under arch/arm/mm/? It can > including all the fix mapping > except highmem. So SCU is one of it. It's up to Russell, and he probably has an idea where this should be going. Russell, do you think using a fixmap page for the SCU makes sense? I'm looking for a method to consolidate the various methods of doing early mappings of the SCU for device tree based platforms. Where do you think that should be implemented? Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-17 21:34 ` Arnd Bergmann @ 2013-06-20 0:55 ` Chao Xie 2013-06-28 2:15 ` Chao Xie 0 siblings, 1 reply; 13+ messages in thread From: Chao Xie @ 2013-06-20 0:55 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 18, 2013 at 5:34 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 17 June 2013, Chao Xie wrote: >> On Fri, Jun 14, 2013 at 8:56 PM, Arnd Bergmann <arnd@arndb.de> wrote: >> > On Friday 14 June 2013 17:15:33 Chao Xie wrote: >> >> On Mon, Jun 10, 2013 at 4:35 PM, Arnd Bergmann <arnd@arndb.de> wrote: >> > >> >> > I guess that is a problem we have on other platforms as well, we should >> >> > find a generic solution for that. It would be nice to reserve a page >> >> > in "fixmap" and have common code map the SCU page into that. >> >> > >> >> >> >> So you mean that reserve a page in arch/arm/asm/include/fixmap.h? >> > >> > Yes. >> > >> >> This reserve will depend on the cpu type beacuse only A9 will have SCU part. >> > >> > I think A5 and ARM11MPCore as well. >> > >> >> I do not know that in fixmap, the #ifdef is acceptable or not. >> > >> > Yes, it is. We don't really use fixmap on ARM for anything other than >> > kmap_atomic at the moment. Please have a look at the powerpc and x86 >> > implementations. >> > >> >> For the common code to map the SCU page, where do you suggest to put it? >> > >> > arch/arm/kernel/smp_scu.c. >> > >> I think smp_scu.c may not be good place to put the mapping for SCU page. >> As you know that the fix map will make use of the mapping that set up >> by vector page. >> It will make use of top_pmd, and some APIs only provided under arch/arm/mm/. >> For example >> get_mem_type: for the pgprot for MT_DEVICE >> set_top_pte: >> Is that possible to add a file fixmap.c under arch/arm/mm/? It can >> including all the fix mapping >> except highmem. So SCU is one of it. > > It's up to Russell, and he probably has an idea where this should be > going. > > Russell, do you think using a fixmap page for the SCU makes sense? > I'm looking for a method to consolidate the various methods of > doing early mappings of the SCU for device tree based platforms. > Where do you think that should be implemented? > Hi, Russell What do you think about above suggestion? Thanks. > Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] ARM: mmp: bring up pxa988 with device tree support 2013-06-20 0:55 ` Chao Xie @ 2013-06-28 2:15 ` Chao Xie 0 siblings, 0 replies; 13+ messages in thread From: Chao Xie @ 2013-06-28 2:15 UTC (permalink / raw) To: linux-arm-kernel hi, Arnd SCU registers mapping can not be added to fixmap. As Russell's suggested, the SCU registers can be mapped to 0xffff1000 with single page. Beause the mapping is not a fix map, and i can not use the static functions in arch/arm/mm/mm.h, I still have to use static mapping for SCU registers by iotable_init. So what is your idea about how to make the SCU registers mapping to be a peice of common code? Thanks. ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-06-28 2:15 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-31 2:58 [PATCH v2] bring up pxa988 with DT Neil Zhang 2013-05-31 2:58 ` [PATCH v2] ARM: mmp: bring up pxa988 with device tree support Neil Zhang 2013-05-31 11:24 ` Arnd Bergmann 2013-06-06 2:48 ` Neil Zhang 2013-06-06 16:26 ` Arnd Bergmann 2013-06-08 1:07 ` Chao Xie 2013-06-10 8:35 ` Arnd Bergmann 2013-06-14 9:15 ` Chao Xie 2013-06-14 12:56 ` Arnd Bergmann 2013-06-17 4:17 ` Chao Xie 2013-06-17 21:34 ` Arnd Bergmann 2013-06-20 0:55 ` Chao Xie 2013-06-28 2:15 ` Chao Xie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).