Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull Xen update from Konrad Rzeszutek Wilk:
 "This has two new ACPI drivers for Xen - a physical CPU offline/online
  and a memory hotplug.  The way this works is that ACPI kicks the
  drivers and they make the appropiate hypercall to the hypervisor to
  tell it that there is a new CPU or memory.  There also some changes to
  the Xen ARM ABIs and couple of fixes.  One particularly nasty bug in
  the Xen PV spinlock code was fixed by Stefan Bader - and has been
  there since the 2.6.32!

  Features:
   - Xen ACPI memory and CPU hotplug drivers - allowing Xen hypervisor
     to be aware of new CPU and new DIMMs
   - Cleanups
  Bug-fixes:
   - Fixes a long-standing bug in the PV spinlock wherein we did not
     kick VCPUs that were in a tight loop.
   - Fixes in the error paths for the event channel machinery"

Fix up a few semantic conflicts with the ACPI interface changes in
drivers/xen/xen-acpi-{cpu,mem}hotplug.c.

* tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: event channel arrays are xen_ulong_t and not unsigned long
  xen: Send spinlock IPI to all waiters
  xen: introduce xen_remap, use it instead of ioremap
  xen: close evtchn port if binding to irq fails
  xen-evtchn: correct comment and error output
  xen/tmem: Add missing %s in the printk statement.
  xen/acpi: move xen_acpi_get_pxm under CONFIG_XEN_DOM0
  xen/acpi: ACPI cpu hotplug
  xen/acpi: Move xen_acpi_get_pxm to Xen's acpi.h
  xen/stub: driver for CPU hotplug
  xen/acpi: ACPI memory hotplug
  xen/stub: driver for memory hotplug
  xen: implement updated XENMEM_add_to_physmap_range ABI
  xen/smp: Move the common CPU init code a bit to prep for PVH patch.

7 files changed, 59 insertions, 23 deletions

diff --git a/arch/arm/include/asm/xen/events.h b/arch/arm/include/asm/xen/events.h
index 94b4e9020b02..5c27696de14f 100644
--- a/arch/arm/include/asm/xen/events.h
+++ b/arch/arm/include/asm/xen/events.h
@@ -15,4 +15,26 @@ static inline int xen_irqs_disabled(struct pt_regs *regs)
         return raw_irqs_disabled_flags(regs->ARM_cpsr);
 }
 
+/*
+ * We cannot use xchg because it does not support 8-byte
+ * values. However it is safe to use {ldr,dtd}exd directly because all
+ * platforms which Xen can run on support those instructions.
+ */
+static inline xen_ulong_t xchg_xen_ulong(xen_ulong_t *ptr, xen_ulong_t val)
+{
+        xen_ulong_t oldval;
+        unsigned int tmp;
+
+        wmb();
+        asm volatile("@ xchg_xen_ulong\n"
+                "1:     ldrexd  %0, %H0, [%3]\n"
+                "       strexd  %1, %2, %H2, [%3]\n"
+                "       teq     %1, #0\n"
+                "       bne     1b"
+                : "=&r" (oldval), "=&r" (tmp)
+                : "r" (val), "r" (ptr)
+                : "memory", "cc");
+        return oldval;
+}
+
 #endif /* _ASM_ARM_XEN_EVENTS_H */
diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h
index c6b9096cef95..30cdacb675af 100644
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_ARM_XEN_PAGE_H
 #define _ASM_ARM_XEN_PAGE_H
 
+#include <asm/mach/map.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 
@@ -86,4 +87,7 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 {
         return __set_phys_to_machine(pfn, mfn);
 }
+
+#define xen_remap(cookie, size) __arm_ioremap((cookie), (size), MT_MEMORY);
+
 #endif /* _ASM_ARM_XEN_PAGE_H */
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 7a32976fa2a3..8dc0605a9ce9 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -59,14 +59,16 @@ static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
         };
         xen_ulong_t idx = fgmfn;
         xen_pfn_t gpfn = lpfn;
+        int err = 0;
 
         set_xen_guest_handle(xatp.idxs, &idx);
         set_xen_guest_handle(xatp.gpfns, &gpfn);
+        set_xen_guest_handle(xatp.errs, &err);
 
         rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);
