From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
"James E.J. Bottomley" <jejb@parisc-linux.org>,
Helge Deller <deller@gmx.de>,
linux-parisc@vger.kernel.org
Subject: [PATCH 08/10] PCI, parisc: clip firmware assigned resource under parent bridge's
Date: Mon, 12 Jan 2015 11:23:18 -0800 [thread overview]
Message-ID: <1421090600-9750-9-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1421090600-9750-1-git-send-email-yinghai@kernel.org>
Some bios put range that is not fully coverred by root bus resources.
Try to clip them and update them in pci bridge bars.
We'd like to fix other arches instead of just x86.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=85491
Reported-by: Marek Kordik <kordikmarek@gmail.com>
Fixes: 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources")
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
---
drivers/parisc/lba_pci.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 37e71ff..e6ab352 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -692,11 +692,25 @@ lba_fixup_bus(struct pci_bus *bus)
*/
if (bus->parent) {
int i;
+ bool changed = false;
+
+ dev = bus->self;
/* PCI-PCI Bridge */
pci_read_bridge_bases(bus);
for (i = PCI_BRIDGE_RESOURCES; i < PCI_NUM_RESOURCES; i++) {
- pci_claim_resource(bus->self, i);
+ struct resource *res = &dev->resource[i];
+
+ if (pci_claim_resource(dev, i) >= 0)
+ continue;
+
+ if (pci_bus_clip_resource(dev, res)) {
+ changed = true;
+ if (pci_claim_resource(dev, i) >= 0)
+ continue;
+ }
}
+ if (changed)
+ pci_setup_bridge(bus);
} else {
/* Host-PCI Bridge */
int err;
@@ -776,7 +790,15 @@ lba_fixup_bus(struct pci_bus *bus)
** that share expansion ROMs (think quad tulip), but
** isn't harmful.
*/
- pci_claim_resource(dev, i);
+ if (pci_claim_resource(dev, i) >= 0)
+ continue;
+
+ /* try again with clip */
+ if (i != PCI_ROM_RESOURCE &&
+ pci_bus_clip_resource(dev, res)) {
+ pci_update_resource(dev, i);
+ pci_claim_resource(dev, i);
+ }
}
#ifdef FBB_SUPPORT
--
1.8.4.5
next prev parent reply other threads:[~2015-01-12 19:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 19:23 [PATCH 00/10] PCI: clip firmware assigned resources Yinghai Lu
2015-01-12 19:23 ` [PATCH 01/10] PCI: clip firmware assigned resource under parent bridge's Yinghai Lu
2015-01-12 19:23 ` [PATCH 02/10] PCI, x86: " Yinghai Lu
2015-01-14 16:52 ` Bjorn Helgaas
2015-01-14 19:17 ` Yinghai Lu
2015-01-12 19:23 ` [PATCH 03/10] PCI, alpha: " Yinghai Lu
2015-01-12 19:23 ` [PATCH 04/10] PCI, frv: " Yinghai Lu
2015-01-12 19:23 ` [PATCH 05/10] PCI, ia64: " Yinghai Lu
2015-01-12 19:23 ` [PATCH 06/10] PCI, microblaze: " Yinghai Lu
2015-01-12 19:23 ` [PATCH 07/10] PCI, mn10300: " Yinghai Lu
2015-01-12 19:23 ` Yinghai Lu [this message]
2015-01-13 21:01 ` [PATCH 08/10] PCI, parisc: " Helge Deller
2015-01-12 19:23 ` [PATCH 09/10] PCI, powerpc: " Yinghai Lu
2015-01-13 9:07 ` Wei Yang
2015-01-12 19:23 ` [PATCH 10/10] PCI, sparc: " Yinghai Lu
2015-01-12 22:31 ` Kjetil Oftedal
2015-01-15 22:15 ` Bjorn Helgaas
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=1421090600-9750-9-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=deller@gmx.de \
--cc=jejb@parisc-linux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pci@vger.kernel.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).