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: (169 commits)
  commit 78a596b4490e17b9990d87b9d468ef5bb70daa10
  Author: Adrian Bunk <bunk@stusta.de>
  Date:   Fri Mar 31 01:38:12 2006 -0800
  
      [PATCH] remove kernel/power/pm.c:pm_unregister()
      
      Since the last user is removed in -mm, we can now remove this long deprecated
      function.
      
      Signed-off-by: Adrian Bunk <bunk@stusta.de>
      Cc: Pavel Machek <pavel@ucw.cz>
      Signed-off-by: Andrew Morton <akpm@osdl.org>
      Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  commit 21440d313358043b0ce5e43b00ff3c9b35a8616c
  Author: David Brownell <david-b@pacbell.net>
  Date:   Sat Apr 1 10:21:52 2006 -0800
  
      [PATCH] dma doc updates
      
  ...

5 files changed, 218 insertions, 33 deletions

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 6e79f5675b0d..638004546700 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -360,9 +360,6 @@ static int __init rpaphp_init(void)
         while ((dn = of_find_node_by_type(dn, "pci")))
                 rpaphp_add_slot(dn);
 
-        if (!num_slots)
-                return -ENODEV;
-
         return 0;
 }
 
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index a77e79c8c82e..2087a397ef16 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -504,6 +504,201 @@ void pci_scan_msi_device(struct pci_dev *dev)
                 nr_reserved_vectors++;
 }
 