-        if (rc) {
-                pr_warn("Failed to map pfn to mfn rc:%d pfn:%lx mfn:%lx\n",
-                        rc, lpfn, fgmfn);
+        if (rc || err) {
+                pr_warn("Failed to map pfn to mfn rc:%d:%d pfn:%lx mfn:%lx\n",
+                        rc, err, lpfn, fgmfn);
                 return 1;
         }
         return 0;
diff --git a/arch/x86/include/asm/xen/events.h b/arch/x86/include/asm/xen/events.h
index cc146d51449e..ca842f2769ef 100644
--- a/arch/x86/include/asm/xen/events.h
+++ b/arch/x86/include/asm/xen/events.h
@@ -16,4 +16,7 @@ static inline int xen_irqs_disabled(struct pt_regs *regs)
         return raw_irqs_disabled_flags(regs->flags);
 }
 
+/* No need for a barrier -- XCHG is a barrier on x86. */
+#define xchg_xen_ulong(ptr, val) xchg((ptr), (val))
+
 #endif /* _ASM_X86_XEN_EVENTS_H */
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 472b9b783019..6aef9fbc09b7 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -212,4 +212,6 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr);
 void make_lowmem_page_readonly(void *vaddr);
 void make_lowmem_page_readwrite(void *vaddr);
 
+#define xen_remap(cookie, size) ioremap((cookie), (size));
+
 #endif /* _ASM_X86_XEN_PAGE_H */
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 34bc4cee8887..09ea61d2e02f 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -300,8 +300,6 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
         gdt = get_cpu_gdt_table(cpu);
 
         ctxt->flags = VGCF_IN_KERNEL;
-        ctxt->user_regs.ds = __USER_DS;
-        ctxt->user_regs.es = __USER_DS;
         ctxt->user_regs.ss = __KERNEL_DS;
 #ifdef CONFIG_X86_32
         ctxt->user_regs.fs = __KERNEL_PERCPU;
@@ -310,35 +308,41 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
         ctxt->gs_base_kernel = per_cpu_offset(cpu);
 #endif
         ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
-        ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
 
         memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
 
-        xen_copy_trap_info(ctxt->trap_ctxt);
+        {
+                ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
+                ctxt->user_regs.ds = __USER_DS;
+                ctxt->user_regs.es = __USER_DS;
 
-        ctxt->ldt_ents = 0;
+                xen_copy_trap_info(ctxt->trap_ctxt);
 
-        BUG_ON((unsigned long)gdt & ~PAGE_MASK);
+                ctxt->ldt_ents = 0;
 
-        gdt_mfn = arbitrary_virt_to_mfn(gdt);
-        make_lowmem_page_readonly(gdt);
-        make_lowmem_page_readonly(mfn_to_virt(gdt_mfn));
+                BUG_ON((unsigned long)gdt & ~PAGE_MASK);
 
-        ctxt->gdt_frames[0] = gdt_mfn;
-        ctxt->gdt_ents      = GDT_ENTRIES;
+                gdt_mfn = arbitrary_virt_to_mfn(gdt);
+                make_lowmem_page_readonly(gdt);
+                make_lowmem_page_readonly(mfn_to_virt(gdt_mfn));
 
-        ctxt->user_regs.cs = __KERNEL_CS;
-        ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);
+                ctxt->gdt_frames[0] = gdt_mfn;
+                ctxt->gdt_ents      = GDT_ENTRIES;
 
-        ctxt->kernel_ss = __KERNEL_DS;
-        ctxt->kernel_sp = idle->thread.sp0;
+                ctxt->kernel_ss = __KERNEL_DS;
+                ctxt->kernel_sp = idle->thread.sp0;
 
 #ifdef CONFIG_X86_32
-        ctxt->event_callback_cs     = __KERNEL_CS;
-        ctxt->failsafe_callback_cs  = __KERNEL_CS;
+                ctxt->event_callback_cs     = __KERNEL_CS;
+                ctxt->failsafe_callback_cs  = __KERNEL_CS;
 #endif
-        ctxt->event_callback_eip    = (unsigned long)xen_hypervisor_callback;
-        ctxt->failsafe_callback_eip = (unsigned long)xen_failsafe_callback;
+                ctxt->event_callback_eip    =
+                                        (unsigned long)xen_hypervisor_callback;
+                ctxt->failsafe_callback_eip =
+                                        (unsigned long)xen_failsafe_callback;
+        }
+        ctxt->user_regs.cs = __KERNEL_CS;
+        ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);
 
         per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);
         ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 83e866d714ce..f7a080ef0354 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -328,7 +328,6 @@ static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)
                 if (per_cpu(lock_spinners, cpu) == xl) {
                         ADD_STATS(released_slow_kicked, 1);
                         xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);
-                        break;
                 }
         }
 }