From patchwork Tue Feb 10 08:59:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 6354 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1A93jn0026885 for ; Tue, 10 Feb 2009 09:03:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752970AbZBJJDl (ORCPT ); Tue, 10 Feb 2009 04:03:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753141AbZBJJDk (ORCPT ); Tue, 10 Feb 2009 04:03:40 -0500 Received: from mga09.intel.com ([134.134.136.24]:4649 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384AbZBJJD0 (ORCPT ); Tue, 10 Feb 2009 04:03:26 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 10 Feb 2009 00:56:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,185,1233561600"; d="scan'208";a="488749276" Received: from yzhao-otc.sh.intel.com ([10.239.48.153]) by orsmga001.jf.intel.com with ESMTP; 10 Feb 2009 01:03:10 -0800 From: Yu Zhao To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yu Zhao Subject: [PATCH v8 3/7] PCI: reserve bus range for SR-IOV device Date: Tue, 10 Feb 2009 16:59:11 +0800 Message-Id: <1234256355-23153-4-git-send-email-yu.zhao@intel.com> X-Mailer: git-send-email 1.6.1 In-Reply-To: <1234256355-23153-1-git-send-email-yu.zhao@intel.com> References: <1234256355-23153-1-git-send-email-yu.zhao@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Yu Zhao --- drivers/pci/iov.c | 34 ++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 5 +++++ drivers/pci/probe.c | 3 +++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index bd389b4..1cf13be 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -11,6 +11,16 @@ #include "pci.h" +static inline void virtfn_bdf(struct pci_dev *dev, int id, u8 *busnr, u8 *devfn) +{ + u16 bdf; + + bdf = (dev->bus->number << 8) + dev->devfn + + dev->sriov->offset + dev->sriov->stride * id; + *busnr = bdf >> 8; + *devfn = bdf & 0xff; +} + static int sriov_init(struct pci_dev *dev, int pos) { int i; @@ -201,3 +211,27 @@ void pci_restore_iov_state(struct pci_dev *dev) if (dev->sriov) sriov_restore_state(dev); } + +/** + * pci_iov_bus_range - find bus range used by Virtual Function + * @bus: the PCI bus + * + * Returns max number of buses (exclude current one) used by Virtual + * Functions. + */ +int pci_iov_bus_range(struct pci_bus *bus) +{ + int max = 0; + u8 busnr, devfn; + struct pci_dev *dev; + + list_for_each_entry(dev, &bus->devices, bus_list) { + if (!dev->sriov) + continue; + virtfn_bdf(dev, dev->sriov->total - 1, &busnr, &devfn); + if (busnr > max) + max = busnr; + } + + return max ? max - bus->number : 0; +} diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 9d76737..fdfc476 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -217,6 +217,7 @@ extern void pci_iov_release(struct pci_dev *dev); extern int pci_iov_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); extern void pci_restore_iov_state(struct pci_dev *dev); +extern int pci_iov_bus_range(struct pci_bus *bus); #else static inline int pci_iov_init(struct pci_dev *dev) { @@ -234,6 +235,10 @@ static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno, static inline void pci_restore_iov_state(struct pci_dev *dev) { } +static inline int pci_iov_bus_range(struct pci_bus *bus) +{ + return 0; +} #endif /* CONFIG_PCI_IOV */ #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 03b6f29..4c8abd0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1078,6 +1078,9 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) for (devfn = 0; devfn < 0x100; devfn += 8) pci_scan_slot(bus, devfn); + /* Reserve buses for SR-IOV capability. */ + max += pci_iov_bus_range(bus); + /* * After performing arch-dependent fixup of the bus, look behind * all PCI-to-PCI bridges on this bus.