From patchwork Fri Jan 19 20:29:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10175963 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 DE60A6055D for ; Fri, 19 Jan 2018 20:29:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D124D212DB for ; Fri, 19 Jan 2018 20:29:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5A78287BA; Fri, 19 Jan 2018 20:29:56 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no 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 9E14C287B2 for ; Fri, 19 Jan 2018 20:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756365AbeASU3m (ORCPT ); Fri, 19 Jan 2018 15:29:42 -0500 Received: from mail-cys01nam02on0056.outbound.protection.outlook.com ([104.47.37.56]:10496 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756249AbeASU3k (ORCPT ); Fri, 19 Jan 2018 15:29:40 -0500 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=9gdTvqhnweh0Q3psWjsZO+BxEv0YA91Tk+a67ZbnlIk=; b=Spz1Eau6+aQT6IGZmFtEWmBjNZ9g8N+OhOQxrJO5nSy3TsJfHbj39AtoXQ0qMbSE3hQxp85GU0zrFFJ+LhQL1J8WJZybihhSTp+NVtw+FuW4RZqONywgTSK2MtCQh6KPQ5NvxEaKKvBvR5APsuj6fQF9Ei0PcIb6SW8Ju3MOcEc= Received: from CO2PR07CA0068.namprd07.prod.outlook.com (10.174.192.36) by BY2PR0701MB1942.namprd07.prod.outlook.com (10.163.155.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 20:29:38 +0000 Received: from BL2FFO11FD054.protection.gbl (2a01:111:f400:7c09::109) by CO2PR07CA0068.outlook.office365.com (2603:10b6:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.428.17 via Frontend Transport; Fri, 19 Jan 2018 20:29:38 +0000 Authentication-Results: spf=fail (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; HansenPartnership.com; dkim=none (message not signed) header.d=none;HansenPartnership.com; dmarc=none action=none header.from=cavium.com; Received-SPF: Fail (protection.outlook.com: domain of cavium.com does not designate 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD054.mail.protection.outlook.com (10.173.161.182) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.428.12 via Frontend Transport; Fri, 19 Jan 2018 20:29:37 +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, 19 Jan 2018 12:29:33 -0800 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 w0JKTXBK013278; Fri, 19 Jan 2018 12:29:33 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w0JKTXVa013277; Fri, 19 Jan 2018 12:29:33 -0800 From: Himanshu Madhani To: , , , , , CC: , Subject: [PATCH 1/5] qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe Date: Fri, 19 Jan 2018 12:29:24 -0800 Message-ID: <20180119202928.13239-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180119202928.13239-1-himanshu.madhani@cavium.com> References: <20180119202928.13239-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)(346002)(376002)(39850400004)(39380400002)(396003)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(50466002)(85426001)(86362001)(51416003)(87636003)(110136005)(8936002)(1076002)(50226002)(478600001)(81156014)(81166006)(54906003)(4326008)(8676002)(72206003)(26005)(2201001)(47776003)(336011)(2906002)(76176011)(59450400001)(6666003)(105606002)(36756003)(2950100002)(316002)(48376002)(80596001)(69596002)(305945005)(42186006)(16586007)(356003)(5660300001)(106466001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0701MB1942; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD054; 1:xyVocsfNHmtbJ2Eqn/uqxR7Z9aH9yUQXvlxpbDGTR/DvifjfVPvRCA8zI9TtodvygmkWiomBcJZlE2jZhBwgzKTvngLA1haGP5uz4Pwwdr0ZKzD/U3Be2/qhVOH5kRP4 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b79dc62-25ab-4141-3ea8-08d55f7b5cab X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060); SRVR:BY2PR0701MB1942; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1942; 3:m+edqnhgRWVfIurJw7rWm2tUgA4MF+wmQ1B+YgOd4cuNoL1UXcZ08GaG9GIEmwn6Fq8yURTwQRJD/scQROlxIb47Fu3o0SUQDF1CtRUXyH+bebfAnlI+Vxt/lqpoLc9XPfA1MbWsWq6IXe/Pwk6igPEXqJbMCYLBPPEq/+AY5U02bf7pTLMuk3IvHNNGRarYZ+79SxLvIRPLU01v+nREQGdpruDCY4fqWBSez9aMZcTRMiz7o7oIK5ys6WgkZWCg5gx539cZdCpPA/9jURVjGdkerGEZSXLpg4CIJmxj4kQ+zN9/onWpH+x4ZjIgDfTR0FyJ1oct6CfTn8PM4kdMaxZme/kfXCyV3ixb756tQGM=; 25:TvFkCg9zZ2wCTP26uf31YCbKEBCBxMNLTTcazISwBK0x3XVWkaEn07ugvmtk5KHEGU8bqZEpgZw7z1+sjAwWUg1bkmgr4+3Mx33xg8QM7URjt/xT4f9OXp9BdJL5sl563pGCbs9lLZddTyfB3qlaa203AVyBrkZz5ypddBYYyoWYZksMTtlwYRxoSWBr8vUKJQeuc64hwkEPN4OiwN92Ocr3VAqBITAeBQAc4rwz3W+MmQ1HZAVdRPGK4HIu6GtWzra9tuEuv79uSjUXhlMzSXJ5BFDxphJfvum64uDmbKwAMDJm6vVuGS5hV/NbH82yUaJvMNdRszjqFNP/5EZOUA== X-MS-TrafficTypeDiagnostic: BY2PR0701MB1942: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1942; 31:eg8LMvTWM4nurOlLtXQWXHv+NyF26Oc9UrTYShbYqxMExfQHZxAzXqViRZMVlG8P0ud0W2shoNBuPE9YXT40cXJVUBU55WgycYICak9byN1C9NmsXC+Q0xmA/zL3SS8Y69tFoiK+Qcu1Ye6k+qUp5sjRosAzWRzVzAXRAEHdN0HmQm8JNfFg3xscyrydn40I4BjsPGpDLR+RGR4rYykK1zyRW1ehOTjHpJO/jajlw9w=; 20:yzTWXhz+WFaQTpw04ieZFbO/6Y6G2NDBZ8ju24aRpwV/cIm43GXiDQRmJ3woPNZuwuF4fi1w8XjhGMceV1I7y6dy0r8jWMb/AopRJqePo7gMO43EGeVdBNV/mWK3tQ0TpbOnO1WtbplrrjNqUnG62w5E+1tt+uiclPu4xpycSa+dIEQcKDcopTy5A7YVNpjsiWLURt8h6YroCMvFMWdXBeXONJ7gby8D+B4lh6J+yjut5FXcovfnz40jZwOlRqGIinfOUHfIkrAoNAEOjPf7squRilSbs9crihmSzplRNjueArNLI7C0E3Ccq1TZzIVInLsEBgfRc/xqFUxU0PJFJH8l2NkNujSAGESKX7DVfpnGv1CpCKMVWMvPeFpmxZSlNQRfJQ0Oo+U9T2YZ4dc740unbqn/wUyxsNw/3ewyU9Z58U5idrVw2NTWFCxS65snCI2VQl++FVhxIZ/bARTsNM7Rq7AjYjDyqa62/vy15rJJPvFfTQUBHJYD/+cAPoCi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231023)(2400081)(944501161)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BY2PR0701MB1942; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BY2PR0701MB1942; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1942; 4:vda8KPByRnofbtYowJph2E3DLFrizVE1auov0XwMZAJeCgTAH9O4eMp2o3dLT6+XIMdenxNePt0V/g0j4eOz52yl2DOR04pg0d7KfcQIWBa742R2zVcN379Q1wIDrkrA5pSyIynz5YJChxJGC61lBpfro/2G5gt+/fEmWM01BCgfwdo6kfchb89Ot5i+uZe4HtN+r7VeA42JPdI2gZ8mWk8kXwCFPTBb6znJj58VEsTYHeoDUlLmdDSNZRMPrkvR39AvtMMjdASqPAi9Dx5trw== X-Forefront-PRVS: 0557CBAD84 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0701MB1942; 23:ZQi1MdKP0BoibxaqzplqKPVptI8OLol3uHiY89l?= =?us-ascii?Q?4cbGMOKfV/YsvT9AM04TNQ82B7ILz2eThWNiRtoxj0XO2O5ezbJBPuDAhlMU?= =?us-ascii?Q?C7F0KBePJW/Uw1b+NoO4hoPyR9yS9E+pThgR3d1hekwtRmpNfSsi5OAEaB9G?= =?us-ascii?Q?kBlGrxpeU/vZSYAM++kMd6iUP6zInMRJF/Ee3gj4l0aqUBzoxh9JDLEsNAjH?= =?us-ascii?Q?aPPFuokL2a1TH5v38NLIZLVCIgUB9Dvwk5V79+cQImIXF8oAepwW6BukfvvI?= =?us-ascii?Q?MdatDwRA9lRRdqibE+yWZ74H+32ucmqDQW1jwHuEyUi75b6ivYN8cLbforRe?= =?us-ascii?Q?PJ/CyFDsz+gAsurfSnhynoYL3hhFRQGlysMLsgCLVhXHyzfgFOQA22fRHuyb?= =?us-ascii?Q?R0MfH3Hp/4X6UtGqRxpMq+1dnonkjlIWe7sy1V69U9u4m6Ex/iDRvLjrL2ed?= =?us-ascii?Q?SuD8lI7ZYfeAP/JzVpeeJOiQJUmrNWgr0Yc6KSi7HKOKTyftfs3agdIA80MF?= =?us-ascii?Q?9g/sQXBuDmCkgy62kvB3oSgj/ML7D9HyUOSUYIWFZ+zfutDaSdURMMvkn5K2?= =?us-ascii?Q?eBBUiuF8UD9ubNtLmdZlAb2bg+M3/cy6ahbbFvTYzxiBP8hUcxD6+atY3EbH?= =?us-ascii?Q?+NqKYaUHhip/TBTCtsQwvs6w920INBy/GWlYbD5xyHReyr5CadsZ85tVebjq?= =?us-ascii?Q?TAqj4s3pqdqcq1aVzPD9gqQG+JXy/huLH2AaU/EKnsKzH4k+FNA88i5ECXNe?= =?us-ascii?Q?qchVO/KSl833pdwpvWBgBBTnobewILsH2HWOJlozwrVcHrfEIRybMNqtuToU?= =?us-ascii?Q?1ydM51E5iuwnTcJC19vg90rc0sanrCvPJ+oaqI5q63ozt8J6YEnfftu0ycZG?= =?us-ascii?Q?gQMvvR7WqH09pl0jFDqSYQvReDsotecP1HsKocxonFpUG7WdrJK2X5RlD1ST?= =?us-ascii?Q?R7SDTN6wgYom15mfbxXriJG/oUEL1eaTvYpYdxi2O5jfcFjeN0NpAJZp5ddx?= =?us-ascii?Q?fGJNHYUIt4P6ASS+oY9uMh8bKt0JBIGYt1LpJ9VvMS1UExBOfCYE6j55aDBg?= =?us-ascii?Q?RydzRiQjm5yA9vIpeIj3HhDROcMRSFo4LHCbElGQkiDQtlGyTu6e8KYdYB1I?= =?us-ascii?Q?59tn4gwcZ0QIHbWUvciUk2e0LPWcy1T+0?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1942; 6:usUx9+mEVFVCAiV5J6hZp65XlrCi+OoIErY6khHFFk33DjHNlMovT4RKCfDiEjMlO8YFfkoemykUbry/07me3zSjp5QSqF8LoH39im1ryWG/vVgwuB7L0xHz7o3LlVZHOOKdOvZLMvE8ejsdSrap5F8uP0Z4HR3r3jR/W2U84h7NnMQWdPqHfb5w9z451Zql8qa6Timx2Fk+uGo41RlGTmsGg9i4IOHpURy4Mnk8Mxjdi3qWKBbHkX/V65j0IppPDGH7/FYcpCLr7CXJrelujekO5iHG/7Vdm3xfUS94NS0J4cNCcnTZ5wDxgb1YLy3/YB+8lhbNKJpC30UraETnXzrrgRM4pYusBY20f7k6MAI=; 5:BkLtr25emObH16WFkpabDZIU25Zk7UCHx/sM2dXkdIYkDC8K7qHC12JldMhz/BAHb4pvUjvieT3K9eh8vDFUgSPjFpk5U33zNcNcG9Usk5lfytqLljKwR5qi1rlB7QRD6XxYGrLzLCkimphVczw9C1n8/tPgb3RHxUL8luJBv5M=; 24:suXCLmC90I9G0B2LZURlYCJQNucyNt5v/6DxpfoSC33oBDMOMLB+xNpviVBOLfzmoPOu8HG+EMEsTp8/1tynez2fQIYbcCCg/lPhsctvJyM=; 7:c4VSwlYTOZxWeOi8G1mpm2cU2/OiMvtWnS139o/rcv6zhanjVjSqLxWBH6aIg+s9/JIPiBeABeqf1+gIXZdU+g4qpAFxyPF6NpJ55ew7oITJVIuhm+qQ6fFRhpKxRvDOYUzNvbw3vDhziogiM0BmlhDrCULjx02IIqsRmpap92ledjLgTV3kPO7cfcLVk18WKJAdcWfxi30Md1SSCA7HMWGs0qk/CE95zuW8fJg+A2HkFbR56mD6kbPOip2clIB9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 20:29:37.9703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b79dc62-25ab-4141-3ea8-08d55f7b5cab 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: BY2PR0701MB1942 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 Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_nvme.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index 6b33a1f24f56..162a523b985e 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -113,8 +113,6 @@ static int qla_nvme_alloc_queue(struct nvme_fc_local_port *lport, return 0; } - ql_log(ql_log_warn, vha, 0xffff, - "allocating q for idx=%x w/o cpu mask\n", qidx); qpair = qla2xxx_create_qpair(vha, 5, vha->vp_idx, true); if (qpair == NULL) { ql_log(ql_log_warn, vha, 0x2122, @@ -313,7 +311,6 @@ static int qla2x00_start_nvme_mq(srb_t *sp) uint16_t avail_dsds; uint32_t *cur_dsd; struct req_que *req = NULL; - struct rsp_que *rsp = NULL; struct scsi_qla_host *vha = sp->fcport->vha; struct qla_hw_data *ha = vha->hw; struct qla_qpair *qpair = sp->qpair; @@ -322,15 +319,13 @@ static int qla2x00_start_nvme_mq(srb_t *sp) struct nvmefc_fcp_req *fd = nvme->u.nvme.desc; uint32_t rval = QLA_SUCCESS; + /* Setup qpair pointers */ + req = qpair->req; tot_dsds = fd->sg_cnt; /* Acquire qpair specific lock */ spin_lock_irqsave(&qpair->qp_lock, flags); - /* Setup qpair pointers */ - req = qpair->req; - rsp = qpair->rsp; - /* Check for room in outstanding command list. */ handle = req->current_outstanding_cmd; for (index = 1; index < req->num_outstanding_cmds; index++) { @@ -365,7 +360,7 @@ static int qla2x00_start_nvme_mq(srb_t *sp) struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; if (cmd->sqe.common.opcode == nvme_admin_async_event) { nvme->u.nvme.aen_op = 1; - atomic_inc(&vha->hw->nvme_active_aen_cnt); + atomic_inc(&ha->nvme_active_aen_cnt); } }