From patchwork Tue Jun 26 18:53:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 167450 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 99704B6F13 for ; Wed, 27 Jun 2012 04:58:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758693Ab2FZSy4 (ORCPT ); Tue, 26 Jun 2012 14:54:56 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:29933 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755324Ab2FZSyy (ORCPT ); Tue, 26 Jun 2012 14:54:54 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q5QIsgKY003411 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Jun 2012 18:54:43 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q5QIsgnB018455 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 26 Jun 2012 18:54:42 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q5QIsgiq023165; Tue, 26 Jun 2012 13:54:42 -0500 Received: from linux-siqj.site (/10.132.126.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 Jun 2012 11:54:42 -0700 From: Yinghai Lu To: Bjorn Helgaas , Benjamin Herrenschmidt , Tony Luck , David Miller , x86 Cc: 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 Subject: [PATCH -v12 04/15] PCI: Add pci_bus_extend/shrink_top() Date: Tue, 26 Jun 2012 11:53:58 -0700 Message-Id: <1340736849-14875-5-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1340736849-14875-1-git-send-email-yinghai@kernel.org> References: <1340736849-14875-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Extend or shrink bus and parent buses top (subordinate) Extended range is verified safe range, and stop at recorded parent_res. -v2: Remove busn_res change, it is updated in other function. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cd06c84..44c42ae 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -689,6 +689,34 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) } } +static void __devinit pci_bus_extend_top(struct pci_bus *parent, + long size, struct resource *parent_res) +{ + struct resource *res; + + if (!size) + return; + + while (parent) { + res = &parent->busn_res; + if (res == parent_res) + break; + pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, + parent->busn_res.end); + dev_printk(KERN_DEBUG, &parent->dev, + "busn_res: %s %02lx to %pR\n", + (size > 0) ? "extended" : "shrunk", + abs(size), res); + parent = parent->parent; + } +} + +static void __devinit pci_bus_shrink_top(struct pci_bus *parent, + long size, struct resource *parent_res) +{ + pci_bus_extend_top(parent, -size, parent_res); +} + /* * 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