From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 020DF1A001D for ; Mon, 23 Jun 2014 15:03:16 +1000 (EST) Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Jun 2014 15:03:13 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 0BAF13578052 for ; Mon, 23 Jun 2014 15:03:11 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5N4etJ562390290 for ; Mon, 23 Jun 2014 14:40:55 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s5N539ii032673 for ; Mon, 23 Jun 2014 15:03:10 +1000 Date: Mon, 23 Jun 2014 15:03:10 +1000 From: Gavin Shan To: Wei Yang Subject: Re: [RFC PATCH V3 04/17] PCI: SRIOV: add VF enable/disable hook Message-ID: <20140623050310.GA5069@shangw> References: <1402365399-5121-1-git-send-email-weiyang@linux.vnet.ibm.com> <1402365399-5121-5-git-send-email-weiyang@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1402365399-5121-5-git-send-email-weiyang@linux.vnet.ibm.com> Cc: benh@au1.ibm.com, linux-pci@vger.kernel.org, gwshan@linux.vnet.ibm.com, yan@linux.vnet.ibm.com, bhelgaas@google.com, qiudayu@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org Reply-To: Gavin Shan List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, Jun 10, 2014 at 09:56:26AM +0800, Wei Yang wrote: >VFs are dynamically created/released when driver enable them. On some >platforms, like PowerNV, special resources are necessary to enable VFs. > >This patch adds two hooks for platform initialization before creating the VFs. > >Signed-off-by: Wei Yang >--- > drivers/pci/iov.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > >diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c >index 1d21f43..cc87773 100644 >--- a/drivers/pci/iov.c >+++ b/drivers/pci/iov.c >@@ -250,6 +250,11 @@ static void sriov_disable_migration(struct pci_dev *dev) > iounmap(iov->mstate); > } > >+int __weak pcibios_sriov_enable(struct pci_dev *pdev, u16 vf_num) >+{ >+ return 0; >+} >+ > static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > { > int rc; >@@ -260,6 +265,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > struct pci_dev *pdev; > struct pci_sriov *iov = dev->sriov; > int bars = 0; >+ int retval; > > if (!nr_virtfn) > return 0; >@@ -334,6 +340,12 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > if (nr_virtfn < initial) > initial = nr_virtfn; > >+ if ((retval = pcibios_sriov_enable(dev, initial))) { >+ dev_err(&dev->dev, "Failure %d from pcibios_sriov_setup()\n", >+ retval); dev_err(&dev->dev, "Failure %d from pcibios_sriov_enable()\n", retval); >+ return retval; >+ } >+ > for (i = 0; i < initial; i++) { > rc = virtfn_add(dev, i, 0); > if (rc) >@@ -368,6 +380,11 @@ failed: > return rc; > } > >+int __weak pcibios_sriov_disable(struct pci_dev *pdev) >+{ >+ return 0; >+} >+ > static void sriov_disable(struct pci_dev *dev) > { > int i; >@@ -382,6 +399,8 @@ static void sriov_disable(struct pci_dev *dev) > for (i = 0; i < iov->num_VFs; i++) > virtfn_remove(dev, i, 0); > >+ pcibios_sriov_disable(dev); >+ > 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); Thanks, Gavin