Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (49 commits)
  [PATCH] acpiphp: fix acpi_path_name
  [PATCH] ibmphp: remove TRUE and FALSE
  [PATCH] PCI Hotplug: add common acpi functions to core
  [PATCH] PCI: kzalloc() conversion in drivers/pci
  [PATCH] acpiphp: Scan slots under the nested P2P bridge
  [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB
  [PATCH] shpchp: cleanup bus speed handling
  [PATCH] PCI: fix pci_request_region[s] arg
  [PATCH] PCI: Provide a boot parameter to disable MSI
  [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC
  [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code
  [PATCH] acpiphp: fix bridge handle
  [PATCH] acpiphp - slot management fix - V4
  [PATCH] acpi: remove dock event handling from ibm_acpi
  [PATCH] acpiphp: add dock event handling
  [PATCH] acpi: export acpi_bus_trim
  [PATCH] acpiphp: add new bus to acpi
  [PATCH] PCI: Move pci_dev_put outside a spinlock
  [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix
  [PATCH] PCI: fix problems with MSI-X on ia64
  ...

1 files changed, 69 insertions, 2 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dda6099903c1..4970f47be72c 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -575,8 +575,11 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
 { 
         unsigned char revid, tmp;
         
-        pci_msi_quirk = 1;
-        printk(KERN_WARNING "PCI: MSI quirk detected. pci_msi_quirk set.\n");
+        if (dev->subordinate) {
+                printk(KERN_WARNING "PCI: MSI quirk detected. "
+                       "PCI_BUS_FLAGS_NO_MSI set for subordinate bus.\n");
+                dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
+        }
 
         if (nr_ioapics == 0) 
                 return;
@@ -934,6 +937,12 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                         case 0x12bd: /* HP D530 */
                                 asus_hides_smbus = 1;
                         }
+                if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) {
+                        switch (dev->subsystem_device) {
+                        case 0x099c: /* HP Compaq nx6110 */
+                                asus_hides_smbus = 1;
+                        }
+                }
         } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_TOSHIBA)) {
                 if (dev->device == PCI_DEVICE_ID_INTEL_82855GM_HB)
                         switch(dev->subsystem_device) {
@@ -1068,6 +1077,37 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_651,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_735,           quirk_sis_96x_compatible );
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503 );
+/*
+ * On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
+ * and MC97 modem controller are disabled when a second PCI soundcard is
+ * present. This patch, tweaking the VT8237 ISA bridge, enables them.
+ * -- bjd
+ */
+static void __init asus_hides_ac97_lpc(struct pci_dev *dev)
+{
+        u8 val;
+        int asus_hides_ac97 = 0;
+
+        if (likely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) {
+                if (dev->device == PCI_DEVICE_ID_VIA_8237)
+                        asus_hides_ac97 = 1;
+        }
+
+        if (!asus_hides_ac97)
+                return;
+
+        pci_read_config_byte(dev, 0x50, &val);
+        if (val & 0xc0) {
+                pci_write_config_byte(dev, 0x50, val & (~0xc0));
+                pci_read_config_byte(dev, 0x50, &val);
+                if (val & 0xc0)
+                        printk(KERN_INFO "PCI: onboard AC97/MC97 devices continue to play 'hide and seek'! 0x%x\n", val);
+                else
+                        printk(KERN_INFO "PCI: enabled onboard AC97/MC97 devices\n");
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc );
+
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_961,           quirk_sis_96x_smbus );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus );
@@ -1242,6 +1282,33 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_PXH_1,	quirk_pc
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_PXHV,       quirk_pcie_pxh);
 
 
+/*
+ * Fixup the cardbus bridges on the IBM Dock II docking station
+ */
+static void __devinit quirk_ibm_dock2_cardbus(struct pci_dev *dev)
+{
+        u32 val;
+
+        /*
+         * tie the 2 interrupt pins to INTA, and configure the
+         * multifunction routing register to handle this.
+         */
+        if ((dev->subsystem_vendor == PCI_VENDOR_ID_IBM) &&
+                (dev->subsystem_device == 0x0148)) {
+                printk(KERN_INFO "PCI: Found IBM Dock II Cardbus Bridge "
+                        "applying quirk\n");
+                pci_read_config_dword(dev, 0x8c, &val);
+                val = ((val & 0xffffff00) | 0x1002);
+                pci_write_config_dword(dev, 0x8c, val);
+                pci_read_config_dword(dev, 0x80, &val);
+                val = ((val & 0x00ffff00) | 0x2864c077);
+                pci_write_config_dword(dev, 0x80, val);
+        }
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1420,
+                                quirk_ibm_dock2_cardbus);
+
 static void __devinit quirk_netmos(struct pci_dev *dev)
 {
         unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;