ARM: vexpress: add support for multiple core tiles
Subsystems (3)
PATCH v2 1/1 ARM: vexpress: add support for multiple core tiles
The current Versatile Express BSP defines the MACHINE_START macro in the core tile code.
This patch moves this into the generic board code and introduces a method for determining the current tile at runtime, allowing the Kernel to have support for multiple tiles compiled in. Tile-specific functions are executed via a descriptor struct containing the correct implementations for the current tile.
---
Note: This was originally posted in September as part of the series entitled:
`CPU hotplug support for Versatile platforms'. I have since separated this patch out as I believe it is useful for situations outside of hotplug.
arch/arm/mach-vexpress/core.h | 5 -- arch/arm/mach-vexpress/ct-ca9x4.c | 34 +++++++---- arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 + arch/arm/mach-vexpress/include/mach/motherboard.h | 21 +++++++ arch/arm/mach-vexpress/platsmp.c | 12 +--- arch/arm/mach-vexpress/v2m.c | 64 +++++++++++++++++---- 6 files changed, 100 insertions(+), 38 deletions(-)
arch/arm/mach-vexpress/core.h +0 -5
@@ -18,9 +18,4 @@ struct amba_device name##_device = { \/* .dma = DMA_##base,*/ \ } -struct map_desc ; - -void v2m_map_io (struct map_desc *tile,size_t num); -extern struct sys_timer v2m_timer; -extern void __iomem *gic_cpu_base_addr;
arch/arm/mach-vexpress/ct-ca9x4.c +22 -12
@@ -10,12 +10,11 @@#include <linux/amba/clcd.h> #include <asm/clkdev.h> -#include <asm/pgtable.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/cache-l2x0.h> #include <asm/hardware/gic.h> -#include <asm/mach-types.h> #include <asm/pmu.h> +#include <asm/smp_scu.h> #include <asm/smp_twd.h> #include <mach/clkdev.h>
@@ -23,7 +22,6 @@#include <plat/timer-sp.h> -#include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/time.h>
@@ -55,7 +53,7 @@ static struct map_desc ct_ca9x4_io_desc[] __initdata = {static void __init ct_ca9x4_map_io (void ) { twd_base =MMIO_P2V (A9_MPCORE_TWD ); -v2m_map_io (ct_ca9x4_io_desc,ARRAY_SIZE (ct_ca9x4_io_desc)); +iotable_init (ct_ca9x4_io_desc,ARRAY_SIZE (ct_ca9x4_io_desc)); }void __iomem *gic_cpu_base_addr;
@@ -244,14 +242,26 @@ static void __init ct_ca9x4_init(void)platform_device_register (&pmu_device); } -MACHINE_START (VEXPRESS ,"ARM-Versatile Express CA9x4" ) - .boot_params = PHYS_OFFSET + 0x00000100, +#ifdef CONFIG_SMP +static unsigned int ct_ca9x4_get_core_count (void ) +{ +return scu_get_core_count (MMIO_P2V (A9_MPCORE_SCU )); +} + +static void ct_ca9x4_smp_enable (void ) +{ +scu_enable (MMIO_P2V (A9_MPCORE_SCU )); +} +#endif + +struct ct_desc ct_ca9x4_desc = { + .id =V2M_CT_ID_CA9 , + .name ="CA9x4" , .map_io = ct_ca9x4_map_io, .init_irq = ct_ca9x4_init_irq, -#if 0 - .timer = &ct_ca9x4_timer, -#else - .timer = &v2m_timer, + .init_tile = ct_ca9x4_init, +#ifdef CONFIG_SMP + .get_core_count = ct_ca9x4_get_core_count, + .smp_enable = ct_ca9x4_smp_enable, #endif - .init_machine = ct_ca9x4_init, -MACHINE_END +};
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h +2 -0
@@ -45,4 +45,6 @@#define IRQ_CT_CA9X4_PMU_CPU2 94#define IRQ_CT_CA9X4_PMU_CPU3 95 +extern struct ct_desc ct_ca9x4_desc; +#endif
arch/arm/mach-vexpress/include/mach/motherboard.h +21 -0
@@ -118,4 +118,25 @@int v2m_cfg_write (u32 devfn,u32 data);int v2m_cfg_read (u32 devfn,u32 *data); +/* +* Core tile IDs +*/ +#define V2M_CT_ID_CA9 0x0c000191 +#define V2M_CT_ID_UNSUPPORTED 0xff000191 +#define V2M_CT_ID_MASK 0xff000fff + +struct ct_desc { +u32 id; +const char *name; +void (*map_io)(void ); +void (*init_irq)(void ); +void (*init_tile)(void ); +#ifdef CONFIG_SMP +unsigned int (*get_core_count)(void ); +void (*smp_enable)(void ); +#endif +}; + +extern struct ct_desc *ct_desc; +#endif
arch/arm/mach-vexpress/platsmp.c +2 -10
@@ -18,10 +18,8 @@#include <asm/cacheflush.h> #include <asm/localtimer.h> -#include <asm/smp_scu.h> #include <asm/unified.h> -#include <mach/ct-ca9x4.h> #include <mach/motherboard.h> #define V2M_PA_CS7 0x10000000
@@ -35,11 +33,6 @@ extern void vexpress_secondary_startup(void);*/ volatile int __cpuinitdata pen_release =-1 ; -static void __iomem *scu_base_addr (void ) -{ -return MMIO_P2V (A9_MPCORE_SCU ); -} -static DEFINE_SPINLOCK (boot_lock);void __cpuinit platform_secondary_init (unsigned int cpu)
@@ -118,10 +111,9 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)*/ void __init smp_init_cpus (void ) { -void __iomem *scu_base =scu_base_addr ();unsigned int i, ncores; - ncores = scu_base ?scu_get_core_count (scu_base) :1 ; + ncores = ct_desc->get_core_count ();/* sanity check */ if (ncores ==0 ) {
@@ -175,7 +167,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)*/ percpu_timer_setup (); -scu_enable (scu_base_addr ()); + ct_desc->smp_enable ();/* * Write the address of secondary startup into the
arch/arm/mach-vexpress/v2m.c +53 -11
99 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH v2 1/1 ARM: vexpress: add support for multiple core tiles
Russell,
Quoted 9 lines
The current Versatile Express BSP defines the
MACHINE_STARTmacro in the core tile code.This patch moves this into the generic board code and introduces a method for determining the current tile at runtime, allowing the Kernel to have support for multiple tiles compiled in. Tile-specific functions are executed via a descriptor struct containing the correct implementations for the current tile.
Quoted 3 lines
Cc Russell King - ARM Linux <[email protected]>Signed-off-by Will Deacon <[email protected]>---
[...]
Do you have any feedback on this patch or can I submit it to the patch system please?
Thanks,
Will