Revert "parisc: Set PCI CLS early in boot."

This reverts the following patch, which shouldn't have been applied
to the .32 stable tree as it causes problems.

  commit 5fd4514bb351b5ecb0da3692fff70741e5ed200c upstream.

  Set the PCI CLS early in the boot process to prevent
  device failures. In pcibios_set_master use the new
  pci_cache_line_size instead of a hard-coded value.

  Signed-off-by: Carlos O'Donell <carlos@codesourcery.com>
  Reviewed-by: Grant Grundler <grundler@google.com>
  Signed-off-by: Kyle McMartin <kyle@redhat.com>
  Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 9e74bfe071dc0517ac7310f9d1223cb22c18c9a5..f7064abc3bb6e60a544e3bfb97c12f468768fd89 100644 (file)
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -18,6 +18,7 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/cache.h>         /* for L1_CACHE_BYTES */
 #include <asm/superio.h>
 
 #define DEBUG_RESOURCES 0
@@ -122,10 +123,6 @@ static int __init pcibios_init(void)
        } else {
                printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
        }
-
-       /* Set the CLS for PCI as early as possible. */
-       pci_cache_line_size = pci_dfl_cache_line_size;
-
        return 0;
 }
 
@@ -174,7 +171,7 @@ void pcibios_set_master(struct pci_dev *dev)
        ** upper byte is PCI_LATENCY_TIMER.
        */
        pci_write_config_word(dev, PCI_CACHE_LINE_SIZE,
-                             (0x80 << 8) | pci_cache_line_size);
+                               (0x80 << 8) | (L1_CACHE_BYTES / sizeof(u32)));
 }