xen/arm: initialize grant_table on ARM

Initialize the grant table mapping at the address specified at index 0
in the DT under the /xen node.
After the grant table is initialized, call xenbus_probe (if not dom0).

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

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 2e013cfd69cd01800b9ada1eb407e48407df42ad..854af1ee25af168865b0317a2e15259bc59b853e 100644 (file)
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -1,8 +1,12 @@
 #include <xen/xen.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/memory.h>
+#include <xen/interface/hvm/params.h>
 #include <xen/platform_pci.h>
 #include <xen/features.h>
+#include <xen/grant_table.h>
+#include <xen/hvm.h>
+#include <xen/xenbus.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
 #include <linux/module.h>
@@ -51,12 +55,16 @@ int __init xen_guest_init(void)
        struct xen_add_to_physmap xatp;
        static struct shared_info *shared_info_page = 0;
        struct device_node *node;
+       struct resource res;
 
        node = of_find_compatible_node(NULL, NULL, "arm,xen");
        if (!node) {
                pr_info("No Xen support\n");
                return 0;
        }
+       if (of_address_to_resource(node, 0, &res))
+               return -EINVAL;
+       xen_hvm_resume_frames = res.start >> PAGE_SHIFT;
        xen_domain_type = XEN_HVM_DOMAIN;
 
        xen_setup_features();
@@ -97,6 +105,11 @@ int __init xen_guest_init(void)
                per_cpu(xen_vcpu, cpu) =
                        &HYPERVISOR_shared_info->vcpu_info[cpu];
        }
+
+       gnttab_init();
+       if (!xen_initial_domain())
+               xenbus_probe(NULL);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(xen_guest_init);

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 1d0d95e5b4469184740dfcbba8c31fed4ece2ee4..fd2137a7718a81b3cb0d4f3cdbc6afdd1afb7f63 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -62,7 +62,7 @@
 
 static grant_ref_t **gnttab_list;
 static unsigned int nr_grant_frames;
-static unsigned int boot_max_nr_grant_frames;
+static unsigned int boot_max_nr_grant_frames = 1;
 static int gnttab_free_count;
 static grant_ref_t gnttab_free_head;
 static DEFINE_SPINLOCK(gnttab_list_lock);