linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	"David S. Miller" <davem@davemloft.net>,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Yijing Wang <wangyijing@huawei.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	sparclinux@vger.kernel.org
Subject: [PATCH 10/10] PCI, sparc: clip firmware assigned resource under parent bridge's
Date: Mon, 12 Jan 2015 11:23:20 -0800	[thread overview]
Message-ID: <1421090600-9750-11-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: "David S. Miller" <davem@davemloft.net>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: sparclinux@vger.kernel.org
---
 arch/sparc/kernel/pci.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index b36365f..0e391e5 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -623,6 +623,7 @@ static void pci_claim_bus_resources(struct pci_bus *bus)
 	struct pci_dev *dev;
 
 	list_for_each_entry(dev, &bus->devices, bus_list) {
+		bool changed = false;
 		int i;
 
 		for (i = 0; i < PCI_NUM_RESOURCES; i++) {
@@ -639,8 +640,25 @@ static void pci_claim_bus_resources(struct pci_bus *bus)
 				       (unsigned long long)r->end,
 				       (unsigned int)r->flags);
 
-			pci_claim_resource(dev, i);
+			if (pci_claim_resource(dev, i) >= 0)
+				continue;
+
+			if (dev->subordinate &&
+			    i >= PCI_BRIDGE_RESOURCES &&
+			    i < PCI_NUM_RESOURCES &&
+			    (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
+			    pci_bus_clip_resource(dev, r)) {
+				changed = true;
+				pci_claim_resource(dev, i);
+			} else if (i < PCI_BRIDGE_RESOURCES &&
+				   i != PCI_ROM_RESOURCE &&
+				   pci_bus_clip_resource(dev, r)) {
+					pci_update_resource(dev, i);
+					pci_claim_resource(dev, i);
+			}
 		}
+		if (changed)
+			pci_setup_bridge(dev->subordinate);
 	}
 
 	list_for_each_entry(child_bus, &bus->children, node)
-- 
1.8.4.5


  parent reply	other threads:[~2015-01-12 19:23 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 ` [PATCH 08/10] PCI, parisc: " Yinghai Lu
2015-01-13 21:01   ` 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 ` Yinghai Lu [this message]
2015-01-12 22:31   ` [PATCH 10/10] PCI, sparc: " 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-11-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=sam@ravnborg.org \
    --cc=sparclinux@vger.kernel.org \
    --cc=wangyijing@huawei.com \
    /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).