Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen bugfixes from Konrad Rzeszutek Wilk:
 "Bug-fixes for the new features that were added during this cycle.

  There are also two fixes for long-standing issues for which we have a
  solution: grant-table operations extra work that was not needed
  causing performance issues and the self balloon code was too
  aggressive causing OOMs.

  Details:
   - Xen ARM couldn't use the new FIFO events
   - Xen ARM couldn't use the SWIOTLB if compiled as 32-bit with 64-bit PCIe devices.
   - Grant table were doing needless M2P operations.
   - Ratchet down the self-balloon code so it won't OOM.
   - Fix misplaced kfree in Xen PVH error code paths"

* tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvh: Fix misplaced kfree from xlated_setup_gnttab_pages
  drivers: xen: deaggressive selfballoon driver
  xen/grant-table: Avoid m2p_override during mapping
  xen/gnttab: Use phys_addr_t to describe the grant frame base address
  xen: swiotlb: handle sizeof(dma_addr_t) != sizeof(phys_addr_t)
  arm/xen: Initialize event channels earlier

2 files changed, 48 insertions, 30 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dc6ef9a2c649..e25419817791 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1905,6 +1905,7 @@ config XEN
         depends on !GENERIC_ATOMIC64
         select ARM_PSCI
         select SWIOTLB_XEN
+        select ARCH_DMA_ADDR_T_64BIT
         help
           Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
 
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 2162172c0ddc..b96723e258a0 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -23,6 +23,7 @@
 #include <linux/of_address.h>
 #include <linux/cpuidle.h>
 #include <linux/cpufreq.h>
+#include <linux/cpu.h>
 
 #include <linux/mm.h>
 
@@ -154,7 +155,7 @@ int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
 }
 EXPORT_SYMBOL_GPL(xen_unmap_domain_mfn_range);
 
-static void __init xen_percpu_init(void *unused)
+static void xen_percpu_init(void)
 {
         struct vcpu_register_vcpu_info info;
         struct vcpu_info *vcpup;
@@ -193,6 +194,31 @@ static void xen_power_off(void)
                 BUG();
 }
 
+static int xen_cpu_notification(struct notifier_block *self,
+                                unsigned long action,
+                                void *hcpu)
+{
+        switch (action) {
+        case CPU_STARTING:
+                xen_percpu_init();
+                break;
+        default:
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block xen_cpu_notifier = {
+        .notifier_call = xen_cpu_notification,
+};
+
+static irqreturn_t xen_arm_callback(int irq, void *arg)
+{
+        xen_hvm_evtchn_do_upcall();
+        return IRQ_HANDLED;
+}
+
 /*
  * see Documentation/devicetree/bindings/arm/xen.txt for the
  * documentation of the Xen Device Tree format.
@@ -208,7 +234,7 @@ static int __init xen_guest_init(void)
         const char *version = NULL;
         const char *xen_prefix = "xen,xen-";
         struct resource res;
-        unsigned long grant_frames;
+        phys_addr_t grant_frames;
 
         node = of_find_compatible_node(NULL, NULL, "xen,xen");
         if (!node) {
@@ -227,8 +253,12 @@ static int __init xen_guest_init(void)
                 return 0;
         grant_frames = res.start;
         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, (grant_frames >> PAGE_SHIFT));
+        pr_info("Xen %s support found, events_irq=%d gnttab_frame=%pa\n",
+                        version, xen_events_irq, &grant_frames);
+
+        if (xen_events_irq < 0)
+                return -ENODEV;
+
         xen_domain_type = XEN_HVM_DOMAIN;
 
         xen_setup_features();
@@ -281,9 +311,21 @@ static int __init xen_guest_init(void)
         disable_cpuidle();
         disable_cpufreq();
 
+        xen_init_IRQ();
+
+        if (request_percpu_irq(xen_events_irq, xen_arm_callback,
+                               "events", &xen_vcpu)) {
+                pr_err("Error request IRQ %d\n", xen_events_irq);
+                return -EINVAL;
+        }
+
+        xen_percpu_init();
+
+        register_cpu_notifier(&xen_cpu_notifier);
+
         return 0;
 }
-core_initcall(xen_guest_init);
+early_initcall(xen_guest_init);
 
 static int __init xen_pm_init(void)
 {
@@ -297,31 +339,6 @@ static int __init xen_pm_init(void)
 }
 late_initcall(xen_pm_init);
 
-static irqreturn_t xen_arm_callback(int irq, void *arg)
-{
-        xen_hvm_evtchn_do_upcall();
-        return IRQ_HANDLED;
-}
-
-static int __init xen_init_events(void)
-{
-        if (!xen_domain() || xen_events_irq < 0)
-                return -ENODEV;
-
-        xen_init_IRQ();
-
-        if (request_percpu_irq(xen_events_irq, xen_arm_callback,
-                        "events", &xen_vcpu)) {
-                pr_err("Error requesting IRQ %d\n", xen_events_irq);
-                return -EINVAL;
-        }
-
-        on_each_cpu(xen_percpu_init, NULL, 0);
-
-        return 0;
-}
-postcore_initcall(xen_init_events);
-
 /* In the hypervisor.S file. */
 EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);