From patchwork Thu Sep 13 12:41:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 10599443 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 2E8EF6CB for ; Thu, 13 Sep 2018 12:41:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B3542AB6D for ; Thu, 13 Sep 2018 12:41:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D5CD2AB73; Thu, 13 Sep 2018 12:41:36 +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=-7.9 required=2.0 tests=BAYES_00,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 A29392AB6D for ; Thu, 13 Sep 2018 12:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726741AbeIMRuw (ORCPT ); Thu, 13 Sep 2018 13:50:52 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:43796 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727002AbeIMRuw (ORCPT ); Thu, 13 Sep 2018 13:50:52 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8DCeN5h024596 for ; Thu, 13 Sep 2018 08:41:33 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2mfnexxvk0-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Sep 2018 08:41:33 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Sep 2018 13:41:31 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 13 Sep 2018 13:41:28 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w8DCfR2W59441316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 13 Sep 2018 12:41:27 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C28FA4C050; Thu, 13 Sep 2018 15:41:17 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 789C44C04A; Thu, 13 Sep 2018 15:41:17 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 13 Sep 2018 15:41:17 +0100 (BST) From: Sebastian Ott To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Arnd Bergmann , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Russell Currey , linuxppc-dev@lists.ozlabs.org, Oliver OHalloran Subject: [PATCH 1/2] pci: provide add_vfs/del_vfs callbacks Date: Thu, 13 Sep 2018 14:41:23 +0200 X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180913124124.14632-1-sebott@linux.ibm.com> References: <20180912130205.GG118330@bhelgaas-glaptop.roam.corp.google.com> <20180913124124.14632-1-sebott@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18091312-0020-0000-0000-000002C5D5E1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18091312-0021-0000-0000-000021133204 Message-Id: <20180913124124.14632-2-sebott@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-13_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=997 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809130130 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 Provide callbacks that can be used by PCI host bridge implementations to override the behavior of the generic vf detection and device creation code. Signed-off-by: Sebastian Ott --- drivers/pci/iov.c | 51 +++++++++++++++++++++++++++++++++++++++------------ include/linux/pci.h | 2 ++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 0f04ae648cf1..b2ddfe30c5d8 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -251,6 +251,41 @@ int __weak pcibios_sriov_disable(struct pci_dev *pdev) return 0; } +static int pcibios_sriov_add_vfs(struct pci_dev *dev, u16 num_vfs) +{ + struct pci_host_bridge *bridge = pci_find_host_bridge(dev->bus); + unsigned int i; + int rc; + + if (bridge->add_vfs) + return bridge->add_vfs(dev, num_vfs); + + for (i = 0; i < num_vfs; i++) { + rc = pci_iov_add_virtfn(dev, i); + if (rc) + goto failed; + } + return 0; +failed: + while (i--) + pci_iov_remove_virtfn(dev, i); + + return rc; +} + +static void pcibios_sriov_del_vfs(struct pci_dev *dev) +{ + struct pci_host_bridge *bridge = pci_find_host_bridge(dev->bus); + struct pci_sriov *iov = dev->sriov; + int i; + + if (bridge->del_vfs) + return bridge->del_vfs(dev); + + for (i = 0; i < iov->num_VFs; i++) + pci_iov_remove_virtfn(dev, i); +} + static int sriov_enable(struct pci_dev *dev, int nr_virtfn) { int rc; @@ -336,21 +371,15 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) msleep(100); pci_cfg_access_unlock(dev); - for (i = 0; i < initial; i++) { - rc = pci_iov_add_virtfn(dev, i); - if (rc) - goto failed; - } + rc = pcibios_sriov_add_vfs(dev, initial); + if (rc) + goto err_pcibios; kobject_uevent(&dev->dev.kobj, KOBJ_CHANGE); iov->num_VFs = nr_virtfn; return 0; -failed: - while (i--) - pci_iov_remove_virtfn(dev, i); - err_pcibios: iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE); pci_cfg_access_lock(dev); @@ -369,14 +398,12 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) static void sriov_disable(struct pci_dev *dev) { - int i; struct pci_sriov *iov = dev->sriov; if (!iov->num_VFs) return; - for (i = 0; i < iov->num_VFs; i++) - pci_iov_remove_virtfn(dev, i); + pcibios_sriov_del_vfs(dev); iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE); pci_cfg_access_lock(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 680b6bcd0b97..bf99ae98ecb5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -475,6 +475,8 @@ struct pci_host_bridge { int (*free_irq)(struct pci_dev *); void (*add_bus)(struct pci_bus *); void (*remove_bus)(struct pci_bus *); + int (*add_vfs)(struct pci_dev *dev, u16 num_vfs); + void (*del_vfs)(struct pci_dev *dev); void *release_data; struct msi_controller *msi; unsigned int ignore_reset_delay:1; /* For entire hierarchy */