From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932071AbaHKSID (ORCPT ); Mon, 11 Aug 2014 14:08:03 -0400 Received: from mx0b-0016ce01.pphosted.com ([67.231.156.153]:8846 "EHLO mx0b-0016ce01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753324AbaHKSIB (ORCPT ); Mon, 11 Aug 2014 14:08:01 -0400 Date: Mon, 11 Aug 2014 14:07:52 -0400 From: Chad Dupuis X-X-Sender: cdupuis@administrators-macbook-pro.local To: Alexander Gordeev CC: , , , Subject: Re: [PATCH v2 RESEND 21/23] qla2xxx: Use pci_enable_msix_range() instead of pci_enable_msix() In-Reply-To: <20140811085709.GM16504@dhcp-27-160.brq.redhat.com> Message-ID: References: <20140811085709.GM16504@dhcp-27-160.brq.redhat.com> User-Agent: Alpine 2.00 (OSX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII"; format=flowed X-Originating-IP: [10.1.4.10] disclaimer: bypass X-Proofpoint-Virus-Version: vendor=nai engine=5600 definitions=7526 signatures=670498 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1408110206 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Aug 2014, Alexander Gordeev wrote: > On Wed, Jul 16, 2014 at 08:05:25PM +0200, Alexander Gordeev wrote: >> 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. >> >> Log message code 0x00c6 preserved, although it is reported >> after successful call to pci_enable_msix_range(), not before >> possibly unsuccessful call to pci_enable_msix(). Consumers >> of the error code should not notice the difference. > > Hello, > > Please, anyone (from QLogic especially) review this patch. > > Thanks! Looks good. Ack-by: Chad Dupuis > >> Signed-off-by: Alexander Gordeev >> Cc: qla2xxx-upstream@qlogic.com >> Cc: linux-scsi@vger.kernel.org >> Cc: linux-pci@vger.kernel.org >> --- >> drivers/scsi/qla2xxx/qla_isr.c | 27 +++++++++++---------------- >> 1 files changed, 11 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c >> index a56825c..52d420f 100644 >> --- a/drivers/scsi/qla2xxx/qla_isr.c >> +++ b/drivers/scsi/qla2xxx/qla_isr.c >> @@ -2923,27 +2923,22 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) >> for (i = 0; i < ha->msix_count; i++) >> entries[i].entry = i; >> >> - ret = pci_enable_msix(ha->pdev, entries, ha->msix_count); >> - if (ret) { >> - if (ret < MIN_MSIX_COUNT) >> - goto msix_failed; >> - >> + ret = pci_enable_msix_range(ha->pdev, >> + entries, MIN_MSIX_COUNT, ha->msix_count); >> + if (ret < 0) { >> + ql_log(ql_log_fatal, vha, 0x00c7, >> + "MSI-X: Failed to enable support, " >> + "giving up -- %d/%d.\n", >> + ha->msix_count, ret); >> + goto msix_out; >> + } else if (ret < ha->msix_count) { >> ql_log(ql_log_warn, vha, 0x00c6, >> "MSI-X: Failed to enable support " >> "-- %d/%d\n Retry with %d vectors.\n", >> ha->msix_count, ret, ret); >> - ha->msix_count = ret; >> - ret = pci_enable_msix(ha->pdev, entries, ha->msix_count); >> - if (ret) { >> -msix_failed: >> - ql_log(ql_log_fatal, vha, 0x00c7, >> - "MSI-X: Failed to enable support, " >> - "giving up -- %d/%d.\n", >> - ha->msix_count, ret); >> - goto msix_out; >> - } >> - ha->max_rsp_queues = ha->msix_count - 1; >> } >> + ha->msix_count = ret; >> + ha->max_rsp_queues = ha->msix_count - 1; >> ha->msix_entries = kzalloc(sizeof(struct qla_msix_entry) * >> ha->msix_count, GFP_KERNEL); >> if (!ha->msix_entries) { >> -- >> 1.7.7.6 >> >