mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wei Yang <weiyang@linux.vnet.ibm.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Alexander Duyck <aduyck@mirantis.com>,
	linux-pci@vger.kernel.org, Ethan Zhao <ethan.zhao@oracle.com>,
	Wei Yang <weiyang@linux.vnet.ibm.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/7] PCI: Remove redundant validation of SR-IOV offset/stride registers
Date: Fri, 30 Oct 2015 13:08:25 +0800	[thread overview]
Message-ID: <20151030050825.GA5119@richards-mbp.cn.ibm.com> (raw)
In-Reply-To: <20151029222301.11908.97709.stgit@bhelgaas-glaptop2.roam.corp.google.com>

On Thu, Oct 29, 2015 at 05:23:01PM -0500, Bjorn Helgaas wrote:
>From: Alexander Duyck <aduyck@mirantis.com>
>
>Previously, we read, validated, and cached PCI_SRIOV_VF_OFFSET and
>PCI_SRIOV_VF_STRIDE in sriov_enable().  But sriov_init() now does
>that via compute_max_vf_buses(), so we don't need to do it again.
>
>Remove the PCI_SRIOV_VF_OFFSET and PCI_SRIOV_VF_STRIDE config reads from
>sriov_enable().  The pci_sriov structure already contains the offset and
>stride corresponding to the current NumVFs.
>
>[bhelgaas: split to separate patch for reviewability]
>Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
>Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Reviewed-by: Wei Yang <weiyang@linux.vnet.ibm.com>

>---
> drivers/pci/iov.c |   10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
>diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
>index 1b1acc2..ca400a9 100644
>--- a/drivers/pci/iov.c
>+++ b/drivers/pci/iov.c
>@@ -235,7 +235,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
> 	int rc;
> 	int i, j;
> 	int nres;
>-	u16 offset, stride, initial;
>+	u16 initial;
> 	struct resource *res;
> 	struct pci_dev *pdev;
> 	struct pci_sriov *iov = dev->sriov;
>@@ -258,11 +258,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
> 	    (!(iov->cap & PCI_SRIOV_CAP_VFM) && (nr_virtfn > initial)))
> 		return -EINVAL;
>
>-	pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_OFFSET, &offset);
>-	pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_STRIDE, &stride);
>-	if (!offset || (nr_virtfn > 1 && !stride))
>-		return -EIO;
>-
> 	nres = 0;
> 	for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
> 		bars |= (1 << (i + PCI_IOV_RESOURCES));
>@@ -275,9 +270,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
> 		return -ENOMEM;
> 	}
>
>-	iov->offset = offset;
>-	iov->stride = stride;
>-
> 	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",

-- 
Richard Yang
Help you, Help me


  reply	other threads:[~2015-10-30  5:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-29 22:22 [PATCH v2 0/7] SR-IOV fixes and cleanup Bjorn Helgaas
2015-10-29 22:22 ` [PATCH v2 1/7] PCI: Set SR-IOV NumVFs to zero after enumeration Bjorn Helgaas
2015-10-30  3:48   ` Wei Yang
2015-10-30  5:25     ` Wei Yang
2015-10-30 15:40     ` Alexander Duyck
2015-11-02  7:28       ` Wei Yang
2015-10-29 22:23 ` [PATCH v2 2/7] PCI: Remove redundant validation of SR-IOV offset/stride registers Bjorn Helgaas
2015-10-30  5:08   ` Wei Yang [this message]
2015-10-29 22:23 ` [PATCH v2 3/7] PCI: Remove VFs in reverse order if virtfn_add() fails Bjorn Helgaas
2015-10-30  5:09   ` Wei Yang
2015-10-29 22:23 ` [PATCH v2 4/7] PCI: Reorder pcibios_sriov_disable() Bjorn Helgaas
2015-10-30  5:09   ` Wei Yang
2015-10-29 22:23 ` [PATCH v2 5/7] PCI: Wait 1 second between disabling VFs and clearing NumVFs Bjorn Helgaas
2015-10-30  5:14   ` Wei Yang
2015-10-30  6:00     ` ethan zhao
2015-10-30 15:57       ` Alexander Duyck
2015-11-02  8:33         ` Wei Yang
2015-11-02 15:46           ` Alexander Duyck
2015-11-03  2:01             ` Wei Yang
2015-11-03  2:04   ` Wei Yang
2015-10-29 22:23 ` [PATCH v2 6/7] PCI: Fix sriov_enable() error path for pcibios_enable_sriov() failures Bjorn Helgaas
2015-10-30  5:18   ` Wei Yang
2015-10-29 22:23 ` [PATCH v2 7/7] PCI: Set NumVFs before computing how many buses VFs require Bjorn Helgaas
2015-10-30  5:22   ` Wei Yang
2015-10-30 16:03     ` Alexander Duyck
2015-11-02  8:27       ` Wei Yang
2015-11-02 15:39         ` Alexander Duyck
2015-11-03  2:18           ` Wei Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151030050825.GA5119@richards-mbp.cn.ibm.com \
    --to=weiyang@linux.vnet.ibm.com \
    --cc=aduyck@mirantis.com \
    --cc=bhelgaas@google.com \
    --cc=ethan.zhao@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®