[{"id":1763777,"web_url":"http://patchwork.ozlabs.org/comment/1763777/","msgid":"<1504662680.13106.1.camel@russell.cc>","list_archive_url":null,"date":"2017-09-06T01:51:20","subject":"Re: [PATCH 1/2] PCI: Remove reset argument from\n\tpci_iov_{add,remove}_virtfn()","submitter":{"id":67478,"url":"http://patchwork.ozlabs.org/api/people/67478/","name":"Russell Currey","email":"ruscur@russell.cc"},"content":"On Wed, 2017-09-06 at 01:21 +0200, Jan H. Schönherr wrote:\n> The reset argument passed to pci_iov_add_virtfn() and\n> pci_iov_remove_virtfn() is always zero since commit 46cb7b1bd86fc227a\n> (\"PCI: Remove unused SR-IOV VF Migration support\").\n> \n> Remove the argument together with the associated code.\n> \n> Signed-off-by: Jan H. Schönherr \n\nAcked-by: Russell Currey ","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-pci-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"QxIKDyPQ\"; \n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xn6532T3sz9sNq\n\tfor ;\n\tWed, 6 Sep 2017 11:51:35 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753474AbdIFBv1 (ORCPT );\n\tTue, 5 Sep 2017 21:51:27 -0400","from out1-smtp.messagingengine.com ([66.111.4.25]:36091 \"EHLO\n\tout1-smtp.messagingengine.com\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753361AbdIFBv0 (ORCPT\n\t); Tue, 5 Sep 2017 21:51:26 -0400","from compute6.internal (compute6.nyi.internal [10.202.2.46])\n\tby mailout.nyi.internal (Postfix) with ESMTP id D1DCF21106;\n\tTue, 5 Sep 2017 21:51:25 -0400 (EDT)","from frontend2 ([10.202.2.161])\n\tby compute6.internal (MEProxy); Tue, 05 Sep 2017 21:51:25 -0400","from snap.ozlabs.ibm.com (bh02i525f01.au.ibm.com [202.81.18.30])\n\tby mail.messagingengine.com (Postfix) with ESMTPA id EB4C324081;\n\tTue, 5 Sep 2017 21:51:23 -0400 (EDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmessagingengine.com; h=cc:content-transfer-encoding:content-type\n\t:date:from:in-reply-to:message-id:mime-version:references\n\t:subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=\n\tfm1; bh=+iJK+k4bEIeG54KVJkX3E+Pip3vg9VDbkulKTG8oFLc=; b=QxIKDyPQ\n\tLnaKmKHZes0bzKvbjv7BXOiYtu8MG4bh1ZXvAxhaXX5bOYUhScYykrp3CLWLxWKx\n\tqG/4+j4iDYnXyFVff3r8z08IPe95mKA+vgAarAAdChnagdE8y8YT/1LTSAM3sspp\n\tPPzZHB3P37nEODIxGy3qG/w1xI2n75PcQiE6Ujf3ni0TMzDEEjE9VVjGSPw5g4ET\n\tkIs2v8RJrNzGjIQWww37tlgKw6dBd7tDv5RXUusjUQlvAbriQICyWi3lnhVCHQwL\n\tcPufgqkGgYDjJ79EBO8qSgCOc6frBBUUs1d0n5fl8ujuXhSaC4OV2R5DA2UG9MBQ\n\tDXfeVdahb8njHQ==","X-ME-Sender":"","X-Sasl-enc":"6E+jS/58Qi4cRCyKDbcKr5Uz71aVYHwsqpppFsIgMd37 1504662685","Message-ID":"<1504662680.13106.1.camel@russell.cc>","Subject":"Re: [PATCH 1/2] PCI: Remove reset argument from\n\tpci_iov_{add,remove}_virtfn()","From":"Russell Currey ","To":"\"Jan H.\" =?iso-8859-1?q?Sch=F6nherr?= ,\n\tBjorn Helgaas ","Cc":"linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org","Date":"Wed, 06 Sep 2017 11:51:20 +1000","In-Reply-To":"<1504653683-11543-1-git-send-email-jschoenh@amazon.de>","References":"<1504653683-11543-1-git-send-email-jschoenh@amazon.de>","Content-Type":"text/plain; charset=\"UTF-8\"","X-Mailer":"Evolution 3.24.5 ","Mime-Version":"1.0","Content-Transfer-Encoding":"8bit","Sender":"linux-pci-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-pci@vger.kernel.org"}},{"id":1775748,"web_url":"http://patchwork.ozlabs.org/comment/1775748/","msgid":"<20170926175730.GN15970@bhelgaas-glaptop.roam.corp.google.com>","list_archive_url":null,"date":"2017-09-26T17:57:30","subject":"Re: [PATCH 1/2] PCI: Remove reset argument from\n\tpci_iov_{add,remove}_virtfn()","submitter":{"id":67298,"url":"http://patchwork.ozlabs.org/api/people/67298/","name":"Bjorn Helgaas","email":"helgaas@kernel.org"},"content":"On Wed, Sep 06, 2017 at 01:21:22AM +0200, Jan H. Schönherr wrote:\n> The reset argument passed to pci_iov_add_virtfn() and\n> pci_iov_remove_virtfn() is always zero since commit 46cb7b1bd86fc227a\n> (\"PCI: Remove unused SR-IOV VF Migration support\").\n> \n> Remove the argument together with the associated code.\n> \n> Signed-off-by: Jan H. Schönherr \n\nApplied both (with Russell's ack on the first) to pci/virtualization\nfor v4.14, thanks!\n\n> ---\n> arch/powerpc/kernel/eeh_driver.c | 4 ++--\n> drivers/pci/iov.c | 18 +++++-------------\n> include/linux/pci.h | 8 ++++----\n> 3 files changed, 11 insertions(+), 19 deletions(-)\n> \n> diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c\n> index c405c79..23ea86f 100644\n> --- a/arch/powerpc/kernel/eeh_driver.c\n> +++ b/arch/powerpc/kernel/eeh_driver.c\n> @@ -441,7 +441,7 @@ static void *eeh_add_virt_device(void *data, void *userdata)\n> \t}\n> \n> #ifdef CONFIG_PPC_POWERNV\n> -\tpci_iov_add_virtfn(edev->physfn, pdn->vf_index, 0);\n> +\tpci_iov_add_virtfn(edev->physfn, pdn->vf_index);\n> #endif\n> \treturn NULL;\n> }\n> @@ -499,7 +499,7 @@ static void *eeh_rmv_device(void *data, void *userdata)\n> #ifdef CONFIG_PPC_POWERNV\n> \t\tstruct pci_dn *pdn = eeh_dev_to_pdn(edev);\n> \n> -\t\tpci_iov_remove_virtfn(edev->physfn, pdn->vf_index, 0);\n> +\t\tpci_iov_remove_virtfn(edev->physfn, pdn->vf_index);\n> \t\tedev->pdev = NULL;\n> \n> \t\t/*\n> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c\n> index 120485d..21b55ca 100644\n> --- a/drivers/pci/iov.c\n> +++ b/drivers/pci/iov.c\n> @@ -113,7 +113,7 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)\n> \treturn dev->sriov->barsz[resno - PCI_IOV_RESOURCES];\n> }\n> \n> -int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)\n> +int pci_iov_add_virtfn(struct pci_dev *dev, int id)\n> {\n> \tint i;\n> \tint rc = -ENOMEM;\n> @@ -157,9 +157,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)\n> \t\tBUG_ON(rc);\n> \t}\n> \n> -\tif (reset)\n> -\t\t__pci_reset_function(virtfn);\n> -\n> \tpci_device_add(virtfn, virtfn->bus);\n> \n> \tpci_bus_add_device(virtfn);\n> @@ -187,7 +184,7 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)\n> \treturn rc;\n> }\n> \n> -void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset)\n> +void pci_iov_remove_virtfn(struct pci_dev *dev, int id)\n> {\n> \tchar buf[VIRTFN_ID_LEN];\n> \tstruct pci_dev *virtfn;\n> @@ -198,11 +195,6 @@ void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset)\n> \tif (!virtfn)\n> \t\treturn;\n> \n> -\tif (reset) {\n> -\t\tdevice_release_driver(&virtfn->dev);\n> -\t\t__pci_reset_function(virtfn);\n> -\t}\n> -\n> \tsprintf(buf, \"virtfn%u\", id);\n> \tsysfs_remove_link(&dev->dev.kobj, buf);\n> \t/*\n> @@ -317,7 +309,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)\n> \tpci_cfg_access_unlock(dev);\n> \n> \tfor (i = 0; i < initial; i++) {\n> -\t\trc = pci_iov_add_virtfn(dev, i, 0);\n> +\t\trc = pci_iov_add_virtfn(dev, i);\n> \t\tif (rc)\n> \t\t\tgoto failed;\n> \t}\n> @@ -329,7 +321,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)\n> \n> failed:\n> \twhile (i--)\n> -\t\tpci_iov_remove_virtfn(dev, i, 0);\n> +\t\tpci_iov_remove_virtfn(dev, i);\n> \n> \tpcibios_sriov_disable(dev);\n> err_pcibios:\n> @@ -355,7 +347,7 @@ static void sriov_disable(struct pci_dev *dev)\n> \t\treturn;\n> \n> \tfor (i = 0; i < iov->num_VFs; i++)\n> -\t\tpci_iov_remove_virtfn(dev, i, 0);\n> +\t\tpci_iov_remove_virtfn(dev, i);\n> \n> \tpcibios_sriov_disable(dev);\n> \n> diff --git a/include/linux/pci.h b/include/linux/pci.h\n> index f958d07..4acf321 100644\n> --- a/include/linux/pci.h\n> +++ b/include/linux/pci.h\n> @@ -1903,8 +1903,8 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int id);\n> \n> int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);\n> void pci_disable_sriov(struct pci_dev *dev);\n> -int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset);\n> -void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset);\n> +int pci_iov_add_virtfn(struct pci_dev *dev, int id);\n> +void pci_iov_remove_virtfn(struct pci_dev *dev, int id);\n> int pci_num_vf(struct pci_dev *dev);\n> int pci_vfs_assigned(struct pci_dev *dev);\n> int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);\n> @@ -1921,12 +1921,12 @@ static inline int pci_iov_virtfn_devfn(struct pci_dev *dev, int id)\n> }\n> static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)\n> { return -ENODEV; }\n> -static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)\n> +static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id)\n> {\n> \treturn -ENOSYS;\n> }\n> static inline void pci_iov_remove_virtfn(struct pci_dev *dev,\n> -\t\t\t\t\t int id, int reset) { }\n> +\t\t\t\t\t int id) { }\n> static inline void pci_disable_sriov(struct pci_dev *dev) { }\n> static inline int pci_num_vf(struct pci_dev *dev) { return 0; }\n> static inline int pci_vfs_assigned(struct pci_dev *dev)\n> -- \n> 2.10.0.1.g70cd14e\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-pci-owner@vger.kernel.org;\n\treceiver=)","mail.kernel.org;\n\tdmarc=none (p=none dis=none) header.from=kernel.org","mail.kernel.org;\n\tspf=none smtp.mailfrom=helgaas@kernel.org"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y1pZR3jHFz9t39\n\tfor ;\n\tWed, 27 Sep 2017 03:57:35 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S935108AbdIZR5d (ORCPT );\n\tTue, 26 Sep 2017 13:57:33 -0400","from mail.kernel.org ([198.145.29.99]:34696 \"EHLO mail.kernel.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S934771AbdIZR5c (ORCPT );\n\tTue, 26 Sep 2017 13:57:32 -0400","from localhost (unknown [69.71.4.159])\n\t(using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits))\n\t(No client certificate requested)\n\tby mail.kernel.org (Postfix) with ESMTPSA id CA7D321482;\n\tTue, 26 Sep 2017 17:57:31 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mail.kernel.org CA7D321482","Date":"Tue, 26 Sep 2017 12:57:30 -0500","From":"Bjorn Helgaas ","To":"Jan =?iso-8859-1?q?H=2E_Sch=F6nherr?= ","Cc":"Bjorn Helgaas , linux-pci@vger.kernel.org,\n\tRussell Currey , linuxppc-dev@lists.ozlabs.org","Subject":"Re: [PATCH 1/2] PCI: Remove reset argument from\n\tpci_iov_{add,remove}_virtfn()","Message-ID":"<20170926175730.GN15970@bhelgaas-glaptop.roam.corp.google.com>","References":"<1504653683-11543-1-git-send-email-jschoenh@amazon.de>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<1504653683-11543-1-git-send-email-jschoenh@amazon.de>","User-Agent":"Mutt/1.5.21 (2010-09-15)","Sender":"linux-pci-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-pci@vger.kernel.org"}}]