Merge linux-2.6 with linux-acpi-2.6

4 files changed, 33 insertions, 22 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2b85aa39f954..532f73bb2224 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -91,6 +91,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
 {
         struct msi_desc *entry;
         struct msg_address address;
+        unsigned int irq = vector;
 
         entry = (struct msi_desc *)msi_desc[vector];
         if (!entry || !entry->dev)
@@ -112,6 +113,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 pci_write_config_dword(entry->dev, msi_lower_address_reg(pos),
                         address.lo_address.value);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         case PCI_CAP_ID_MSIX:
@@ -125,22 +127,13 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                         MSI_TARGET_CPU_SHIFT);
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 writel(address.lo_address.value, entry->mask_base + offset);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         default:
                 break;
         }
 }
-
-#ifdef CONFIG_IRQBALANCE
-static inline void move_msi(int vector)
-{
-        if (!cpus_empty(pending_irq_balance_cpumask[vector])) {
-                set_msi_affinity(vector, pending_irq_balance_cpumask[vector]);
-                cpus_clear(pending_irq_balance_cpumask[vector]);
-        }
-}
-#endif /* CONFIG_IRQBALANCE */
 #endif /* CONFIG_SMP */
 
 static void mask_MSI_irq(unsigned int vector)
@@ -191,13 +184,13 @@ static void shutdown_msi_irq(unsigned int vector)
 
 static void end_msi_irq_wo_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         ack_APIC_irq();
 }
 
 static void end_msi_irq_w_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         unmask_MSI_irq(vector);
         ack_APIC_irq();
 }
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 390f1851c0f1..402136a5c9e4 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -19,7 +19,6 @@
 #define NR_HP_RESERVED_VECTORS  20
 
 extern int vector_irq[NR_VECTORS];
-extern cpumask_t pending_irq_balance_cpumask[NR_IRQS];
 extern void (*interrupt[NR_IRQS])(void);
 extern int pci_vector_resources(int last, int nr_released);
 
@@ -29,10 +28,6 @@ extern int pci_vector_resources(int last, int nr_released);
 #define set_msi_irq_affinity    NULL
 #endif
 
-#ifndef CONFIG_IRQBALANCE
-static inline void move_msi(int vector) {}
-#endif
-
 /*
  * MSI-X Address Register
  */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1b34fc56067e..c62d2f043397 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -333,13 +333,17 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         if (platform_pci_choose_state) {
                 ret = platform_pci_choose_state(dev, state);
                 if (ret >= 0)
-                        state = ret;
+                        state.event = ret;
         }
-        switch (state) {
-        case 0: return PCI_D0;
-        case 3: return PCI_D3hot;
+
+        switch (state.event) {
+        case PM_EVENT_ON:
+                return PCI_D0;
+        case PM_EVENT_FREEZE:
+        case PM_EVENT_SUSPEND:
+                return PCI_D3hot;
         default:
-                printk("They asked me for state %d\n", state);
+                printk("They asked me for state %d\n", state.event);
                 BUG();
         }
         return PCI_D0;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index bb36bb69803f..140354a2aa72 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -422,6 +422,25 @@ static void __devinit quirk_via_ioapic(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
 
 /*
+ * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
+ * This leads to doubled level interrupt rates.
+ * Set this bit to get rid of cycle wastage.
+ * Otherwise uncritical.
+ */
+static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
+{
+        u8 misc_control2;
+#define BYPASS_APIC_DEASSERT 8
+
+        pci_read_config_byte(dev, 0x5B, &misc_control2);
+        if (!(misc_control2 & BYPASS_APIC_DEASSERT)) {
+                printk(KERN_INFO "PCI: Bypassing VIA 8237 APIC De-Assert Message\n");
+                pci_write_config_byte(dev, 0x5B, misc_control2|BYPASS_APIC_DEASSERT);
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+
+/*
  * The AMD io apic can hang the box when an apic irq is masked.
  * We check all revs >= B0 (yet not in the pre production!) as the bug
  * is currently marked NoFix