From patchwork Fri Feb 21 15:49:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 3698161 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 60CBCBF13A for ; Fri, 21 Feb 2014 15:47:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82E3C2018B for ; Fri, 21 Feb 2014 15:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF6A9200E8 for ; Fri, 21 Feb 2014 15:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932262AbaBUPro (ORCPT ); Fri, 21 Feb 2014 10:47:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61582 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932145AbaBUPrm (ORCPT ); Fri, 21 Feb 2014 10:47:42 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1LFlf7Q000773 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Feb 2014 10:47:41 -0500 Received: from dhcp-26-207.brq.redhat.com (dhcp-27-68.brq.redhat.com [10.34.27.68]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1LFlWgt025317; Fri, 21 Feb 2014 10:47:40 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Jon Mason , linux-pci@vger.kernel.org Subject: [PATCH v2 4/4] ntb: Use pci_enable_msix_range() instead of pci_enable_msix() Date: Fri, 21 Feb 2014 16:49:32 +0100 Message-Id: <0afccb5cf0710f980b47e57c4e9b27eeb3033955.1392996332.git.agordeev@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.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 As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. Signed-off-by: Alexander Gordeev Cc: Jon Mason Cc: linux-pci@vger.kernel.org --- drivers/ntb/ntb_hw.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index 0472045..9f2005d 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -1088,11 +1088,9 @@ static int ntb_setup_snb_msix(struct ntb_device *ndev, int msix_entries) if (msix_entries < SNB_MSIX_CNT) return -ENOSPC; - rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries); + rc = pci_enable_msix_exact(pdev, ndev->msix_entries, msix_entries); if (rc < 0) return rc; - else if (rc > 0) - return -ENOSPC; for (i = 0; i < msix_entries; i++) { msix = &ndev->msix_entries[i]; @@ -1142,18 +1140,10 @@ static int ntb_setup_bwd_msix(struct ntb_device *ndev, int msix_entries) struct msix_entry *msix; int rc, i; -retry: - rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries); - if (rc < 0) - return rc; - else if (rc > 0) { - dev_warn(&pdev->dev, - "Only %d MSI-X vectors. " - "Limiting the number of queues to that number.\n", - rc); - msix_entries = rc; - goto retry; - } + msix_entries = pci_enable_msix_range(pdev, ndev->msix_entries, + 1, msix_entries); + if (msix_entries < 0) + return msix_entries; for (i = 0; i < msix_entries; i++) { msix = &ndev->msix_entries[i];