From patchwork Tue Mar 11 16:00:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 329143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C908B2C00BD for ; Wed, 12 Mar 2014 02:58:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754084AbaCKP6i (ORCPT ); Tue, 11 Mar 2014 11:58:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20514 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753646AbaCKP6h (ORCPT ); Tue, 11 Mar 2014 11:58:37 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFwap7017065 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Mar 2014 11:58:36 -0400 Received: from dhcp-26-207.brq.redhat.com (dhcp-27-68.brq.redhat.com [10.34.27.68]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFwWTG006976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 11 Mar 2014 11:58:34 -0400 Date: Tue, 11 Mar 2014 17:00:35 +0100 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Jon Mason , linux-pci@vger.kernel.org Subject: [PATCH v2 4/4] ntb: Use pci_enable_msix_range() instead of pci_enable_msix() Message-ID: <20140311160034.GB25638@dhcp-26-207.brq.redhat.com> References: <0afccb5cf0710f980b47e57c4e9b27eeb3033955.1392996332.git.agordeev@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <0afccb5cf0710f980b47e57c4e9b27eeb3033955.1392996332.git.agordeev@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 1f8decd..ff5c0a3 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 < ndev->limits.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]; @@ -1138,18 +1136,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];