From patchwork Fri Oct 13 22:43:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10006061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DCBB60360 for ; Fri, 13 Oct 2017 22:43:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F139229181 for ; Fri, 13 Oct 2017 22:43:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5C5529183; Fri, 13 Oct 2017 22:43:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36C4229181 for ; Fri, 13 Oct 2017 22:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752884AbdJMWnb (ORCPT ); Fri, 13 Oct 2017 18:43:31 -0400 Received: from mail-by2nam01on0066.outbound.protection.outlook.com ([104.47.34.66]:40672 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751510AbdJMWna (ORCPT ); Fri, 13 Oct 2017 18:43:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wuImxXrdyu+Y7ueuPebLyTJHOXbizEEL042PYo82oGM=; b=fqfyJdXSqiDq0tmC6jTACjBasFvYyUzNPYioky8zFx8oTXruItYJHogSEIolq4HfnuZpnUOJr4bffyNcAbIdDUr9Ed0K/HxsBPYR765yPepGrC2a8tIOM5q0v+aQ90B6dXXWmBHLBv2TX2dx++fo5uQMXPJwBoScLlwmvnRIaLY= Received: from SN4PR0701CA0019.namprd07.prod.outlook.com (10.161.192.157) by BLUPR0701MB1939.namprd07.prod.outlook.com (10.163.121.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 13 Oct 2017 22:43:27 +0000 Received: from BL2FFO11FD020.protection.gbl (2a01:111:f400:7c09::111) by SN4PR0701CA0019.outlook.office365.com (2603:10b6:803:28::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Fri, 13 Oct 2017 22:43:27 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD020.mail.protection.outlook.com (10.173.161.38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.77.10 via Frontend Transport; Fri, 13 Oct 2017 22:43:27 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Fri, 13 Oct 2017 15:43:24 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id v9DMhORM014902; Fri, 13 Oct 2017 15:43:24 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v9DMhOPN014901; Fri, 13 Oct 2017 15:43:24 -0700 From: "Madhani, Madhani" To: , CC: , Subject: [PATCH 1/2] qla2xxx: Use ql2xnvmeenable to enable Q-Pair for FC-NVMe Date: Fri, 13 Oct 2017 15:43:22 -0700 Message-ID: <20171013224323.14863-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171013224323.14863-1-himanshu.madhani@cavium.com> References: <20171013224323.14863-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(2980300002)(428002)(189002)(199003)(81166006)(8936002)(2906002)(1076002)(8676002)(69596002)(81156014)(316002)(76176999)(36756003)(16586007)(80596001)(72206003)(42186006)(50986999)(54906003)(87636003)(478600001)(110136005)(4326008)(575784001)(106466001)(105586002)(2950100002)(86362001)(101416001)(47776003)(50226002)(356003)(33646002)(305945005)(5660300001)(189998001)(48376002)(50466002)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1939; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD020; 1:vipn/E7m4fpEO+FrEi/kpKdth2cbYFsEVBjXeQQ6EEazozTbRNJHRjXvGJt+Afve3JaOJ6uTxkMrUKW0V8xQvp1Ev+QNZmPX5s3QHc99rWX5VINXn84imf/0QHk2YJTU X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07854189-eeac-4ecc-c86f-08d5128bd1f6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0701MB1939; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1939; 3:zHZ3OXK8FDnHV+OAUbWsC/EJTHBs4FSITmCLxxpyAJfqEUdEpT9v+VOl3L4b8efIQdcwDWrdAXmOjAz3bWMKX7cw5lSJXSB+D2XoHlbklVrvKksHXrz4xeeCDaopp24VO8gCy7rK+Z+CvCrSuPB3jcrgV0A/aZ4zx7aPCA5q4w4TcIPKkjnv+Rp6g0ImGckeY+fVPZauhbm16DsMG+yGVJos+t/QbzvtM5lRdMg83dmlXGayAUjf1PuyNjA7rPBTvhx+6dl1X/FGy6LoldEOE6gghuHG3hTsgwgDa8WNklIf6t85IBTh/YmFg6/BhzTSTu3cnMMNiX9muxatOFWhxOYCwA26WrGmMmW8NKtCLTc=; 25:LfBDDOJ85b27Tu3kHOa+Xw8wWovM9eb/4P2hHzifZnJaeI9WAF4V6pb6cg3qDThT8yl3zPKOd8aZwIvhXzrLIxxQ2z4y1V6PK8y/C/+7WzJ/0EsR+5SIkolEAhlWk/u4E0p/c6TecRxJvTMkj3pNhHZZZHgDXUdswyvgpRy1lrUzjPvawo60Nd943YYf8ct/2FpgHCRYa2DMswcX8vtkR3PmLstY65cBJl3Y8gqQOyDlNAgz/UgeuSkS3dNIAFvZqhrmQif3JoJ+s5GiX9Gn52r5EWDADBqA8aRjioYQNgqwb0eDVGDLNNiOKWCpffcZ4uQ9teEAOGu2o6mumYZ/pRotDkJ2rAyZDI7SbnB2u5o= X-MS-TrafficTypeDiagnostic: BLUPR0701MB1939: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1939; 31:yQ5BdBpsVJZy71OGHyyEaZNUxooXxsCalGflsuQYllcFsQ6dWZs+jPyhTx83mOpJ4X7tIlFgQPfdjjjL4wGpPMkX+NGpCgdZORsNAK6E7ul9JVIb10d+KzH1NOLJ+XM9/6mpQJBwIXCAQVsamzevF0fuIfkFeZmLcOIio9HHfsdzn7l9Fnkcvf6nLfG4IIehtl+LPs5UT22BPIl1wLAbSXvIhpGNMmxGGhL3KLvHkik=; 20:j5vlqg+pWcw911vb/Mthe+wowl8XVFUuZEvFY9vp7KJU4IkM7HQ4ULfWoPgAbioRGqBFlO7gAkA5o6gzKTBc/Ui4mVftX2c3tfB9kKTBGNrA98o6uz2aMOX3RXuGNrdJad/Q5EhXdAolgyY1H65xxtIYY+xWXnql6cBuzwD1KykHta1grB9GGi2i8336mwL/LKQmV0kSERq09t2uxkuYoRQ2uJaDEkSj6y3O/ohmN5OkAceymKIn14grAtK2jrXGWrq7nZbIRsVAfGKSi/sKfJ/HEBazrqAAMQ9w2M0huFkCbff65D+yjqtnnuaKA2F60loXk2JP/uMW911xqwCPCJINYnFd+AYaaeML4fwn8qjXCyEA5mgIrdZPawMKcQfPXE7TfDGR+35Q7ZiSzqtzTWADLxbwVZpdr9gwRoODzu8z/D8ET+qjtBtXxSeKGRwYYp9APnp1Lo3fjr7dJC74Zjq70XTT9Lz3Ikpy7LMkkJ2E4SHKK5XsUapNbqbllwGL X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123558100)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0701MB1939; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0701MB1939; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1939; 4:5vVbzKiqoXR8IlyeRxKpG/YczBSfcxtHphsUuWGEve74aSIna1bIwCCeKElAn45bByXY+PM+FYzqG8m1lTTMkWx0lnjMIpoKg7viQUQYuBkO/fqqAhrtb6Tw30SbBEeq3EDTLEUnevURv3o5siFL7xEIqInJTs6VWwGGo/Cm2kqvgzu7+rpyX+UtdvNIhM5pxn8IN4gjjdUNeCeybPvQjaWqu7aiC/sjCvhpcccwz5nEKepgnP1b18ueCyvJXw6n X-Forefront-PRVS: 04599F3534 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1939; 23:z1BFguxxYMuRHPuAldno4/w4dQtwmSOd4HMfAFG?= =?us-ascii?Q?laBcEHwbFIcb9tiQNWOJaz8X6cGl1ka0a5r2L7MdOs2yQ6ZCBdgwdThkpWIQ?= =?us-ascii?Q?wYufYcmUqbBw4DFlQ2FZ3wRyE0Qvdzdw8z/hbcTJX67UJP7kYEaFCSuXtNr6?= =?us-ascii?Q?ORo3mv5RUcy74rboW0HHFmTSiDnpNKC/jHjA6rfYWrVVi/pX9pudwywp3/PE?= =?us-ascii?Q?NloznV26liTnC+nFgGIPA5zdKGg/7ViCjy7lmAziTvJdQHgOEcjPVIOjWrj2?= =?us-ascii?Q?g7DxkSVim1JDv7FJdFaNPU5I2MjApUn+Hgi4kQZONghTv0LvUiU3Rjty+JXi?= =?us-ascii?Q?ZQ+hTTGJTQ6cU5VmcRZ/ML3TQpkQr6B2af/SbTRdUipNLGenIP+WAEORveNU?= =?us-ascii?Q?6dgSOkVOGKwxraLOlVR+qBl3NFxwiFA0GkhZV9b5BIM+hlAfV0QedpirEpc7?= =?us-ascii?Q?UyoTt9eFvbmw1FlBYvRDCaKFMUvu514mDCHiTt205BtcXcVYL4AYVDs/zCRb?= =?us-ascii?Q?yZw8hKpsyvou/BnKm7DrB418Nbji7Cq/kDd8U7dtn8hMzqQeOAPeLDOPDGng?= =?us-ascii?Q?LSAaNpjx4UHAHJ8xMAlrqncmSzxJpwdrACZ5/cqkTeDhRsFukH64awIy3qiO?= =?us-ascii?Q?YL574CjtVm1rBWItclNhvDBIlYUDksUKG9NTDEbPEj761nLyFOnu6b/s8L5C?= =?us-ascii?Q?bfz0MTU3b+7D2jAcpGALDU1mzQk5tfsSk7ynz/Xi02hESBAULXei8oAzVQ3a?= =?us-ascii?Q?3jqbBD6jau5kSs/dp48SSr/KWiq2i7RBFXDPNu1xrJ5WTJvalQPO+P4zc2pq?= =?us-ascii?Q?Qzj9Lw2pPD1XOs3AjeeqmPHFp/9r6qDiGWMG+TTAVcEUssMcvZDLKAFHZWXG?= =?us-ascii?Q?OY8RXF5NApyjfuebdNQYyDaiowTXCi7JqKfMXWN5jxNm3+alW+FrApz/8u62?= =?us-ascii?Q?hDrobJaEcNgYuN/uGR7FTiu6lTl9vF2L8a6iknCrHPsOdqsJAX1/8RqQMsFu?= =?us-ascii?Q?KvTlbvMaAOPRhboUdMmgQ//gnOqmOSFhqsQWvzOlQjVzMAQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1939; 6:ShlonULssFrOTnJpOOJnS6dD0kDLgoBYfYZMBFdvVbj38XcAq5mYlbtwgh87i+ylLOWM6nnyIMYDTVzWf1h3TFiA/oE1KTa0WWfnd1USZ80Ar/dZkLFKDgwgNDr7JdX+aGWJKaEMggsHjxSgXrrJYB6xAaBEQPUy1Eqg1Fdi9A5gH8bhtvr3opHzAO5k2qESdqy4Y1ucm/bBY6y7WdwNQ4+O6ahpl6XCXvs8p+acX97Yq8RSIJmqJUu+xsU7jr08bnlbN+G5fQ3ZOnnM/9/zjhBYz3EtGmidunktoaYhOxQcGJABzWIMSQi6VHKFC5JgY3xWzLkDwOrXsByo9rs77g==; 5:nlF2d1+lPo7/r2AMz8EGtB5ZD81dn/mMmJxadLWKPErO7EvF/Pz4xcvX4Q0791xN6HeLKNiN4NbGqw5HtHIcuP5P5w1bHnzCgGjEmEXpUobVjk+jDmqcExTIB96Ij3AMaYGGvLOjC3ArKiVepOX4Sx6gb4i8uZUINGxDvISBEgw=; 24:LwSsdtRwsAjBn8B5fiYgakY1PjFoTsTrQT4JMFivyNupQ3AMAOpU0v9qDWzBoG7fFaU7g+OUdqDSJTtg5XLap2Yvmd9/HOlZEsgq2mGrhdY=; 7:vKSUURGcNA0XfhSzNkMxKDCR1gdsE4VOGIt0mhCiTK02GLDjkPVx6S3TxtQts3x8VztD7f5XYTJPCd6BxIOhZuqWCBZ7A4i6kCfKCJWt3QnvzxyEITi53Vqo4wB2+r7hbQ8Sgq09gsbD1VauYqwio+H91h7E6ynuqFNs5q77KN00D85LD7PaQSvln4Vi2h5teI3m1DJh60uwgoouvM7N7HD0apBNLtXZz19RKfFQDkM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 22:43:27.0946 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1939 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Himanshu Madhani In some env, user can choose to not enable SCSI-MQ but wants to use FC-NVMe feature of the driver. Since driver relies on Q-Pairs to allocate FC-NVMe resources, use existing module parameter to create Q-Pairs when FC-NVMe is enabled. Signed-off-by: Himanshu Madhani Reviewed-by: Ewan D. Milne --- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 2 +- drivers/scsi/qla2xxx/qla_mid.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 27 ++++++++++++++++++--------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index b2a391f93775..9752ac4c1003 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -8036,7 +8036,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, return NULL; } - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { qpair = kzalloc(sizeof(struct qla_qpair), GFP_KERNEL); if (qpair == NULL) { ql_log(ql_log_warn, vha, 0x0182, diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index d06a1a809188..bdaa4d644424 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3411,7 +3411,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ha->msix_count, ret); ha->msix_count = ret; /* Recalculate queue values */ - if (ha->mqiobase && ql2xmqsupport) { + if (ha->mqiobase && (ql2xmqsupport || ql2xnvmeenable)) { ha->max_req_queues = ha->msix_count - 1; /* ATIOQ needs 1 vector. That's 1 less QPair */ diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index c0f8f6c17b79..3630bb66a74c 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c @@ -606,7 +606,7 @@ qla25xx_delete_queues(struct scsi_qla_host *vha) struct qla_hw_data *ha = vha->hw; struct qla_qpair *qpair, *tqpair; - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { list_for_each_entry_safe(qpair, tqpair, &vha->qp_list, qp_list_elem) qla2xxx_delete_qpair(vha, qpair); diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index cb719345aa0d..0cfce0486b70 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -433,7 +433,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req, qla_init_base_qpair(vha, req, rsp); - if (ql2xmqsupport && ha->max_qpairs) { + if ((ql2xmqsupport || ql2xnvmeenable) && ha->max_qpairs) { ha->queue_pair_map = kcalloc(ha->max_qpairs, sizeof(struct qla_qpair *), GFP_KERNEL); if (!ha->queue_pair_map) { @@ -1976,7 +1976,8 @@ qla2x00_iospace_config(struct qla_hw_data *ha) /* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues = 1; ha->msix_count = QLA_BASE_VECTORS; - if (!ql2xmqsupport || (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) + if (!ql2xmqsupport || !ql2xnvmeenable || + (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) goto mqiobase_exit; ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3), @@ -2073,7 +2074,7 @@ qla83xx_iospace_config(struct qla_hw_data *ha) * By default, driver uses at least two msix vectors * (default & rspq) */ - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { /* MB interrupt uses 1 vector */ ha->max_req_queues = ha->msix_count - 1; @@ -3089,9 +3090,17 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ql_dbg(ql_dbg_init, base_vha, 0x0192, "blk/scsi-mq enabled, HW queues = %d.\n", host->nr_hw_queues); - } else - ql_dbg(ql_dbg_init, base_vha, 0x0193, - "blk/scsi-mq disabled.\n"); + } else { + if (ql2xnvmeenable) { + host->nr_hw_queues = ha->max_qpairs; + ql_dbg(ql_dbg_init, base_vha, 0x0194, + "FC-NVMe support is enabled, HW queues=%d\n", + host->nr_hw_queues); + } else { + ql_dbg(ql_dbg_init, base_vha, 0x0193, + "blk/scsi-mq disabled.\n"); + } + } qlt_probe_one_stage1(base_vha, ha); @@ -6301,7 +6310,7 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state) switch (state) { case pci_channel_io_normal: ha->flags.eeh_busy = 0; - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { set_bit(QPAIR_ONLINE_CHECK_NEEDED, &vha->dpc_flags); qla2xxx_wake_dpc(vha); } @@ -6318,7 +6327,7 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state) pci_disable_device(pdev); /* Return back all IOs */ qla2x00_abort_all_cmds(vha, DID_RESET << 16); - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { set_bit(QPAIR_ONLINE_CHECK_NEEDED, &vha->dpc_flags); qla2xxx_wake_dpc(vha); } @@ -6326,7 +6335,7 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state) case pci_channel_io_perm_failure: ha->flags.pci_channel_io_perm_failure = 1; qla2x00_abort_all_cmds(vha, DID_NO_CONNECT << 16); - if (ql2xmqsupport) { + if (ql2xmqsupport || ql2xnvmeenable) { set_bit(QPAIR_ONLINE_CHECK_NEEDED, &vha->dpc_flags); qla2xxx_wake_dpc(vha); }