Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

9 files changed, 77 insertions, 83 deletions

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index b7a506f2bb14..5c660c77f03b 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -426,20 +426,18 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp)
                  * p2m are consistent.
                  */
                 if (!xen_feature(XENFEAT_auto_translated_physmap)) {
-                        unsigned long p;
-                        struct page   *scratch_page = get_balloon_scratch_page();
-
                         if (!PageHighMem(page)) {
+                                struct page *scratch_page = get_balloon_scratch_page();
+
                                 ret = HYPERVISOR_update_va_mapping(
                                                 (unsigned long)__va(pfn << PAGE_SHIFT),
                                                 pfn_pte(page_to_pfn(scratch_page),
                                                         PAGE_KERNEL_RO), 0);
                                 BUG_ON(ret);
-                        }
-                        p = page_to_pfn(scratch_page);
-                        __set_phys_to_machine(pfn, pfn_to_mfn(p));
 
-                        put_balloon_scratch_page();
+                                put_balloon_scratch_page();
+                        }
+                        __set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
                 }
 #endif
 
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index dfa12a4a0a48..c919d3d5c845 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -390,22 +390,7 @@ static void xen_irq_init(unsigned irq)
 
 static int __must_check xen_allocate_irqs_dynamic(int nvec)
 {
-        int first = 0;
-        int i, irq;
-
-#ifdef CONFIG_X86_IO_APIC
-        /*
-         * For an HVM guest or domain 0 which see "real" (emulated or
-         * actual respectively) GSIs we allocate dynamic IRQs
-         * e.g. those corresponding to event channels or MSIs
-         * etc. from the range above those "real" GSIs to avoid
-         * collisions.
-         */
-        if (xen_initial_domain() || xen_hvm_domain())
-                first = get_nr_irqs_gsi();
-#endif
-
-        irq = irq_alloc_descs_from(first, nvec, -1);
+        int i, irq = irq_alloc_descs(-1, 0, nvec, -1);
 
         if (irq >= 0) {
                 for (i = 0; i < nvec; i++)
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index 96109a9972b6..84b4bfb84344 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -66,7 +66,22 @@ static DEFINE_PER_CPU(struct evtchn_fifo_queue, cpu_queue);
 static event_word_t *event_array[MAX_EVENT_ARRAY_PAGES] __read_mostly;
 static unsigned event_array_pages __read_mostly;
 
+/*
+ * sync_set_bit() and friends must be unsigned long aligned on non-x86
+ * platforms.
+ */
+#if !defined(CONFIG_X86) && BITS_PER_LONG > 32
+
+#define BM(w) (unsigned long *)((unsigned long)w & ~0x7UL)
+#define EVTCHN_FIFO_BIT(b, w) \
+    (((unsigned long)w & 0x4UL) ? (EVTCHN_FIFO_ ##b + 32) : EVTCHN_FIFO_ ##b)
+
+#else
+
 #define BM(w) ((unsigned long *)(w))
+#define EVTCHN_FIFO_BIT(b, w) EVTCHN_FIFO_ ##b
+
+#endif
 
 static inline event_word_t *event_word_from_port(unsigned port)
 {
@@ -161,33 +176,38 @@ static void evtchn_fifo_bind_to_cpu(struct irq_info *info, unsigned cpu)
 static void evtchn_fifo_clear_pending(unsigned port)
 {
         event_word_t *word = event_word_from_port(port);
-        sync_clear_bit(EVTCHN_FIFO_PENDING, BM(word));
+        sync_clear_bit(EVTCHN_FIFO_BIT(PENDING, word), BM(word));
 }
 
 static void evtchn_fifo_set_pending(unsigned port)
 {
         event_word_t *word = event_word_from_port(port);
-        sync_set_bit(EVTCHN_FIFO_PENDING, BM(word));
+        sync_set_bit(EVTCHN_FIFO_BIT(PENDING, word), BM(word));
 }
 
 static bool evtchn_fifo_is_pending(unsigned port)
 {
         event_word_t *word = event_word_from_port(port);
-        return sync_test_bit(EVTCHN_FIFO_PENDING, BM(word));
+        return sync_test_bit(EVTCHN_FIFO_BIT(PENDING, word), BM(word));
 }
 
 static bool evtchn_fifo_test_and_set_mask(unsigned port)
 {
         event_word_t *word = event_word_from_port(port);
-        return sync_test_and_set_bit(EVTCHN_FIFO_MASKED, BM(word));
+        return sync_test_and_set_bit(EVTCHN_FIFO_BIT(MASKED, word), BM(word));
 }
 
 static void evtchn_fifo_mask(unsigned port)
 {
         event_word_t *word = event_word_from_port(port);
-        sync_set_bit(EVTCHN_FIFO_MASKED, BM(word));
+        sync_set_bit(EVTCHN_FIFO_BIT(MASKED, word), BM(word));
 }
 
+static bool evtchn_fifo_is_masked(unsigned port)
+{
+        event_word_t *word = event_word_from_port(port);
+        return sync_test_bit(EVTCHN_FIFO_BIT(MASKED, word), BM(word));
+}
 /*
  * Clear MASKED, spinning if BUSY is set.
  */
@@ -211,7 +231,7 @@ static void evtchn_fifo_unmask(unsigned port)
         BUG_ON(!irqs_disabled());
 
         clear_masked(word);
-        if (sync_test_bit(EVTCHN_FIFO_PENDING, BM(word))) {
+        if (evtchn_fifo_is_pending(port)) {
                 struct evtchn_unmask unmask = { .port = port };
                 (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
         }
@@ -243,7 +263,7 @@ static void handle_irq_for_port(unsigned port)
 
 static void consume_one_event(unsigned cpu,
                               struct evtchn_fifo_control_block *control_block,
-                              unsigned priority, uint32_t *ready)
+                              unsigned priority, unsigned long *ready)
 {
         struct evtchn_fifo_queue *q = &per_cpu(cpu_queue, cpu);
         uint32_t head;
@@ -273,10 +293,9 @@ static void consume_one_event(unsigned cpu,
          * copy of the ready word.
          */
         if (head == 0)
-                clear_bit(priority, BM(ready));
+                clear_bit(priority, ready);
 
-        if (sync_test_bit(EVTCHN_FIFO_PENDING, BM(word))
-            && !sync_test_bit(EVTCHN_FIFO_MASKED, BM(word)))
+        if (evtchn_fifo_is_pending(port) && !evtchn_fifo_is_masked(port))
                 handle_irq_for_port(port);
 
         q->head[priority] = head;
@@ -285,7 +304,7 @@ static void consume_one_event(unsigned cpu,
 static void evtchn_fifo_handle_events(unsigned cpu)
 {
         struct evtchn_fifo_control_block *control_block;
-        uint32_t ready;
+        unsigned long ready;
         unsigned q;
 
         control_block = per_cpu(cpu_control_block, cpu);
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 6d325bda76da..5d4de88fe5b8 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1168,7 +1168,8 @@ int gnttab_resume(void)
 
 int gnttab_suspend(void)
 {
-        gnttab_interface->unmap_frames();
+        if (!xen_feature(XENFEAT_auto_translated_physmap))
+                gnttab_interface->unmap_frames();
         return 0;
 }
 
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 32f9236c959f..5f1e1f3cd186 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -41,9 +41,6 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
 
 struct suspend_info {
         int cancelled;
-        unsigned long arg; /* extra hypercall argument */
-        void (*pre)(void);
-        void (*post)(int cancelled);
 };
 
 static RAW_NOTIFIER_HEAD(xen_resume_notifier);
@@ -61,26 +58,6 @@ void xen_resume_notifier_unregister(struct notifier_block *nb)
 EXPORT_SYMBOL_GPL(xen_resume_notifier_unregister);
 
 #ifdef CONFIG_HIBERNATE_CALLBACKS
-static void xen_hvm_post_suspend(int cancelled)
-{
-        xen_arch_hvm_post_suspend(cancelled);
-        gnttab_resume();
-}
-
-static void xen_pre_suspend(void)
-{
-        xen_mm_pin_all();
-        gnttab_suspend();
-        xen_arch_pre_suspend();
-}
-
-static void xen_post_suspend(int cancelled)
-{
-        xen_arch_post_suspend(cancelled);
-        gnttab_resume();
-        xen_mm_unpin_all();
-}
-
 static int xen_suspend(void *data)
 {
         struct suspend_info *si = data;
@@ -94,22 +71,23 @@ static int xen_suspend(void *data)
                 return err;
         }
 
-        if (si->pre)
-                si->pre();
+        gnttab_suspend();
+        xen_arch_pre_suspend();
 
         /*
          * This hypercall returns 1 if suspend was cancelled
          * or the domain was merely checkpointed, and 0 if it
          * is resuming in a new domain.
          */
-        si->cancelled = HYPERVISOR_suspend(si->arg);
+        si->cancelled = HYPERVISOR_suspend(xen_pv_domain()
+                                           ? virt_to_mfn(xen_start_info)
+                                           : 0);
 
-        if (si->post)
-                si->post(si->cancelled);
+        xen_arch_post_suspend(si->cancelled);
+        gnttab_resume();
 
         if (!si->cancelled) {
                 xen_irq_resume();
-                xen_console_resume();
                 xen_timer_resume();
         }
 
@@ -154,18 +132,12 @@ static void do_suspend(void)
 
         si.cancelled = 1;
 
-        if (xen_hvm_domain()) {
-                si.arg = 0UL;
-                si.pre = NULL;
-                si.post = &xen_hvm_post_suspend;
-        } else {
-                si.arg = virt_to_mfn(xen_start_info);
-                si.pre = &xen_pre_suspend;
-                si.post = &xen_post_suspend;
-        }
-
         err = stop_machine(xen_suspend, &si, cpumask_of(0));
 
+        /* Resume console as early as possible. */
+        if (!si.cancelled)
+                xen_console_resume();
+
         raw_notifier_call_chain(&xen_resume_notifier, 0, NULL);
 
         dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 82358d14ecf1..59fc190f1e92 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -127,7 +127,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
                         pr_debug("     C%d: %s %d uS\n",
                                  cx->type, cx->desc, (u32)cx->latency);
                 }
-        } else if (ret != -EINVAL)
+        } else if ((ret != -EINVAL) && (ret != -ENOSYS))
                 /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
                  * table is referencing a non-existing CPU - which can happen
                  * with broken ACPI tables. */
@@ -259,7 +259,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr)
                         (u32) perf->states[i].power,
                         (u32) perf->states[i].transition_latency);
                 }
-        } else if (ret != -EINVAL)
+        } else if ((ret != -EINVAL) && (ret != -ENOSYS))
                 /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
                  * table is referencing a non-existing CPU - which can happen
                  * with broken ACPI tables. */
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index 62fcd485f0a7..d57a173685f3 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -242,6 +242,15 @@ struct pci_dev *pcistub_get_pci_dev(struct xen_pcibk_device *pdev,
         return found_dev;
 }
 
+/*
+ * Called when:
+ *  - XenBus state has been reconfigure (pci unplug). See xen_pcibk_remove_device
+ *  - XenBus state has been disconnected (guest shutdown). See xen_pcibk_xenbus_remove
+ *  - 'echo BDF > unbind' on pciback module with no guest attached. See pcistub_remove
+ *  - 'echo BDF > unbind' with a guest still using it. See pcistub_remove
+ *
+ *  As such we have to be careful.
+ */
 void pcistub_put_pci_dev(struct pci_dev *dev)
 {
         struct pcistub_device *psdev, *found_psdev = NULL;
@@ -272,16 +281,16 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
          * and want to inhibit the user from fiddling with 'reset'
          */
         pci_reset_function(dev);
-        pci_restore_state(psdev->dev);
+        pci_restore_state(dev);
 
         /* This disables the device. */
-        xen_pcibk_reset_device(found_psdev->dev);
+        xen_pcibk_reset_device(dev);
 
         /* And cleanup up our emulated fields. */
-        xen_pcibk_config_free_dyn_fields(found_psdev->dev);
-        xen_pcibk_config_reset_dev(found_psdev->dev);
+        xen_pcibk_config_reset_dev(dev);
+        xen_pcibk_config_free_dyn_fields(dev);
 
-        xen_unregister_device_domain_owner(found_psdev->dev);
+        xen_unregister_device_domain_owner(dev);
 
         spin_lock_irqsave(&found_psdev->lock, flags);
         found_psdev->pdev = NULL;
@@ -493,6 +502,8 @@ static int pcistub_seize(struct pci_dev *dev)
         return err;
 }
 
+/* Called when 'bind'. This means we must _NOT_ call pci_reset_function or
+ * other functions that take the sysfs lock. */
 static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
         int err = 0;
@@ -520,6 +531,8 @@ out:
         return err;
 }
 
+/* Called when 'unbind'. This means we must _NOT_ call pci_reset_function or
+ * other functions that take the sysfs lock. */
 static void pcistub_remove(struct pci_dev *dev)
 {
         struct pcistub_device *psdev, *found_psdev = NULL;
@@ -551,6 +564,8 @@ static void pcistub_remove(struct pci_dev *dev)
                         pr_warn("****** shutdown driver domain before binding device\n");
                         pr_warn("****** to other drivers or domains\n");
 
+                        /* N.B. This ends up calling pcistub_put_pci_dev which ends up
+                         * doing the FLR. */
                         xen_pcibk_release_pci_dev(found_psdev->pdev,
                                                 found_psdev->dev);
                 }
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index 607e41460c0d..c4a0666de6f5 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -348,9 +348,9 @@ void xen_pcibk_do_op(struct work_struct *data)
         notify_remote_via_irq(pdev->evtchn_irq);
 
         /* Mark that we're done. */
-        smp_mb__before_clear_bit(); /* /after/ clearing PCIF_active */
+        smp_mb__before_atomic(); /* /after/ clearing PCIF_active */
         clear_bit(_PDEVF_op_active, &pdev->flags);
-        smp_mb__after_clear_bit(); /* /before/ final check for work */
+        smp_mb__after_atomic(); /* /before/ final check for work */
 
         /* Check to see if the driver domain tried to start another request in
          * between clearing _XEN_PCIF_active and clearing _PDEVF_op_active.
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index a9ed867afaba..4a7e6e0a5f4c 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -93,6 +93,8 @@ static void free_pdev(struct xen_pcibk_device *pdev)
 
         xen_pcibk_disconnect(pdev);
 
+        /* N.B. This calls pcistub_put_pci_dev which does the FLR on all
+         * of the PCIe devices. */
         xen_pcibk_release_devices(pdev);
 
         dev_set_drvdata(&pdev->xdev->dev, NULL);
@@ -286,6 +288,8 @@ static int xen_pcibk_remove_device(struct xen_pcibk_device *pdev,
         dev_dbg(&dev->dev, "unregistering for %d\n", pdev->xdev->otherend_id);
         xen_unregister_device_domain_owner(dev);
 
+        /* N.B. This ends up calling pcistub_put_pci_dev which ends up
+         * doing the FLR. */
         xen_pcibk_release_pci_dev(pdev, dev);
 
 out: