Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

  and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm

* 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
  xen: register xen pci notifier
  xen: initialize cpu masks for pv guests in xen_smp_init
  xen: add a missing #include to arch/x86/pci/xen.c
  xen: mask the MTRR feature from the cpuid
  xen: make hvc_xen console work for dom0.
  xen: add the direct mapping area for ISA bus access
  xen: Initialize xenbus for dom0.
  xen: use vcpu_ops to setup cpu masks
  xen: map a dummy page for local apic and ioapic in xen_set_fixmap
  xen: remap MSIs into pirqs when running as initial domain
  xen: remap GSIs as pirqs when running as initial domain
  xen: introduce XEN_DOM0 as a silent option
  xen: map MSIs into pirqs
  xen: support GSI -> pirq remapping in PV on HVM guests
  xen: add xen hvm acpi_register_gsi variant
  acpi: use indirect call to register gsi in different modes
  xen: implement xen_hvm_register_pirq
  xen: get the maximum number of pirqs from xen
  xen: support pirq != irq

* 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
  X86/PCI: Remove the dependency on isapnp_disable.
  xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
  MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
  x86: xen: Sanitse irq handling (part two)
  swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
  MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
  xen/pci: Request ACS when Xen-SWIOTLB is activated.
  xen-pcifront: Xen PCI frontend driver.
  xenbus: prevent warnings on unhandled enumeration values
  xenbus: Xen paravirtualised PCI hotplug support.
  xen/x86/PCI: Add support for the Xen PCI subsystem
  x86: Introduce x86_msi_ops
  msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
  x86/PCI: Export pci_walk_bus function.
  x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
  x86/PCI: Clean up pci_cache_line_size
  xen: fix shared irq device passthrough
  xen: Provide a variant of xen_poll_irq with timeout.
  xen: Find an unbound irq number in reverse order (high to low).
  xen: statically initialize cpu_evtchn_mask_p
  ...

Fix up trivial conflicts in drivers/pci/Makefile

1 files changed, 117 insertions, 0 deletions

diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
new file mode 100644
index 000000000000..cef4bafc07dc
--- /dev/null
+++ b/drivers/xen/pci.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2009, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Author: Weidong Han <weidong.han@intel.com>
+ */
+
+#include <linux/pci.h>
+#include <xen/xen.h>
+#include <xen/interface/physdev.h>
+#include <xen/interface/xen.h>
+
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+#include "../pci/pci.h"
+
+static int xen_add_device(struct device *dev)
+{
+        int r;
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+
+#ifdef CONFIG_PCI_IOV
+        if (pci_dev->is_virtfn) {
+                struct physdev_manage_pci_ext manage_pci_ext = {
+                        .bus            = pci_dev->bus->number,
+                        .devfn          = pci_dev->devfn,
+                        .is_virtfn      = 1,
+                        .physfn.bus     = pci_dev->physfn->bus->number,
+                        .physfn.devfn   = pci_dev->physfn->devfn,
+                };
+
+                r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
+                        &manage_pci_ext);
+        } else
+#endif
+        if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
+                struct physdev_manage_pci_ext manage_pci_ext = {
+                        .bus            = pci_dev->bus->number,
+                        .devfn          = pci_dev->devfn,
+                        .is_extfn       = 1,
+                };
+
+                r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
+                        &manage_pci_ext);
+        } else {
+                struct physdev_manage_pci manage_pci = {
+                        .bus    = pci_dev->bus->number,
+                        .devfn  = pci_dev->devfn,
+                };
+
+                r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add,
+                        &manage_pci);
+        }
+
+        return r;
+}
+
+static int xen_remove_device(struct device *dev)
+{
+        int r;
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct physdev_manage_pci manage_pci;
+
+        manage_pci.bus = pci_dev->bus->number;
+        manage_pci.devfn = pci_dev->devfn;
+
+        r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
+                &manage_pci);
+
+        return r;
+}
+
+static int xen_pci_notifier(struct notifier_block *nb,
+                            unsigned long action, void *data)
+{
+        struct device *dev = data;
+        int r = 0;
+
+        switch (action) {
+        case BUS_NOTIFY_ADD_DEVICE:
+                r = xen_add_device(dev);
+                break;
+        case BUS_NOTIFY_DEL_DEVICE:
+                r = xen_remove_device(dev);
+                break;
+        default:
+                break;
+        }
+
+        return r;
+}
+
+struct notifier_block device_nb = {
+        .notifier_call = xen_pci_notifier,
+};
+
+static int __init register_xen_pci_notifier(void)
+{
+        if (!xen_initial_domain())
+                return 0;
+
+        return bus_register_notifier(&pci_bus_type, &device_nb);
+}
+
+arch_initcall(register_xen_pci_notifier);