Merge branch 'next/generic' into mips-for-linux-next

6 files changed, 33 insertions, 6 deletions

diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
index 8fbfbf2b931c..389bf669d56e 100644
--- a/arch/mips/pci/ops-pmcmsp.c
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -405,7 +405,7 @@ int msp_pcibios_config_access(unsigned char access_type,
         if (pciirqflag == 0) {
                 ret = request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */
                                 bpci_interrupt,
-                                IRQF_SHARED | IRQF_DISABLED,
+                                IRQF_SHARED,
                                 "PMC MSP PCI Host",
                                 preg);
                 if (ret != 0)
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 6a3bdb5ffa80..02d64f77e967 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -225,7 +225,7 @@ void __init tx3927_setup_pcierr_irq(void)
 {
         if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI,
                         tx3927_pcierr_interrupt,
-                        IRQF_DISABLED, "PCI error",
+                        0, "PCI error",
                         (void *)TX3927_PCIC_REG))
                 printk(KERN_WARNING "Failed to request irq for PCIERR\n");
 }
diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c
index a5807406a7f1..a032ae0a533d 100644
--- a/arch/mips/pci/pci-tx4927.c
+++ b/arch/mips/pci/pci-tx4927.c
@@ -85,7 +85,7 @@ void __init tx4927_setup_pcierr_irq(void)
 {
         if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR,
                         tx4927_pcierr_interrupt,
-                        IRQF_DISABLED, "PCI error",
+                        0, "PCI error",
                         (void *)TX4927_PCIC_REG))
                 printk(KERN_WARNING "Failed to request irq for PCIERR\n");
 }
diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c
index 20e45f30b2ef..141bba562488 100644
--- a/arch/mips/pci/pci-tx4938.c
+++ b/arch/mips/pci/pci-tx4938.c
@@ -136,7 +136,7 @@ void __init tx4938_setup_pcierr_irq(void)
 {
         if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR,
                         tx4927_pcierr_interrupt,
-                        IRQF_DISABLED, "PCI error",
+                        0, "PCI error",
                         (void *)TX4927_PCIC_REG))
                 printk(KERN_WARNING "Failed to request irq for PCIERR\n");
 }
diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c
index 9ef840693baf..c10fbf2a19dc 100644
--- a/arch/mips/pci/pci-tx4939.c
+++ b/arch/mips/pci/pci-tx4939.c
@@ -101,7 +101,7 @@ void __init tx4939_setup_pcierr_irq(void)
 {
         if (request_irq(TXX9_IRQ_BASE + TX4939_IR_PCIERR,
                         tx4927_pcierr_interrupt,
-                        IRQF_DISABLED, "PCI error",
+                        0, "PCI error",
                         (void *)TX4939_PCIC_REG))
                 pr_warning("Failed to request irq for PCIERR\n");
 }
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 41af7fa2887b..8ac0d4841852 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -4,8 +4,11 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  *
- * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2003, 04, 11 Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2011 Wind River Systems,
+ *   written by Ralf Baechle (ralf@linux-mips.org)
  */
+#include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
@@ -14,6 +17,8 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 
+#include <asm/cpu-info.h>
+
 /*
  * Indicate whether we respect the PCI setup left by the firmware.
  *
@@ -150,10 +155,32 @@ out:
                "Skipping PCI bus scan due to resource conflict\n");
 }
 
+static void __init pcibios_set_cache_line_size(void)
+{
+        struct cpuinfo_mips *c = &current_cpu_data;
+        unsigned int lsize;
+
+        /*
+         * Set PCI cacheline size to that of the highest level in the
+         * cache hierarchy.
+         */
+        lsize = c->dcache.linesz;
+        lsize = c->scache.linesz ? : lsize;
+        lsize = c->tcache.linesz ? : lsize;
+
+        BUG_ON(!lsize);
+
+        pci_dfl_cache_line_size = lsize >> 2;
+
+        pr_debug("PCI: pci_cache_line_size set to %d bytes\n", lsize);
+}
+
 static int __init pcibios_init(void)
 {
         struct pci_controller *hose;
 
+        pcibios_set_cache_line_size();
+
         /* Scan all of the recorded PCI controllers.  */
         for (hose = hose_head; hose; hose = hose->next)
                 pcibios_scanbus(hose);