From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH -v11 30/30] PCI: Don't shrink too much for hotplug bridge Date: Sun, 18 Mar 2012 22:43:01 -0700 Message-ID: <1332135781-13695-31-git-send-email-yinghai@kernel.org> References: <1332135781-13695-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1332135781-13695-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org To: Jesse Barnes , Benjamin Herrenschmidt , Tony Luck , David Miller , x86 Cc: Bjorn Helgaas , Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu List-Id: linux-arch.vger.kernel.org Otherwise may have problem later if we plug pcie cards with bridges. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 01ba48e..38e0448 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -782,6 +782,7 @@ static int __devinit pci_bridge_check_busn_broken(struct pci_bus *bus, static unsigned int __devinit __pci_scan_child_bus(struct pci_bus *bus, int pass); +#define HOTPLUG_BRIDGE_RESERVE_BUSNR 8 /* * If it's a bridge, configure it and scan the bus behind it. * For CardBus bridges, we don't scan behind as the devices will @@ -993,6 +994,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, /* * Set the subordinate bus number to its real value. */ + if (dev->is_hotplug_bridge && child->subordinate > max && + (max - child->secondary) < HOTPLUG_BRIDGE_RESERVE_BUSNR) + max = min_t(int, child->secondary + + HOTPLUG_BRIDGE_RESERVE_BUSNR, + child->subordinate); shrink_size = child->subordinate - max; child->subordinate = max; pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); -- 1.7.7 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet15.oracle.com ([141.146.126.227]:28832 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031000Ab2CSFqJ (ORCPT ); Mon, 19 Mar 2012 01:46:09 -0400 From: Yinghai Lu Subject: [PATCH -v11 30/30] PCI: Don't shrink too much for hotplug bridge Date: Sun, 18 Mar 2012 22:43:01 -0700 Message-ID: <1332135781-13695-31-git-send-email-yinghai@kernel.org> In-Reply-To: <1332135781-13695-1-git-send-email-yinghai@kernel.org> References: <1332135781-13695-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Jesse Barnes , Benjamin Herrenschmidt , Tony Luck , David Miller , x86 Cc: Bjorn Helgaas , Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20120319054301.VMoweqy0CG3C40yo-a0M82S7jZIoJ5Q4tx9nlM-9i08@z> Otherwise may have problem later if we plug pcie cards with bridges. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 01ba48e..38e0448 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -782,6 +782,7 @@ static int __devinit pci_bridge_check_busn_broken(struct pci_bus *bus, static unsigned int __devinit __pci_scan_child_bus(struct pci_bus *bus, int pass); +#define HOTPLUG_BRIDGE_RESERVE_BUSNR 8 /* * If it's a bridge, configure it and scan the bus behind it. * For CardBus bridges, we don't scan behind as the devices will @@ -993,6 +994,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, /* * Set the subordinate bus number to its real value. */ + if (dev->is_hotplug_bridge && child->subordinate > max && + (max - child->secondary) < HOTPLUG_BRIDGE_RESERVE_BUSNR) + max = min_t(int, child->secondary + + HOTPLUG_BRIDGE_RESERVE_BUSNR, + child->subordinate); shrink_size = child->subordinate - max; child->subordinate = max; pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); -- 1.7.7