From: Kyle McMartin <kyle@shortfin.cabal.ca>
Date: Thu, 6 Dec 2007 17:38:26 +0000 (-0800)
Subject: [PARISC] lba_pci: pci_claim_resources disabled expansion roms
X-Git-Tag: v2.6.24-rc5~58^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84f4506cb788d85a50c97b399f2999f90e6272b0;p=linux-2.6

[PARISC] lba_pci: pci_claim_resources disabled expansion roms

radeonfb was HPMC-ing my C8000 by trying to map its expansion rom from
IO_VIEW, instead of PA_VIEW. Fix seems to be to ensure that its disabled
ROM is properly inserted into the resource tree.

FIXME: this will result in a whinging printk for cards which share expansion
ROMS, such as a quad tulip. Thankfully, it isn't harmful.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
---

diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 5eace9e66e..66ce610483 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -768,9 +768,13 @@ lba_fixup_bus(struct pci_bus *bus)
 				DBG("lba_fixup_bus() WTF? 0x%lx [%lx/%lx] XXX",
 					res->flags, res->start, res->end);
 			}
-			if ((i != PCI_ROM_RESOURCE) ||
-			    (res->flags & IORESOURCE_ROM_ENABLE))
-				pci_claim_resource(dev, i);
+
+			/*
+			** FIXME: this will result in whinging for devices
+			** that share expansion ROMs (think quad tulip), but
+			** isn't harmful.
+			*/
+			pci_claim_resource(dev, i);
 		}
 
 #ifdef FBB_SUPPORT