Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / arch / powerpc / kernel / eeh_cache.c

diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c
index a1e86e1..ddbcfab 100644 (file)
--- a/arch/powerpc/kernel/eeh_cache.c
+++ b/arch/powerpc/kernel/eeh_cache.c
@@ -195,8 +195,11 @@ static void __eeh_addr_cache_insert_dev(struct pci_dev *dev)
                return;
        }
 
-       /* Walk resources on this device, poke them into the tree */
-       for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+       /*
+        * Walk resources on this device, poke the first 7 (6 normal BAR and 1
+        * ROM BAR) into the tree.
+        */
+       for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
                resource_size_t start = pci_resource_start(dev,i);
                resource_size_t end = pci_resource_end(dev,i);
                unsigned long flags = pci_resource_flags(dev,i);
@@ -222,10 +225,6 @@ void eeh_addr_cache_insert_dev(struct pci_dev *dev)
 {
        unsigned long flags;
 
-       /* Ignore PCI bridges */
-       if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
-               return;
-
        spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
        __eeh_addr_cache_insert_dev(dev);
        spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);