obj-y += traps.o
obj-y += domain.o
obj-y += vfp.o
+obj-y += smpboot.o
obj-$(EARLY_PRINTK) += debug.o
* or the initial pagetable code below will need adjustment. */
.global start
start:
-
+GLOBAL(init_secondary) /* currently unused */
/* zImage magic header, see:
* http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309
*/
--- /dev/null
+#include <xen/device_tree.h>
+#include <xen/init.h>
+#include <xen/smp.h>
+#include <asm/platform.h>
+
+int __init arch_smp_init(void)
+{
+ return platform_smp_init();
+}
+
+int __init arch_cpu_init(int cpu, struct dt_device_node *dn)
+{
+ /* TODO handle PSCI init */
+ return 0;
+}
+
+int __init arch_cpu_up(int cpu)
+{
+ return platform_cpu_up(cpu);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
obj-y += traps.o
obj-y += domain.o
obj-y += vfp.o
+obj-y += smpboot.o
obj-$(EARLY_PRINTK) += debug.o
.global start
start:
+GLOBAL(init_secondary) /* currently unused */
/*
* DO NOT MODIFY. Image header expected by Linux boot-loaders.
*/
--- /dev/null
+#include <xen/cpu.h>
+#include <xen/lib.h>
+#include <xen/init.h>
+#include <xen/errno.h>
+#include <xen/mm.h>
+#include <xen/smp.h>
+
+struct smp_enable_ops {
+ int (*prepare_cpu)(int);
+};
+
+static paddr_t cpu_release_addr[NR_CPUS];
+static struct smp_enable_ops smp_enable_ops[NR_CPUS];
+
+static int __init smp_spin_table_cpu_up(int cpu)
+{
+ paddr_t *release;
+
+ if (!cpu_release_addr[cpu])
+ {
+ printk("CPU%d: No release addr\n", cpu);
+ return -ENODEV;
+ }
+
+ release = __va(cpu_release_addr[cpu]);
+
+ release[0] = __pa(init_secondary);
+ flush_xen_data_tlb_range_va((vaddr_t)release, sizeof(*release));
+
+ sev();
+ return 0;
+}
+
+static void __init smp_spin_table_init(int cpu, struct dt_device_node *dn)
+{
+ if ( !dt_property_read_u64(dn, "cpu-release-addr", &cpu_release_addr[cpu]) )
+ {
+ printk("CPU%d has no cpu-release-addr\n", cpu);
+ return;
+ }
+
+ smp_enable_ops[cpu].prepare_cpu = smp_spin_table_cpu_up;
+}
+
+int __init arch_smp_init(void)
+{
+ /* Nothing */
+ return 0;
+}
+
+int __init arch_cpu_init(int cpu, struct dt_device_node *dn)
+{
+ const char *enable_method;
+
+ enable_method = dt_get_property(dn, "enable-method", NULL);
+ if (!enable_method)
+ {
+ printk("CPU%d has no enable method\n", cpu);
+ return -EINVAL;
+ }
+
+ if ( !strcmp(enable_method, "spin-table") )
+ smp_spin_table_init(cpu, dn);
+ /* TODO: method "psci" */
+ else
+ {
+ printk("CPU%d has unknown enable method \"%s\"\n", cpu, enable_method);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+int __init arch_cpu_up(int cpu)
+{
+ if ( !smp_enable_ops[cpu].prepare_cpu )
+ return -ENODEV;
+
+ return smp_enable_ops[cpu].prepare_cpu(cpu);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
return res;
}
+#ifdef CONFIG_ARM_32
+int __init platform_cpu_up(int cpu)
+{
+ if ( platform && platform->cpu_up )
+ return platform->cpu_up(cpu);
+
+ return -EAGAIN;
+}
+
+int __init platform_smp_init(void)
+{
+ if ( platform && platform->smp_init )
+ return platform->smp_init();
+
+ return 0;
+}
+#endif
+
void platform_reset(void)
{
if ( platform && platform->reset )
#include <xen/mm.h>
#include <xen/vmap.h>
#include <asm/io.h>
+#include <asm/gic.h>
#define DCC_SHIFT 26
#define FUNCTION_SHIFT 20
iounmap(sp810);
}
+#ifdef CONFIG_ARM_32
+
+static int __init vexpress_smp_init(void)
+{
+ void __iomem *sysflags;
+
+ sysflags = ioremap_nocache(V2M_SYS_MMIO_BASE, PAGE_SIZE);
+ if ( !sysflags )
+ {
+ dprintk(XENLOG_ERR, "Unable to map vexpress MMIO\n");
+ return -EFAULT;
+ }
+
+ printk("Set SYS_FLAGS to %"PRIpaddr" (%p)\n",
+ __pa(init_secondary), init_secondary);
+ writel(~0, sysflags + V2M_SYS_FLAGSCLR);
+ writel(__pa(init_secondary), sysflags + V2M_SYS_FLAGSSET);
+
+ iounmap(sysflags);
+
+ return 0;
+}
+
+static int __init vexpress_cpu_up(int cpu)
+{
+ /* Nothing to do here, the generic sev() will suffice to kick CPUs
+ * out of either the firmware or our own smp_up_cpu gate,
+ * depending on where they have ended up. */
+
+ return 0;
+}
+#endif
+
static const char * const vexpress_dt_compat[] __initdata =
{
"arm,vexpress",
PLATFORM_START(vexpress, "VERSATILE EXPRESS")
.compatible = vexpress_dt_compat,
+#ifdef CONFIG_ARM_32
+ .smp_init = vexpress_smp_init,
+ .cpu_up = vexpress_cpu_up,
+#endif
.reset = vexpress_reset,
.blacklist_dev = vexpress_blacklist_dev,
PLATFORM_END
/* Platform initialization */
int (*init)(void);
int (*init_time)(void);
+#ifdef CONFIG_ARM_32
+ /* SMP */
+ int (*smp_init)(void);
+ int (*cpu_up)(int cpu);
+#endif
/* Specific mapping for dom0 */
int (*specific_mapping)(struct domain *d);
/* Platform reset */
int __init platform_init(void);
int __init platform_init_time(void);
int __init platform_specific_mapping(struct domain *d);
+#ifdef CONFIG_ARM_32
+int platform_smp_init(void);
+int platform_cpu_up(int cpu);
+#endif
void platform_reset(void);
void platform_poweroff(void);
bool_t platform_has_quirk(uint32_t quirk);
#ifndef __ASSEMBLY__
#include <xen/config.h>
#include <xen/cpumask.h>
+#include <xen/device_tree.h>
#include <asm/current.h>
#endif
extern void
make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset);
+extern int arch_smp_init(void);
+extern int arch_cpu_init(int cpu, struct dt_device_node *dn);
+extern int arch_cpu_up(int cpu);
+
+/* Secondary CPU entry point */
+extern void init_secondary(void);
+
extern void smp_clear_cpu_maps (void);
extern int smp_get_max_cpus (void);
#endif
+
/*
* Local variables:
* mode: C
projects / xen.git / commitdiff