From patchwork Tue Aug 25 07:11:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murthy Bhat X-Patchwork-Id: 7068741 Return-Path: X-Original-To: patchwork-linux-scsi@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 8CC2EC05AC for ; Tue, 25 Aug 2015 07:11:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95B692085E for ; Tue, 25 Aug 2015 07:11:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9ABBC2085D for ; Tue, 25 Aug 2015 07:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751195AbbHYHLO (ORCPT ); Tue, 25 Aug 2015 03:11:14 -0400 Received: from bby1mta02.pmc-sierra.com ([216.241.235.117]:42755 "EHLO bby1mta02.pmc-sierra.bc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbbHYHLO convert rfc822-to-8bit (ORCPT ); Tue, 25 Aug 2015 03:11:14 -0400 Received: from bby1mta02.pmc-sierra.bc.ca (localhost.pmc-sierra.bc.ca [127.0.0.1]) by localhost (Postfix) with SMTP id DE2CE8E0477; Tue, 25 Aug 2015 00:11:13 -0700 (PDT) Received: from smtp.pmcs.com (bby1cas04.pmc-sierra.internal [216.241.227.182]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by bby1mta02.pmc-sierra.bc.ca (Postfix) with ESMTP id 83DFB8E047C; Tue, 25 Aug 2015 00:11:13 -0700 (PDT) Received: from BBYEXM02.pmc-sierra.internal ([169.254.2.226]) by bby1cas04.pmc-sierra.internal ([fe80::8e9:88f9:cdc0:67bb%15]) with mapi id 14.03.0123.003; Tue, 25 Aug 2015 00:11:04 -0700 From: Murthy Bhat To: Karthikeya Sunkesula , Mahesh Rajashekhara , Tomas Henzl , "JBottomley@Parallels.com" , "linux-scsi@vger.kernel.org" CC: "aacraid@pmc-sierra.com" , Harry Yang , Rich Bono Subject: RE: [PATCH V6 09/10] [SCSI] aacraid: Replace pci_enable_msix() with pci_enable_msix_range() Thread-Topic: [PATCH V6 09/10] [SCSI] aacraid: Replace pci_enable_msix() with pci_enable_msix_range() Thread-Index: AQHQ0/rzSn1JV7+S20eHBib0Rvh2wp4cVuTQgAALkIA= Date: Tue, 25 Aug 2015 07:11:12 +0000 Message-ID: <13272BDD18A5F44CB23C497D29A37252DAB0F805@BBYEXM02.pmc-sierra.internal> References: <1439272701-15344-1-git-send-email-Mahesh.Rajashekhara@pmcs.com> <1439272701-15344-10-git-send-email-Mahesh.Rajashekhara@pmcs.com> In-Reply-To: Accept-Language: en-US, en-CA Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [216.241.227.4] MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pmcs.com; h=from:to:cc:subject:date:message-id:references:in-reply-to:content-type:content-transfer-encoding:mime-version; s=default; bh=TVrnYjECakVSRY8wPRNPdnBZYDdG3jcpNPELXAMMuLQ=; b=qUwJVfehn+fUbje1tZdV5cJtMyuHzwa+CRB/avPmVyAEWxvWZdLYSjff3Tii6COmxY50kdAoXgi4o8mXgWEmkC5DoRgvD3fo1NYVImk1LSWV+hAs2wNgYiOLr9cWdGBdGFNk8tDA6r21kxQhDW8Ao2sxFHMdv386Fb8hmwksj0w= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Reviewed-by: Murthy Bhat -----Original Message----- From: Karthikeya Sunkesula Sent: Tuesday, August 25, 2015 12:00 PM To: Mahesh Rajashekhara; Tomas Henzl; JBottomley@Parallels.com; linux-scsi@vger.kernel.org Cc: aacraid@pmc-sierra.com; Harry Yang; Rich Bono Subject: RE: [PATCH V6 09/10] [SCSI] aacraid: Replace pci_enable_msix() with pci_enable_msix_range() Reviewed-by: Karthikeya Sunkesula -----Original Message----- From: Mahesh Rajashekhara Sent: Tuesday, August 11, 2015 11:28 AM To: Tomas Henzl; JBottomley@Parallels.com; linux-scsi@vger.kernel.org Cc: aacraid@pmc-sierra.com; Harry Yang; Rich Bono; Mahesh Rajashekhara Subject: [PATCH V6 09/10] [SCSI] aacraid: Replace pci_enable_msix() with pci_enable_msix_range() Description: As pci_enable_msix() deprecated, replaced with pci_enable_msix_range() Changes from V5: Merged 10 and 11 of V5 into this patch. AAC_MAX_MSIX definition change. Signed-off-by: Mahesh Rajashekhara --- drivers/scsi/aacraid/aacraid.h | 2 +- drivers/scsi/aacraid/comminit.c | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) if (msi_count > 1 && pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) { - i = pci_enable_msix(dev->pdev, + min_msix = 2; + i = pci_enable_msix_range(dev->pdev, dev->msixentry, + min_msix, msi_count); - /* Check how many MSIX vectors are allocated */ - if (i >= 0) { + if (i > 0) { dev->msi_enabled = 1; - if (i) { - msi_count = i; - if (pci_enable_msix(dev->pdev, - dev->msixentry, - msi_count)) { - dev->msi_enabled = 0; - printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n", - dev->name, dev->id, i); - } - } + msi_count = i; } else { dev->msi_enabled = 0; printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n", -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" 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/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 7b95227..2de5ebc 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -12,7 +12,7 @@ * D E F I N E S *----------------------------------------------------------------------------*/ -#define AAC_MAX_MSIX 8 /* vectors */ +#define AAC_MAX_MSIX 32 /* vectors */ #define AAC_PCI_MSI_ENABLE 0x8000 enum { diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index b4b6088..0e954e3 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -338,7 +338,7 @@ static int aac_comm_init(struct aac_dev * dev) void aac_define_int_mode(struct aac_dev *dev) { - int i, msi_count; + int i, msi_count, min_msix; msi_count = i = 0; /* max. vectors from GET_COMM_PREFERRED_SETTINGS */ @@ -366,22 +366,14 @@ void aac_define_int_mode(struct aac_dev *dev)