From patchwork Tue Feb 24 08:33:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 5870521 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7221BF440 for ; Tue, 24 Feb 2015 08:33:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D10492060B for ; Tue, 24 Feb 2015 08:33:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E837020650 for ; Tue, 24 Feb 2015 08:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752475AbbBXIdz (ORCPT ); Tue, 24 Feb 2015 03:33:55 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:43831 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326AbbBXIdy (ORCPT ); Tue, 24 Feb 2015 03:33:54 -0500 Received: by paceu11 with SMTP id eu11so34339225pac.10 for ; Tue, 24 Feb 2015 00:33:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=iK7JO9WmU2mWevjkDSbzybRVgmdsLLTCucv6NvEnb6I=; b=SxQcOfBU41a6/v8PXhV7qfbyitmm76bqrS8lgyygx2h0q6xqjGRwMNLSgGsco2E2uD ZTtnXSly/C43bLiUYplljXd7LDCjRNF1ZGYswrwTt3+SzcV0PZ/DmNEN5Q3AAd9/Vrr+ ZruHT7coHid5kNNMcrwlrL7Ai+ByGJYkBzPx6pvXXvY0OMyoYVh6e2vfR4VVlMwEm1IA 6hINN2LQpk9Zd53JGpaxXMWFu/DfN4/VHKpBq0DO06kTY7r8m+8e+GyuRFi/9yQvMFvA 3zr2ua9Xre3MPq0j8zMChHyQgdGSLF5bnUvKJG+C/kn7kzKCR3X1Wyenl3xo7Dv/x/FA tBBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=iK7JO9WmU2mWevjkDSbzybRVgmdsLLTCucv6NvEnb6I=; b=Zd0LRsy4BU81VJE4UgiXh1r00IIQ9xYt3wO69Tt6EAQC/KtOHqtfZ5iOSwpsyqTnWq dxMGiIMov87hb5GN+JFGWilEW5SUzMibx2FIOBj5lwQCRKI6Pyf3PNTfcaN58EkGI/IL WZM0zXcNreUQZKtm7XNFCPFiXtQQwqtouKICjVCRrBMUcD9Z9Z3jHBTaJGf7tCStDAh3 9grad4FLxiapEFfNwo3eVYFf87NrUtSM94pT3+N1eDgXH9KYg3pexZ4NaiICqTay5gOd valazxnGqBv+1/eyXPHRBQBYuSa+1KzICPkBmfKgnGXXUTanbYqLI1UZ63MZZFT92yoR jasQ== X-Gm-Message-State: ALoCoQmdxP6PF9aPomWGF83LyJE+GbhS6thwpDHhznbfRR9Fh98Rpqh1JFuak3NqNN//+K1QuOvS X-Received: by 10.70.128.15 with SMTP id nk15mr26351300pdb.121.1424766834221; Tue, 24 Feb 2015 00:33:54 -0800 (PST) Received: from localhost ([12.23.74.29]) by mx.google.com with ESMTPSA id fh1sm37307203pbb.70.2015.02.24.00.33.53 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Feb 2015 00:33:53 -0800 (PST) Subject: [PATCH v12 08/21] PCI: Add pcibios_sriov_enable() and pcibios_sriov_disable() To: Wei Yang , benh@au1.ibm.com, gwshan@linux.vnet.ibm.com From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 24 Feb 2015 02:33:52 -0600 Message-ID: <20150224083352.32124.63952.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150224082939.32124.45744.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150224082939.32124.45744.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 From: Wei Yang VFs are dynamically created when a driver enables them. On some platforms, like PowerNV, special resources are necessary to enable VFs. Add platform hooks for enabling and disabling VFs. Signed-off-by: Wei Yang Signed-off-by: Bjorn Helgaas --- drivers/pci/iov.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 5643a1011e23..cc6fedf4a1b9 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -220,6 +220,11 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset) pci_dev_put(dev); } +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; @@ -231,6 +236,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) struct pci_sriov *iov = dev->sriov; int bars = 0; int bus; + int retval; if (!nr_virtfn) return 0; @@ -307,6 +313,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_enable()\n", + retval); + return retval; + } + for (i = 0; i < initial; i++) { rc = virtfn_add(dev, i, 0); if (rc) @@ -335,6 +347,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; @@ -346,6 +363,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);