From patchwork Tue Dec 22 13:42:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Lesokhin X-Patchwork-Id: 7904611 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A36AE9F349 for ; Tue, 22 Dec 2015 13:42:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9CD920501 for ; Tue, 22 Dec 2015 13:42:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA89D20527 for ; Tue, 22 Dec 2015 13:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753382AbbLVNmp (ORCPT ); Tue, 22 Dec 2015 08:42:45 -0500 Received: from [193.47.165.129] ([193.47.165.129]:35174 "EHLO mellanox.co.il" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752398AbbLVNml (ORCPT ); Tue, 22 Dec 2015 08:42:41 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from ilyal@mellanox.com) with ESMTPS (AES256-SHA encrypted); 22 Dec 2015 15:42:20 +0200 Received: from gen-l-vrt-094.mtl.labs.mlnx (gen-l-vrt-094.mtl.labs.mlnx [10.137.9.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id tBMDgIT5005850; Tue, 22 Dec 2015 15:42:19 +0200 From: Ilya Lesokhin To: kvm@vger.kernel.org, linux-pci@vger.kernel.org Cc: bhelgaas@google.com, alex.williamson@redhat.com, noaos@mellanox.com, haggaie@mellanox.com, ogerlitz@mellanox.com, liranl@mellanox.com, ilyal@mellanox.com Subject: [RFC 1/2] PCI: Expose iov_set_numvfs and iov_resource_size for modules. Date: Tue, 22 Dec 2015 15:42:13 +0200 Message-Id: <1450791734-3907-2-git-send-email-ilyal@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1450791734-3907-1-git-send-email-ilyal@mellanox.com> References: <1450791734-3907-1-git-send-email-ilyal@mellanox.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Expose iov_set_numvfs and iov_resource_size to make them available for VFIO-PCI sriov support. Signed-off-by: Ilya Lesokhin Signed-off-by: Noa Osherovich Signed-off-by: Haggai Eran --- drivers/pci/iov.c | 4 +++- include/linux/pci.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index ee0ebff..f296bd3 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -41,7 +41,7 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int vf_id) * * Update iov->offset and iov->stride when NumVFs is written. */ -static inline void pci_iov_set_numvfs(struct pci_dev *dev, int nr_virtfn) +inline void pci_iov_set_numvfs(struct pci_dev *dev, int nr_virtfn) { struct pci_sriov *iov = dev->sriov; @@ -49,6 +49,7 @@ static inline void pci_iov_set_numvfs(struct pci_dev *dev, int nr_virtfn) pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_OFFSET, &iov->offset); pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_STRIDE, &iov->stride); } +EXPORT_SYMBOL(pci_iov_set_numvfs); /* * The PF consumes one bus number. NumVFs, First VF Offset, and VF Stride @@ -107,6 +108,7 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) return dev->sriov->barsz[resno - PCI_IOV_RESOURCES]; } +EXPORT_SYMBOL(pci_iov_resource_size); static int virtfn_add(struct pci_dev *dev, int id, int reset) { diff --git a/include/linux/pci.h b/include/linux/pci.h index e90eb22..1039e18 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1724,6 +1724,8 @@ int pci_vfs_assigned(struct pci_dev *dev); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_get_totalvfs(struct pci_dev *dev); resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); + +void pci_iov_set_numvfs(struct pci_dev *dev, int nr_virtfn); #else static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id) { @@ -1745,6 +1747,8 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) { return 0; } static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) { return 0; } + +void pci_iov_set_numvfs(struct pci_dev *dev, int nr_virtfn) { } #endif #if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)