From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , "David S. Miller" , Paul Gortmaker , Yijing Wang , Sam Ravnborg , 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 Message-Id: <1421090600-9750-11-git-send-email-yinghai@kernel.org> In-Reply-To: <1421090600-9750-1-git-send-email-yinghai@kernel.org> References: <1421090600-9750-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: 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 Fixes: 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources") Signed-off-by: Yinghai Lu Cc: "David S. Miller" Cc: Paul Gortmaker Cc: Yijing Wang Cc: Sam Ravnborg 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