+#ifdef CONFIG_PM
+int pci_save_msi_state(struct pci_dev *dev)
+{
+        int pos, i = 0;
+        u16 control;
+        struct pci_cap_saved_state *save_state;
+        u32 *cap;
+
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+        if (pos <= 0 || dev->no_msi)
+                return 0;
+
+        pci_read_config_word(dev, msi_control_reg(pos), &control);
+        if (!(control & PCI_MSI_FLAGS_ENABLE))
+                return 0;
+
+        save_state = kzalloc(sizeof(struct pci_cap_saved_state) + sizeof(u32) * 5,
+                GFP_KERNEL);
+        if (!save_state) {
+                printk(KERN_ERR "Out of memory in pci_save_msi_state\n");
+                return -ENOMEM;
+        }
+        cap = &save_state->data[0];
+
+        pci_read_config_dword(dev, pos, &cap[i++]);
+        control = cap[0] >> 16;
+        pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, &cap[i++]);
+        if (control & PCI_MSI_FLAGS_64BIT) {
+                pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, &cap[i++]);
+                pci_read_config_dword(dev, pos + PCI_MSI_DATA_64, &cap[i++]);
+        } else
+                pci_read_config_dword(dev, pos + PCI_MSI_DATA_32, &cap[i++]);
+        if (control & PCI_MSI_FLAGS_MASKBIT)
+                pci_read_config_dword(dev, pos + PCI_MSI_MASK_BIT, &cap[i++]);
+        disable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
+        save_state->cap_nr = PCI_CAP_ID_MSI;
+        pci_add_saved_cap(dev, save_state);
+        return 0;
+}
+
+void pci_restore_msi_state(struct pci_dev *dev)
+{
+        int i = 0, pos;
+        u16 control;
+        struct pci_cap_saved_state *save_state;
+        u32 *cap;
+
+        save_state = pci_find_saved_cap(dev, PCI_CAP_ID_MSI);
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+        if (!save_state || pos <= 0)
+                return;
+        cap = &save_state->data[0];
+
+        control = cap[i++] >> 16;
+        pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, cap[i++]);
+        if (control & PCI_MSI_FLAGS_64BIT) {
+                pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, cap[i++]);
+                pci_write_config_dword(dev, pos + PCI_MSI_DATA_64, cap[i++]);
+        } else
+                pci_write_config_dword(dev, pos + PCI_MSI_DATA_32, cap[i++]);
+        if (control & PCI_MSI_FLAGS_MASKBIT)
+                pci_write_config_dword(dev, pos + PCI_MSI_MASK_BIT, cap[i++]);
+        pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
+        enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
+        pci_remove_saved_cap(save_state);
+        kfree(save_state);
+}
+
+int pci_save_msix_state(struct pci_dev *dev)
+{
+        int pos;
+        u16 control;
+        struct pci_cap_saved_state *save_state;
+
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
+        if (pos <= 0 || dev->no_msi)
+                return 0;
+
+        pci_read_config_word(dev, msi_control_reg(pos), &control);
+        if (!(control & PCI_MSIX_FLAGS_ENABLE))
+                return 0;
+        save_state = kzalloc(sizeof(struct pci_cap_saved_state) + sizeof(u16),
+                GFP_KERNEL);
+        if (!save_state) {
+                printk(KERN_ERR "Out of memory in pci_save_msix_state\n");
+                return -ENOMEM;
+        }
+        *((u16 *)&save_state->data[0]) = control;
+
+        disable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
+        save_state->cap_nr = PCI_CAP_ID_MSIX;
+        pci_add_saved_cap(dev, save_state);
+        return 0;
+}
+
+void pci_restore_msix_state(struct pci_dev *dev)
+{
+        u16 save;
+        int pos;
+        int vector, head, tail = 0;
+        void __iomem *base;
+        int j;
+        struct msg_address address;
+        struct msg_data data;
+        struct msi_desc *entry;
+        int temp;
+        struct pci_cap_saved_state *save_state;
+
+        save_state = pci_find_saved_cap(dev, PCI_CAP_ID_MSIX);
+        if (!save_state)
+                return;
+        save = *((u16 *)&save_state->data[0]);
+        pci_remove_saved_cap(save_state);
+        kfree(save_state);
+
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
+        if (pos <= 0)
+                return;
+
+        /* route the table */
+        temp = dev->irq;
+        if (msi_lookup_vector(dev, PCI_CAP_ID_MSIX))
+                return;
+        vector = head = dev->irq;
+        while (head != tail) {
+                entry = msi_desc[vector];
+                base = entry->mask_base;
+                j = entry->msi_attrib.entry_nr;
+
+                msi_address_init(&address);
+                msi_data_init(&data, vector);
+
+                address.lo_address.value &= MSI_ADDRESS_DEST_ID_MASK;
+                address.lo_address.value |= entry->msi_attrib.current_cpu <<
+                                        MSI_TARGET_CPU_SHIFT;
+
+                writel(address.lo_address.value,
+                        base + j * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+                writel(address.hi_address,
+                        base + j * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
+                writel(*(u32*)&data,
+                        base + j * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_DATA_OFFSET);
+
+                tail = msi_desc[vector]->link.tail;
+                vector = tail;
+        }
+        dev->irq = temp;
+
+        pci_write_config_word(dev, msi_control_reg(pos), save);
+        enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
+}
+#endif
+
+static void msi_register_init(struct pci_dev *dev, struct msi_desc *entry)
+{
+        struct msg_address address;
+        struct msg_data data;
+        int pos, vector = dev->irq;
+        u16 control;
+
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+        pci_read_config_word(dev, msi_control_reg(pos), &control);
+        /* Configure MSI capability structure */
+        msi_address_init(&address);
+        msi_data_init(&data, vector);
+        entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
+                                MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
+        pci_write_config_dword(dev, msi_lower_address_reg(pos),
+                        address.lo_address.value);
+        if (is_64bit_address(control)) {
+                pci_write_config_dword(dev,
+                        msi_upper_address_reg(pos), address.hi_address);
+                pci_write_config_word(dev,
+                        msi_data_reg(pos, 1), *((u32*)&data));
+        } else
+                pci_write_config_word(dev,
+                        msi_data_reg(pos, 0), *((u32*)&data));
+        if (entry->msi_attrib.maskbit) {
+                unsigned int maskbits, temp;
+                /* All MSIs are unmasked by default, Mask them all */
+                pci_read_config_dword(dev,
+                        msi_mask_bits_reg(pos, is_64bit_address(control)),
+                        &maskbits);
+                temp = (1 << multi_msi_capable(control));
+                temp = ((temp - 1) & ~temp);
+                maskbits |= temp;
+                pci_write_config_dword(dev,
+                        msi_mask_bits_reg(pos, is_64bit_address(control)),
+                        maskbits);
+        }
+}
+
 /**
  * msi_capability_init - configure device's MSI capability structure
  * @dev: pointer to the pci_dev data structure of MSI device function
@@ -516,8 +711,6 @@ void pci_scan_msi_device(struct pci_dev *dev)
 static int msi_capability_init(struct pci_dev *dev)
 {
         struct msi_desc *entry;
-        struct msg_address address;
-        struct msg_data data;
         int pos, vector;
         u16 control;
 
@@ -549,33 +742,8 @@ static int msi_capability_init(struct pci_dev *dev)
         /* Replace with MSI handler */
         irq_handler_init(PCI_CAP_ID_MSI, vector, entry->msi_attrib.maskbit);
         /* Configure MSI capability structure */
-        msi_address_init(&address);
-        msi_data_init(&data, vector);
-        entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
-                                MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
-        pci_write_config_dword(dev, msi_lower_address_reg(pos),
-                        address.lo_address.value);
-        if (is_64bit_address(control)) {
-                pci_write_config_dword(dev,
-                        msi_upper_address_reg(pos), address.hi_address);
-                pci_write_config_word(dev,
-                        msi_data_reg(pos, 1), *((u32*)&data));
-        } else
-                pci_write_config_word(dev,
-                        msi_data_reg(pos, 0), *((u32*)&data));
-        if (entry->msi_attrib.maskbit) {
-                unsigned int maskbits, temp;
-                /* All MSIs are unmasked by default, Mask them all */
-                pci_read_config_dword(dev,
-                        msi_mask_bits_reg(pos, is_64bit_address(control)),
-                        &maskbits);
-                temp = (1 << multi_msi_capable(control));
-                temp = ((temp - 1) & ~temp);
-                maskbits |= temp;
-                pci_write_config_dword(dev,
-                        msi_mask_bits_reg(pos, is_64bit_address(control)),
-                        maskbits);
-        }
+        msi_register_init(dev, entry);
+
         attach_msi_entry(entry, vector);
         /* Set MSI enabled bits  */
         enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
@@ -731,6 +899,7 @@ int pci_enable_msi(struct pci_dev* dev)
                         vector_irq[dev->irq] = -1;
                         nr_released_vectors--;
                         spin_unlock_irqrestore(&msi_lock, flags);
+                        msi_register_init(dev, msi_desc[dev->irq]);
                         enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
                         return 0;
                 }
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 042fa5265cf6..2329f941a0dc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -446,6 +446,10 @@ pci_save_state(struct pci_dev *dev)
         /* XXX: 100% dword access ok here? */
         for (i = 0; i < 16; i++)
                 pci_read_config_dword(dev, i * 4,&dev->saved_config_space[i]);
+        if ((i = pci_save_msi_state(dev)) != 0)
+                return i;
+        if ((i = pci_save_msix_state(dev)) != 0)
+                return i;
         return 0;
 }
 
