xen/arm: introduce xen_early_init, use PSCI on xen

Split xen_guest_init in two functions, one of them (xen_early_init) is
going to be called very early from setup_arch.

Change machine_desc->smp_init to xen_smp_init if Xen is present on the
platform. xen_smp_init just sets smp_ops to psci_smp_ops.

Introduce a dependency for ARM_PSCI in XEN.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2c3bdce151346f403ee171b2d85d601b1826b39d..66658d3e25b702ee4d7f6f5d11f6383982e54be2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1891,6 +1891,7 @@ config XEN
        bool "Xen guest support on ARM (EXPERIMENTAL)"
        depends on ARM && AEABI && OF
        depends on CPU_V7 && !CPU_V6
+       depends on ARM_PSCI
        depends on !GENERIC_ATOMIC64
        help
          Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

diff --git a/arch/arm/include/asm/xen/hypervisor.h b/arch/arm/include/asm/xen/hypervisor.h
index d7ab99a0c9ebe2499b2c4defca40c0cb4a893358..17b3ea28bdd50d5a9a6e06b1ec579b44439b81b5 100644 (file)
--- a/arch/arm/include/asm/xen/hypervisor.h
+++ b/arch/arm/include/asm/xen/hypervisor.h
@@ -16,4 +16,10 @@ static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
        return PARAVIRT_LAZY_NONE;
 }
 
+#ifdef CONFIG_XEN
+void xen_early_init(void);
+#else
+static inline void xen_early_init(void) { return; }
+#endif
+
 #endif /* _ASM_ARM_XEN_HYPERVISOR_H */

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7e193df7a492d63cb3c9a29fc7e7f46e9f0f45d1..67d911f5be4a504702b78f2077224e86e14b41f6 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -55,6 +55,8 @@
 #include <asm/unwind.h>
 #include <asm/memblock.h>
 #include <asm/virt.h>
+#include <asm/xen/hypervisor.h>
+#include <xen/xen.h>
 
 #include "atags.h"
 #include "tcm.h"
@@ -768,6 +770,7 @@ void __init setup_arch(char **cmdline_p)
 
        arm_dt_init_cpu_maps();
        psci_init();
+       xen_early_init();
 #ifdef CONFIG_SMP
        if (is_smp()) {
                if (mdesc->smp_init)

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index b0028223483493883972b3a6f30cace4955ec532..ee093576b4aa035e2ced1be2147370cdfe381bc6 100644 (file)
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -11,6 +11,8 @@
 #include <xen/xenbus.h>
 #include <xen/page.h>
 #include <xen/xen-ops.h>
+#include <asm/mach/arch.h>
+#include <asm/psci.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
 #include <linux/interrupt.h>
@@ -176,27 +178,30 @@ static int __init xen_secondary_init(unsigned int cpu)
        return 0;
 }
 
+static void __init xen_smp_init(void)
+{
+       if (psci_smp_available())
+               smp_set_ops(&psci_smp_ops);
+}
+
 /*
  * see Documentation/devicetree/bindings/arm/xen.txt for the
  * documentation of the Xen Device Tree format.
  */
 #define GRANT_TABLE_PHYSADDR 0
-static int __init xen_guest_init(void)
+void __init xen_early_init(void)
 {
-       struct xen_add_to_physmap xatp;
-       static struct shared_info *shared_info_page = 0;
        struct device_node *node;
        int len;
        const char *s = NULL;
        const char *version = NULL;
        const char *xen_prefix = "xen,xen-";
        struct resource res;
-       int i;
 
        node = of_find_compatible_node(NULL, NULL, "xen,xen");
        if (!node) {
                pr_debug("No Xen support\n");
-               return 0;
+               return;
        }
        s = of_get_property(node, "compatible", &len);
        if (strlen(xen_prefix) + 3  < len &&
@@ -204,15 +209,23 @@ static int __init xen_guest_init(void)
                version = s + strlen(xen_prefix);
        if (version == NULL) {
                pr_debug("Xen version not found\n");
-               return 0;
+               return;
        }
        if (of_address_to_resource(node, GRANT_TABLE_PHYSADDR, &res))
-               return 0;
+               return;
        xen_hvm_resume_frames = res.start >> PAGE_SHIFT;
        xen_events_irq = irq_of_parse_and_map(node, 0);
        pr_info("Xen %s support found, events_irq=%d gnttab_frame_pfn=%lx\n",
                        version, xen_events_irq, xen_hvm_resume_frames);
        xen_domain_type = XEN_HVM_DOMAIN;
+       machine_desc->smp_init = xen_smp_init;
+}
+
+static int __init xen_guest_init(void)
+{
+       struct xen_add_to_physmap xatp;
+       static struct shared_info *shared_info_page = 0;
+       int i;
 
        xen_setup_features();
        if (xen_feature(XENFEAT_dom0))