@@ -18,6 +18,7 @@ obj-y += p2m.o
obj-y += percpu.o
obj-y += guestcopy.o
obj-y += physdev.o
+obj-y += platform.o
obj-y += setup.o
obj-y += time.o
obj-y += smpboot.o
@@ -12,6 +12,7 @@
#include <xen/libfdt/libfdt.h>
#include <xen/guest_access.h>
#include <asm/setup.h>
+#include <asm/platform.h>
#include <asm/gic.h>
#include <xen/irq.h>
@@ -513,6 +514,9 @@ int construct_dom0(struct domain *d)
return rc;
map_devices_from_device_tree(d);
+ rc = platform_specific_mapping(d);
+ if ( rc < 0 )
+ return rc;
/* The following loads use the domain's p2m */
p2m_load_VTTBR(d);
new file mode 100644
@@ -0,0 +1,137 @@
+/*
+ * xen/arch/arm/platform.c
+ *
+ * Helpers to execute platform specific code.
+ *
+ * Julien Grall <julien.grall@linaro.org>
+ * Copyright (C) 2013 Linaro Limited.
+ *
+ * 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.
+ *
+ * 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 <asm/platform.h>
+#include <xen/device_tree.h>
+#include <xen/init.h>
+
+extern const struct platform_desc _splatform[], _eplatform[];
+
+/* Pointer to the current platform description */
+static const struct platform_desc *platform;
+
+
+static bool_t __init platform_is_compatible(const struct platform_desc *plat)
+{
+ const char *const *compat;
+
+ if ( !plat->compatible )
+ return 0;
+
+ for ( compat = plat->compatible; *compat; compat++ )
+ {
+ if ( dt_machine_is_compatible(*compat) )
+ return 1;
+ }
+
+ return 0;
+}
+
+/* List of possible platform */
+static void dump_platform_table(void)
+{
+ const struct platform_desc *p;
+
+ printk("Available platform support:\n");
+
+ for ( p = _splatform; p != _eplatform; p++ )
+ printk(" - %s\n", p->name);
+}
+
+int __init platform_init(void)
+{
+ int res = 0;
+
+ ASSERT(platform == NULL);
+
+ /* Looking for the platform description */
+ for ( platform = _splatform; platform != _eplatform; platform++ )
+ {
+ if ( platform_is_compatible(platform) )
+ break;
+ }
+
+ /* We don't have specific operations for this platform */
+ if ( platform == _eplatform )
+ {
+ /* TODO: List compatible */
+ printk(XENLOG_WARNING "WARNING: Unrecognized/unsupported device tree "
+ "compatible list\n");
+ dump_platform_table();
+ platform = NULL;
+ }
+ else
+ printk(XENLOG_INFO "Platform: %s\n", platform->name);
+
+ if ( platform && platform->init )
+ res = platform->init();
+
+ return res;
+}
+
+int __init platform_init_time(void)
+{
+ int res = 0;
+
+ if ( platform && platform->init_time )
+ res = platform->init_time();
+
+ return res;
+}
+
+int __init platform_specific_mapping(struct domain *d)
+{
+ int res = 0;
+
+ if ( platform && platform->specific_mapping )
+ res = platform->specific_mapping(d);
+
+ return res;
+}
+
+void platform_reset(void)
+{
+ if ( platform && platform->reset )
+ platform->reset();
+}
+
+void platform_poweroff(void)
+{
+ if ( platform && platform->poweroff )
+ platform->poweroff();
+}
+
+bool_t platform_has_quirk(uint32_t quirk)
+{
+ uint32_t quirks = 0;
+
+ if ( platform && platform->quirks )
+ quirks = platform->quirks();
+
+ return !!(quirks & quirk);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
@@ -42,6 +42,7 @@
#include <asm/early_printk.h>
#include <asm/gic.h>
#include <asm/cpufeature.h>
+#include <asm/platform.h>
struct cpuinfo_arm __read_mostly boot_cpu_data;
@@ -440,6 +441,8 @@ void __init start_xen(unsigned long boot_phys_offset,
processor_id();
+ platform_init();
+
init_xen_time();
gic_init();
@@ -5,6 +5,7 @@
#include <xen/lib.h>
#include <xen/mm.h>
#include <xen/smp.h>
+#include <asm/platform.h>
static void raw_machine_reset(void)
{
@@ -21,6 +22,7 @@ static void raw_machine_reset(void)
dsb(); isb();
clear_fixmap(FIXMAP_MISC);
#endif
+ platform_reset();
}
static void halt_this_cpu(void *arg)
@@ -33,6 +33,7 @@
#include <asm/time.h>
#include <asm/gic.h>
#include <asm/cpufeature.h>
+#include <asm/platform.h>
/*
* Unfortunately the hypervisor timer interrupt appears to be buggy in
@@ -123,11 +124,16 @@ int __init init_xen_time(void)
timer_irq[TIMER_HYP_PPI].irq,
timer_irq[TIMER_VIRT_PPI].irq);
+ res = platform_init_time();
+ if ( res )
+ return res;
+
/* Check that this CPU supports the Generic Timer interface */
if ( !cpu_has_gentimer )
panic("CPU does not support the Generic Timer v1 interface.\n");
cpu_khz = READ_SYSREG32(CNTFRQ_EL0) / 1000;
+
boot_count = READ_SYSREG64(CNTPCT_EL0);
printk("Using generic timer at %lu KHz\n", cpu_khz);
@@ -77,6 +77,13 @@ SECTIONS
#endif
. = ALIGN(8);
+ .arch.info : {
+ _splatform = .;
+ *(.arch.info)
+ _eplatform = .;
+ } :text
+
+ . = ALIGN(8);
.dev.info : {
_sdevice = .;
*(.dev.info)
new file mode 100644
@@ -0,0 +1,55 @@
+#ifndef __ASM_ARM_PLATFORM_H
+#define __ASM_ARM_PLATFORM_H
+
+#include <xen/init.h>
+#include <xen/sched.h>
+#include <xen/mm.h>
+
+/* Describe specific operation for a board */
+struct platform_desc {
+ /* Platform name */
+ const char *name;
+ /* Array of device tree 'compatible' strings */
+ const char *const *compatible;
+ /* Platform initialization */
+ int (*init)(void);
+ int (*init_time)(void);
+ /* Specific mapping for dom0 */
+ int (*specific_mapping)(struct domain *d);
+ /* Platform reset */
+ void (*reset)(void);
+ /* Platform power-off */
+ void (*poweroff)(void);
+ /*
+ * Platform quirks
+ * Defined has a function because a platform can support multiple
+ * board with different quirk on each
+ */
+ uint32_t (*quirks)(void);
+};
+
+int __init platform_init(void);
+int __init platform_init_time(void);
+int __init platform_specific_mapping(struct domain *d);
+void platform_reset(void);
+void platform_poweroff(void);
+bool_t platform_has_quirk(uint32_t quirk);
+
+#define PLATFORM_START(_name, _namestr) \
+static const struct platform_desc __plat_desc_##_name __used \
+__attribute__((__section__(".arch.info"))) = { \
+ .name = _namestr,
+
+#define PLATFORM_END \
+};
+
+#endif /* __ASM_ARM_PLATFORM_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Xen can include various platform support (ie: exynos5, versatile express...) and choose during boot time a set of callbacks for the current board. These callbacks will be called in places where each board can have specific code. For the moment the callbacks are: - platform_init: additional initialization for the platform - platform_init_time: some platform (ie: Exynos 5) needs to initialize the timer with an uncommon way - platform_specific_mapping: add mapping to dom0 which are not specified in the device tree - platform_reset: reset the platform - platform_poweroff: poweroff the platform - platform_quirks: list of quirks for a specific board. Signed-off-by: Julien Grall <julien.grall@linaro.org> Changes in v3: - Remove platform_{read,write} - Move platform_init_time before reading the timer frequency Changes in v2: - Add platform_poweroff - Add platform_quirks --- xen/arch/arm/Makefile | 1 + xen/arch/arm/domain_build.c | 4 ++ xen/arch/arm/platform.c | 137 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 3 + xen/arch/arm/shutdown.c | 2 + xen/arch/arm/time.c | 6 ++ xen/arch/arm/xen.lds.S | 7 ++ xen/include/asm-arm/platform.h | 55 ++++++++++++++++ 8 files changed, 215 insertions(+) create mode 100644 xen/arch/arm/platform.c create mode 100644 xen/include/asm-arm/platform.h