From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: "David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org, greg@kroah.com,
helgehaf@aitel.hist.no
Subject: Re: Ignore disabled ROM resources at setup
Date: Wed, 31 Aug 2005 14:16:53 +1000 [thread overview]
Message-ID: <1125461814.11948.102.camel@gaston> (raw)
In-Reply-To: <Pine.LNX.4.58.0508292226580.3243@g5.osdl.org>
Here's a new patch based on Linus latest one with better error checking.
Please push if you are fine with it.
This patch fixes a problem with pci_map_rom() which doesn't properly
update the ROM BAR value with the address thas allocated for it by the
PCI code. This problem, among other, breaks boot on Mac laptops.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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-31 14:09:02.000000000 +1000
@@ -21,13 +21,21 @@
* between the ROM and other resources, so enabling it may disable access
* to MMIO registers or other card memory.
*/
-static void pci_enable_rom(struct pci_dev *pdev)
+static int pci_enable_rom(struct pci_dev *pdev)
{
+ struct resource *res = pdev->resource + PCI_ROM_RESOURCE;
+ struct pci_bus_region region;
u32 rom_addr;
+ if (!res->flags)
+ return -1;
+
+ pcibios_resource_to_bus(pdev, ®ion, res);
pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
- rom_addr |= PCI_ROM_ADDRESS_ENABLE;
+ rom_addr &= ~PCI_ROM_ADDRESS_MASK;
+ rom_addr |= region.start | PCI_ROM_ADDRESS_ENABLE;
pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr);
+ return 0;
}
/**
@@ -71,19 +79,21 @@
} 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 &&
+ pci_assign_resource(pdev,PCI_ROM_RESOURCE))
+ return NULL;
start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
if (*size == 0)
return NULL;
/* Enable ROM space decodes */
- pci_enable_rom(pdev);
+ if (pci_enable_rom(pdev))
+ return NULL;
}
}
next prev parent reply other threads:[~2005-08-31 4:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200508261859.j7QIxT0I016917@hera.kernel.org>
2005-08-30 2:38 ` Ignore disabled ROM resources at setup Benjamin Herrenschmidt
2005-08-30 3:15 ` Linus Torvalds
2005-08-30 4:47 ` Jon Smirl
2005-08-30 3:19 ` Benjamin Herrenschmidt
2005-08-30 3:52 ` Linus Torvalds
2005-08-30 4:09 ` Linus Torvalds
2005-08-30 4:20 ` David S. Miller
2005-08-30 4:37 ` Benjamin Herrenschmidt
2005-08-30 4:40 ` Linus Torvalds
2005-08-30 4:49 ` Benjamin Herrenschmidt
2005-08-30 5:29 ` Linus Torvalds
2005-08-30 6:46 ` Benjamin Herrenschmidt
2005-08-31 4:16 ` Benjamin Herrenschmidt [this message]
2005-08-30 4:51 ` Jon Smirl
2005-08-30 4:54 ` Benjamin Herrenschmidt
2005-08-30 5:15 ` Linus Torvalds
2005-08-30 14:39 ` Alan Cox
2005-08-30 15:29 ` Petr Vandrovec
2005-08-30 4:33 ` Benjamin Herrenschmidt
2005-08-30 5:03 ` Linus Torvalds
2005-08-30 6:40 ` Benjamin Herrenschmidt
2005-08-30 4:35 ` Jon Smirl
2005-08-30 5:32 ` David S. Miller
2005-08-30 6:43 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1125461814.11948.102.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=helgehaf@aitel.hist.no \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).