@@ -460,6 +464,8 @@ pci_restore_state(struct pci_dev *dev)
 
         for (i = 0; i < 16; i++)
                 pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
+        pci_restore_msi_state(dev);
+        pci_restore_msix_state(dev);
         return 0;
 }
 
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 8f3fb47ea671..30630cbe2fe3 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -55,6 +55,17 @@ void pci_no_msi(void);
 static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
 static inline void pci_no_msi(void) { }
 #endif
+#if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
+int pci_save_msi_state(struct pci_dev *dev);
+int pci_save_msix_state(struct pci_dev *dev);
+void pci_restore_msi_state(struct pci_dev *dev);
+void pci_restore_msix_state(struct pci_dev *dev);
+#else
+static inline int pci_save_msi_state(struct pci_dev *dev) { return 0; }
+static inline int pci_save_msix_state(struct pci_dev *dev) { return 0; }
+static inline void pci_restore_msi_state(struct pci_dev *dev) {}
+static inline void pci_restore_msix_state(struct pci_dev *dev) {}
+#endif
 
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 4970f47be72c..827550d25c9e 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -592,7 +592,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
                 pci_write_config_byte( dev, AMD8131_MISC, tmp);
         }
 } 
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,         quirk_amd_8131_ioapic ); 
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
 
 static void __init quirk_svw_msi(struct pci_dev *dev)
 {
@@ -921,6 +921,7 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                 if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) {
                         switch (dev->subsystem_device) {
                         case 0x1882: /* M6V notebook */
+                        case 0x1977: /* A6VA notebook */
                                 asus_hides_smbus = 1;
                         }
                 }
@@ -999,6 +1000,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801BA_0,	asu
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc );
 
 static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
 {