On Mon, 2005-08-29 at 21:40 -0700, Linus Torvalds wrote:
>
> On Mon, 29 Aug 2005, David S. Miller wrote:
> >
> > So I think the kernel, by not enabling the ROM, is doing the
> > right thing here.
>
> Notice that on ppc even older versions didn't actually _enable_ the rom,
> but they would write the non-enabled address to the PCI_ROM_ADDRESS
> register, so that anybody who read that register would see _where_ the ROM
> would be enabled if it was enabled.
>
> That's the thing that changed in the commit Ben dislikes. Now, if the ROM
> is disabled, we won't even write the disabled address to the PCI register,
> because it led to trouble on some strange Matrox card. Probably a card
> that nobody has ever used on PPC, and certainly not on a Powerbook, so in
> that sense the apparent breakage on ppc is arguably "unnecessary" as far
> as Ben is concerned.
>
> But I notice the problem: pci_enable_rom() is indeed broken with the
> change.
>
> Ben, does this (totally untested) patch fix it for you?
I was just testing a slightly different one that appear to fix the
problem :
Index: linux-work/drivers/pci/rom.c
===================================================================
--- linux-work.orig/drivers/pci/rom.c 2005-08-01 22:03:44.000000000 +1000
+++ linux-work/drivers/pci/rom.c 2005-08-30 14:46:26.000000000 +1000
@@ -23,9 +23,12 @@
*/
static void pci_enable_rom(struct pci_dev *pdev)
{
+ struct pci_bus_region region;
+ struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
u32 rom_addr;
- pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
+ pcibios_resource_to_bus(pdev, ®ion, res);
+ rom_addr = region.start | (res->flags & PCI_REGION_FLAG_MASK);
rom_addr |= PCI_ROM_ADDRESS_ENABLE;
pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr);
}
@@ -71,12 +74,17 @@
} else {
if (res->flags & IORESOURCE_ROM_COPY) {
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
- return (void __iomem *)pci_resource_start(pdev,
PCI_ROM_RESOURCE);
+ return (void __iomem *)pci_resource_start(pdev,
+ PCI_ROM_RESOURCE);
} else {
/* assign the ROM an address if it doesn't have one */
- if (res->parent == NULL)
- pci_assign_resource(pdev, PCI_ROM_RESOURCE);
-
+ if (res->parent == NULL) {
+ int err;
+ err = pci_assign_resource(pdev,
+ PCI_ROM_RESOURCE);
+ if (err)
+ return NULL;
+ }
start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
if (*size == 0)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
