Merge tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI changes from Bjorn Helgaas:
 - Host bridge cleanups from Yinghai
 - Disable Bus Master bit on PCI device shutdown (kexec-related)
 - Stratus ftServer fix
 - pci_dev_reset() locking fix
 - IvyBridge graphics erratum workaround

* tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
  microblaze/PCI: fix "io_offset undeclared" error
  x86/PCI: only check for spinlock being held in SMP kernels
  resources: add resource_overlaps()
  PCI: fix uninitialized variable 'cap_mask'
  MAINTAINERS: update PCI git tree and patchwork
  PCI: disable Bus Master on PCI device shutdown
  PCI: work around IvyBridge internal graphics FLR erratum
  x86/PCI: fix unused variable warning in amd_bus.c
  PCI: move mutex locking out of pci_dev_reset function
  PCI: work around Stratus ftServer broken PCIe hierarchy
  x86/PCI: merge pcibios_scan_root() and pci_scan_bus_on_node()
  x86/PCI: dynamically allocate pci_root_info for native host bridge drivers
  x86/PCI: embed pci_sysdata into pci_root_info on ACPI path
  x86/PCI: embed name into pci_root_info struct
  x86/PCI: add host bridge resource release for _CRS path
  x86/PCI: refactor get_current_resources()
  PCI: add host bridge release support
  PCI: add generic device into pci_host_bridge struct
  PCI: rename pci_host_bridge() to find_pci_root_bridge()
  x86/PCI: fix memleak with get_current_resources()
  ...

1 files changed, 58 insertions, 0 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 953ec3f08470..2a7521677541 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3097,16 +3097,74 @@ static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)
         return 0;
 }
 
+#include "../gpu/drm/i915/i915_reg.h"
+#define MSG_CTL                 0x45010
+#define NSDE_PWR_STATE          0xd0100
+#define IGD_OPERATION_TIMEOUT   10000     /* set timeout 10 seconds */
+
+static int reset_ivb_igd(struct pci_dev *dev, int probe)
+{
+        void __iomem *mmio_base;
+        unsigned long timeout;
+        u32 val;
+
+        if (probe)
+                return 0;
+
+        mmio_base = pci_iomap(dev, 0, 0);
+        if (!mmio_base)
+                return -ENOMEM;
+
+        iowrite32(0x00000002, mmio_base + MSG_CTL);
+
+        /*
+         * Clobbering SOUTH_CHICKEN2 register is fine only if the next
+         * driver loaded sets the right bits. However, this's a reset and
+         * the bits have been set by i915 previously, so we clobber
+         * SOUTH_CHICKEN2 register directly here.
+         */
+        iowrite32(0x00000005, mmio_base + SOUTH_CHICKEN2);
+
+        val = ioread32(mmio_base + PCH_PP_CONTROL) & 0xfffffffe;
+        iowrite32(val, mmio_base + PCH_PP_CONTROL);
+
+        timeout = jiffies + msecs_to_jiffies(IGD_OPERATION_TIMEOUT);
+        do {
+                val = ioread32(mmio_base + PCH_PP_STATUS);
+                if ((val & 0xb0000000) == 0)
+                        goto reset_complete;
+                msleep(10);
+        } while (time_before(jiffies, timeout));
+        dev_warn(&dev->dev, "timeout during reset\n");
+
+reset_complete:
+        iowrite32(0x00000002, mmio_base + NSDE_PWR_STATE);
+
+        pci_iounmap(dev, mmio_base);
+        return 0;
+}
+
 #define PCI_DEVICE_ID_INTEL_82599_SFP_VF   0x10ed
+#define PCI_DEVICE_ID_INTEL_IVB_M_VGA      0x0156
+#define PCI_DEVICE_ID_INTEL_IVB_M2_VGA     0x0166
 
 static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,
                  reset_intel_82599_sfp_virtfn },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_M_VGA,
+                reset_ivb_igd },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_M2_VGA,
+                reset_ivb_igd },
         { PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
                 reset_intel_generic_dev },
         { 0 }
 };
 
+/*
+ * These device-specific reset methods are here rather than in a driver
+ * because when a host assigns a device to a guest VM, the host may need
+ * to reset the device but probably doesn't have a driver for it.
+ */
 int pci_dev_specific_reset(struct pci_dev *dev, int probe)
 {
         const struct pci_dev_reset_methods *i;