From patchwork Wed Sep 19 16:30:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10606095 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E3705A4 for ; Wed, 19 Sep 2018 16:31:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55FF02C2A7 for ; Wed, 19 Sep 2018 16:31:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A0932C2D1; Wed, 19 Sep 2018 16:31:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5AC92C2A7 for ; Wed, 19 Sep 2018 16:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732314AbeISWJs (ORCPT ); Wed, 19 Sep 2018 18:09:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:58274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732450AbeISWJr (ORCPT ); Wed, 19 Sep 2018 18:09:47 -0400 Received: from sinanubuntu1604.mkjiurmyylmellclgttazegk5f.bx.internal.cloudapp.net (unknown [40.87.0.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 541DE2151C; Wed, 19 Sep 2018 16:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1537374667; bh=Vr5UiBA9v3nscn/Fca1IrPAK3f8gRaonJjgosaIKcQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q8OVYc/+57hTeruvlAGfmdsxRyScF/ym2aohr0Vz9MGlaMJjreu33PLQs7G0zmTwB GUqSVfe4Ntjdw+tWQvE7rRAjts0WcK4/3fe919HDPuUOt9sRPUbEB0bLdGoybBMUnr uELi2RqWf8PLPey79E4A5prCZMgmkV8mZuDwbqos= From: Sinan Kaya To: linux-pci@vger.kernel.org Cc: alex.williamson@redhat.com, Sinan Kaya , Bjorn Helgaas , Alexey Kardashevskiy , Peter Xu , "Gustavo A. R. Silva" Subject: [PATCH v4 6/6] PCI: Expose reset type to users of pci_reset_bus() Date: Wed, 19 Sep 2018 16:30:37 +0000 Message-Id: <20180919163037.13497-7-okaya@kernel.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180919163037.13497-1-okaya@kernel.org> References: <20180919163037.13497-1-okaya@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Looking to have more control between the users of the API vs. what the API can do internally. The new reset_type tells the PCI core about the bounds of the request. Signed-off-by: Sinan Kaya Acked-by: Alex Williamson --- drivers/pci/pci.c | 18 +++++++++++++++--- drivers/vfio/pci/vfio_pci.c | 6 ++++-- include/linux/pci.h | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b4f14419bd51..f11d29f32119 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5232,13 +5232,25 @@ static int __pci_reset_bus(struct pci_bus *bus) /** * pci_reset_bus - Try to reset a PCI bus * @pdev: top level PCI device to reset via slot/bus + * @reset_type: resets to try * * Same as above except return -EAGAIN if the bus cannot be locked */ -int pci_reset_bus(struct pci_dev *pdev) +int pci_reset_bus(struct pci_dev *pdev, u32 reset_type) { - return (!pci_probe_reset_slot(pdev->slot)) ? - __pci_reset_slot(pdev->slot) : __pci_reset_bus(pdev->bus); + if (reset_type & PCI_RESET_LINK) { + return (!pci_probe_reset_slot(pdev->slot)) ? + __pci_reset_slot(pdev->slot) : + __pci_reset_bus(pdev->bus); + } + + if (reset_type & PCI_RESET_BUS) + return __pci_reset_bus(pdev->bus); + + if (reset_type & PCI_RESET_SLOT) + return __pci_reset_slot(pdev->slot); + + return -EINVAL; } EXPORT_SYMBOL_GPL(pci_reset_bus); diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index fe7ada997c51..0e80c72b1eaa 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -1015,7 +1015,8 @@ static long vfio_pci_ioctl(void *device_data, &info, slot); if (!ret) /* User has access, do the reset */ - ret = pci_reset_bus(vdev->pdev); + ret = pci_reset_bus(vdev->pdev, + slot ? PCI_RESET_SLOT : PCI_RESET_BUS); hot_reset_release: for (i--; i >= 0; i--) @@ -1390,7 +1391,8 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) } if (needs_reset) - ret = pci_reset_bus(vdev->pdev); + ret = pci_reset_bus(vdev->pdev, + slot ? PCI_RESET_SLOT : PCI_RESET_BUS); put_devs: for (i = 0; i < devs.cur_index; i++) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 4fdddcb85066..85f48e156753 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1128,7 +1128,7 @@ int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type); int pci_try_reset_function(struct pci_dev *dev, u32 reset_type); int pci_probe_reset_slot(struct pci_slot *slot); int pci_probe_reset_bus(struct pci_bus *bus); -int pci_reset_bus(struct pci_dev *dev); +int pci_reset_bus(struct pci_dev *dev, u32 reset_type); void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev); void pci_update_resource(struct pci_dev *dev, int resno);