From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758105AbbJ3FW6 (ORCPT ); Fri, 30 Oct 2015 01:22:58 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:37954 "EHLO e28smtp06.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940AbbJ3FW4 (ORCPT ); Fri, 30 Oct 2015 01:22:56 -0400 X-Helo: d28dlp02.in.ibm.com X-MailFrom: weiyang@linux.vnet.ibm.com X-RcptTo: linux-pci@vger.kernel.org Date: Fri, 30 Oct 2015 13:22:49 +0800 From: Wei Yang To: Bjorn Helgaas Cc: Alexander Duyck , linux-pci@vger.kernel.org, Ethan Zhao , Wei Yang , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 7/7] PCI: Set NumVFs before computing how many buses VFs require Message-ID: <20151030052249.GF5119@richards-mbp.cn.ibm.com> Reply-To: Wei Yang References: <20151029221701.11908.82718.stgit@bhelgaas-glaptop2.roam.corp.google.com> <20151029222336.11908.66193.stgit@bhelgaas-glaptop2.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151029222336.11908.66193.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15103005-0021-0000-0000-000008328431 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 29, 2015 at 05:23:36PM -0500, Bjorn Helgaas wrote: >From: Alexander Duyck > >VF bus numbers depend on the First VF Offset and VF Stride, and per >sections 3.3.9 and 3.3.10 of the SR-IOV spec r1.1, these depend on the >NumVF value. > >Wait until after we set NumVFs to compute and validate the bus number of >the last VF. > >[bhelgaas: changelog, add spec reference, split to separate patch for >reviewability] >Signed-off-by: Alexander Duyck >Signed-off-by: Bjorn Helgaas >--- > drivers/pci/iov.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > >diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c >index bd1c4fa..9d29712 100644 >--- a/drivers/pci/iov.c >+++ b/drivers/pci/iov.c >@@ -274,13 +274,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > return -ENOMEM; > } > >- bus = pci_iov_virtfn_bus(dev, nr_virtfn - 1); >- if (bus > dev->bus->busn_res.end) { >- dev_err(&dev->dev, "can't enable %d VFs (bus %02x out of range of %pR)\n", >- nr_virtfn, bus, &dev->bus->busn_res); >- return -ENOMEM; >- } >- > if (pci_enable_resources(dev, bars)) { > dev_err(&dev->dev, "SR-IOV: IOV BARS not allocated\n"); > return -ENOMEM; >@@ -304,6 +297,15 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > } > > pci_iov_set_numvfs(dev, nr_virtfn); How about move it up? >+ >+ bus = pci_iov_virtfn_bus(dev, nr_virtfn - 1); >+ if (bus > dev->bus->busn_res.end) { >+ dev_err(&dev->dev, "can't enable %d VFs (bus %02x out of range of %pR)\n", >+ nr_virtfn, bus, &dev->bus->busn_res); >+ rc = -ENOMEM; >+ goto err_bus; >+ } >+ > iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; > pci_cfg_access_lock(dev); > pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); >@@ -342,7 +344,7 @@ err_pcibios: > pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); > ssleep(1); > pci_cfg_access_unlock(dev); >- >+err_bus: > if (iov->link != dev->devfn) > sysfs_remove_link(&dev->dev.kobj, "dep_link"); > -- Richard Yang Help you, Help me