From patchwork Tue Jun 26 18:54:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 167443 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 034CBB6FA1 for ; Wed, 27 Jun 2012 04:56:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932279Ab2FZS4A (ORCPT ); Tue, 26 Jun 2012 14:56:00 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:37181 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932281Ab2FZSz4 (ORCPT ); Tue, 26 Jun 2012 14:55:56 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q5QIthB4029992 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Jun 2012 18:55:44 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q5QIthG0020024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 26 Jun 2012 18:55:43 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q5QIthGN018439; Tue, 26 Jun 2012 13:55:43 -0500 Received: from linux-siqj.site (/10.132.126.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 Jun 2012 11:55: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 12/15] PCI: Double checking setting for bus register and bus struct. Date: Tue, 26 Jun 2012 11:54:06 -0700 Message-Id: <1340736849-14875-13-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 User could use setpci change bridge's bus register. that could make value of register and struct is out of sync. User later will use rescan to see the devices is moving. In the rescaning, we need to double check the range and remove the old struct at first. to make thing working user may need have script to remove children devices under bridge at first, and then use setpci update bus register and then rescan. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e77f58d..93b61b8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -806,6 +806,48 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, (primary != bus->number || secondary <= bus->number)) broken = 1; + if (!pass && dev->subordinate) { + child = dev->subordinate; + /* + * User could change bus register in bridge manually with + * setpci and rescan. So double check the setting, and remove + * old structs. Don't set broken yet, let following check + * to see if the new setting good. + */ + if (primary != child->primary || + secondary != child->busn_res.start || + subordinate != child->busn_res.end) { + dev_info(&dev->dev, + "someone changed bus register from pri:%02x, sec:%02x, sub:%02x to pri:%02x, sec:%02x, sub:%02x\n", + child->primary, (int)child->busn_res.start, + (int)child->busn_res.end, + primary, secondary, subordinate); + if (!list_empty(&dev->subordinate->devices)) { + u32 old_buses; + + dev_info(&dev->dev, + "but children devices are not removed manually before that.\n"); + /* + * Try best to remove left children devices + * but we need to set bus register back, + * otherwise we can not access children device + * and stop them. + */ + old_buses = (buses & 0xff000000) + | ((unsigned int)(child->primary) << 0) + | ((unsigned int)(child->busn_res.start) << 8) + | ((unsigned int)(child->busn_res.end) << 16); + pci_write_config_dword(dev, PCI_PRIMARY_BUS, + old_buses); + pci_stop_and_remove_behind_bridge(dev); + pci_write_config_dword(dev, PCI_PRIMARY_BUS, + buses); + } + pci_remove_bus(dev->subordinate); + dev->subordinate = NULL; + } + } + /* more strict checking */ if (!pass && !broken && !dev->subordinate) broken = pci_bridge_check_busn_broken(bus, dev,