From patchwork Mon Mar 12 18:16:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10276933 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 09AC260211 for ; Mon, 12 Mar 2018 18:17:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E847628A52 for ; Mon, 12 Mar 2018 18:17:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD2FB28E71; Mon, 12 Mar 2018 18:17:03 +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 4259628A52 for ; Mon, 12 Mar 2018 18:17:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932703AbeCLSRC (ORCPT ); Mon, 12 Mar 2018 14:17:02 -0400 Received: from mail-by2nam03on0082.outbound.protection.outlook.com ([104.47.42.82]:28598 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932691AbeCLSQ7 (ORCPT ); Mon, 12 Mar 2018 14:16:59 -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=9gdTvqhnweh0Q3psWjsZO+BxEv0YA91Tk+a67ZbnlIk=; b=a5g2ryKW0POS6uQUHTXtEWbfWxROMlGGEsZPAbUERbFm5zzw9moklzEMFQl8+LL6kb9+bphj0uf9/KaFSoD42LYhvG3MWFQuKiiW7OjRFWy8RWqqt9HnNWTMqUqMbahPcC6L0KoJ+7YeOQCUjRFNuWGw0mgjmTNR41E+Kdyl8MU= Received: from DM5PR07CA0043.namprd07.prod.outlook.com (2603:10b6:3:16::29) by CY1PR0701MB2091.namprd07.prod.outlook.com (2a01:111:e400:531e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 12 Mar 2018 18:16:56 +0000 Received: from BL2FFO11OLC007.protection.gbl (2a01:111:f400:7c09::167) by DM5PR07CA0043.outlook.office365.com (2603:10b6:3:16::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.567.14 via Frontend Transport; Mon, 12 Mar 2018 18:16:57 +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 BL2FFO11OLC007.mail.protection.outlook.com (10.173.160.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.527.18 via Frontend Transport; Mon, 12 Mar 2018 18:16:56 +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; Mon, 12 Mar 2018 11:16:51 -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 w2CIGpXA020743; Mon, 12 Mar 2018 11:16:51 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2CIGpIn020742; Mon, 12 Mar 2018 11:16:51 -0700 From: Himanshu Madhani To: , , , , CC: , Subject: [PATCH 01/13] qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe Date: Mon, 12 Mar 2018 11:16:38 -0700 Message-ID: <20180312181650.20704-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180312181650.20704-1-himanshu.madhani@cavium.com> References: <20180312181650.20704-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)(39380400002)(396003)(39860400002)(376002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(2950100002)(80596001)(6666003)(186003)(1076002)(48376002)(42186006)(4326008)(8936002)(69596002)(54906003)(110136005)(316002)(50466002)(16586007)(59450400001)(85426001)(47776003)(81166006)(8676002)(81156014)(2201001)(72206003)(86362001)(26005)(356003)(305945005)(76176011)(106466001)(336012)(36756003)(478600001)(50226002)(2906002)(51416003)(87636003)(105606002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB2091; 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; BL2FFO11OLC007; 1:dNnoJ7FsFmx1vB0cN0vJH0kIMJWKf8zEBFdrDX/h4hAuMdEmu+IeayaCiv0KEPzD83tuIttIpulIZAQnvPAqjmc7McSKQ4RiEy9ZOKC5uz7Zxfz1kg/aiGJIitFvoMKs X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b05dbd4-1e2a-4b18-d000-08d5884570f2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 3:GqWXY28KcQO45Kz810vpsj/wGLtORJlIGt1RPED9yFO8Vw2da+YojipxuYfSmiSu51H8hzntCAf3bxAYIVgxt7CmisOEd/am2wWa2FB9Lz60SP3m/LiIBeRMljMXYcPuS2es1O7cONrueoUIrYs5N8zVedZYg7915iKf4Niq1COqrhKzA/0yrKueQNjTfGXqBr1bR0D9gdGwuhGpr3GjSWPgNpNDrpSF/Mq5mzbQSM04NMJ4eVOs17PohN9gPjI9izPwlQiQIvDr3PTne8A2ngu3OMfFzN71CblfCw7m7NDwegsWrfTLmeuT1jmjbRrgYyIHgvkA1ycMEaNgYXpdP+gu9G4zPGSVZmZqwtc3pqE=; 25:Laq2wBz4d/rYOyjL+kAzSIlvzkGywYKKfoWY4QMmg6vgLe5d4Byx5BL/yFES0Ovl+LsOaK0KwPSwPPUDOBJk5ZhWD4IJ8MJzppUzvLB02WPgbdZefy5qST8wrXq9iftO59eJMKLwWRrOhSjjgi8KGHd8aFC/Nke86VIKqvStbrhZ3sQA66tLOgP1b1QdxMaQ9CqnELX7wmev3Yo7yyzCwBsz4/JS/m3o4VA/sc2idjX4ULU44YGW/k6BKkXQrgD9ImSASDB1lkrYf5g+8XuPKSyXJXcf9poajyDM+0GXtTJc+ShBXqMK/ckg2wC4Onup084ZlVsG7SmjHk5LXM7i+g== X-MS-TrafficTypeDiagnostic: CY1PR0701MB2091: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 31:KoWwCR+Ku62Smj5A8UiPyOH48142pH6QSouH2RBiptCNNBMYZOYIbLzJEJzggMNpWGpr77RKvKb6deJ+Qln0H8ao7YDvhPqsxi4slLyIeHHYPVm2AVC4991w4dEdTf4M8pLvQRUkXFDKHmgcLC1UD2Bclx1yEwsziA83F+UnC7BR8s3yvACmN2M4xpul6sfomuY+tZ+cfz6t4dbLCe2/d61Db04NnmCQRAvV37vh/bs=; 20:5AgfLc+31y9q5XF+cYxMDp6Pu/zNHKAhdADSLt6rXsbNNMzNrELQIXWoMKq3rS0TWsn84Ive0UvXmRk+PE45aaTnZKc6qcFL4yTlSSs5XWWNJQ35ekscSfKsZJLA/4Jr3jpBCEhI0BR0sd3jDgabSWP8bBJ/Cdj5LT8pRp4VNfoCyUd4UPCvjE1zyTlIt5fXBGbJ25eeN7deME2JAaMfjTZSIOD1B+KHMjU/CLEginJsmhHlVg3t6Adke3hVLRXQeuacHR4eomXiRT8dEJOD9a29hYGRo5f0UD0bI7mwYP0zVkz3qM5H/e9voB+7261j3Ji1wsX56Eu+65tKcRi0Sz2zoua6jz4pIEr1fcG005rDH6vIwfNe/tMypNWUvRHDNtb6nb9FotXOEznHUOohHJ3RKxR0EONIXQJ+959bQNUI89mGqntWXJrBBDHUdVI2cSWznUHu5l3vzjKBoetq2ZBsg4OFtbNtTo2Zkxe3YUzHuPwVqPRDZ6JvebtVjoG5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:CY1PR0701MB2091; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 4:HOrbJp4hP3H5/BYdOACuJNsqefpwXVgZcUhgREe9c3STaqx6i8acKDQfB7+pVc528dCPqdGI36VnqNV/ADu/lzOy41cR+vj6MyNVAhdxp/hO5oTkZk4GqF4HNx/RP+nQnfpvcR4tLnIk3aRm3oUGnSxhw4ZFK4p0PI1Td5guKGwXabcd/w85Bk9O2fg2ehZDT+hBPLor2+V3AhgjYi2NEmOvqrqaESb94dn57mtaHmrNsSTE+bhZ0rfSn5rQSBuWidSl599oz1eyeoo67mwqGg== X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB2091; 23:9AOuPChg8htbwWWpAL98EBWbvpRUZCBk7FHINbD?= =?us-ascii?Q?qXdYchalDYNQBfVZUmXK53IW76BOioImkXoqan0jVL8tcjiqLKH/NrqV4ace?= =?us-ascii?Q?0IXH3hPo6kmSU5/GtU8BfXSnkCZ+H0YIbaMALjKykH+z+et+yVYUCJKLyHjq?= =?us-ascii?Q?UkU4dyxAodc4Cyrdrr/LOTL9rgn6w9qt7jZ2IwNY7PY/nfM2rGdKr8lkvx2K?= =?us-ascii?Q?KhtqKXzKCAb1DmKZnQGoqnCjGElDPRC9IINxIGlivz0anU1F1XyrdKwgJxni?= =?us-ascii?Q?PjD//GXRFesCXOabv3b2h/DzQOao9/2DObEN75vEXrOGTUDSPsn0wINCRApq?= =?us-ascii?Q?QmaswuvH+1bsmalSNZZQ9mn9/qqNaIEqPI7nN12WzjNG6qITVc4WE3hlASkI?= =?us-ascii?Q?aupZMP/iIr5ixA0yx9Yt0N2be/jbfv+iO/tcYAcWauIilxDgxn5GlGAacpr1?= =?us-ascii?Q?0vleb4xXCMfFZDMF91XAhoVmV5z2+vETngerwQ5FgChn17ztwbsYlsbnLYT3?= =?us-ascii?Q?9i0m1DaACvQGSVYVreDSwymKOwxyJOTMgk4dKH+JMuswfxyPMve60SpA4vdh?= =?us-ascii?Q?4+JZI10eyrC0L/Qdfyt75Jl34X0/eA6NyLiNj7JYExDDaR5LRcAlW/G3QiXG?= =?us-ascii?Q?esVd2q1toqzfWk35igC6xJ+90Va5Ex+vn/A8eAcU9aGK0vZI8kW732H0kFul?= =?us-ascii?Q?1Jve2MITbsj/9JJJ06StMCIo7fivuElIYH4Faro1aQxZ15RbbgBIxRhmK0mx?= =?us-ascii?Q?gW0yYccYYSobILW6RNLotKCCR34/tWk3LsfhFWwhwIR4RccejQZpGUhAdAfZ?= =?us-ascii?Q?vUSH0OXGeaqMkHamfeILqySYVppVag35FCVbQmUMVItctjMAmYK1PhLmSUT4?= =?us-ascii?Q?M/+03JN1GbytZsn0S9arvzsHf5j83M021SaRZXq/05rNFY/JGAaR2GFfO/Iv?= =?us-ascii?Q?w1nwrd7XSTm/DlfF/5cdSRjYvx53IE91e0HprUHX66WSvcG3JliF3/nlXO7K?= =?us-ascii?Q?Y691mFbKGybnuv/v0sKbbPtRAatMFwmmuftRNUYX1jrVKCJwMGsvwYn54yGQ?= =?us-ascii?Q?Q9l2xFAkJkLneNWZT5iczoBAv52nmYaZULCq6vmSbycV5waCEk/TK2FAfr2/?= =?us-ascii?Q?WBmW/YbmGbLUOkaABHown6X+31hzA9tLJ?= X-Microsoft-Antispam-Message-Info: EE3aCOXgmGM2H3SQyzFvTn7c7Xk68nfuNeecHfMDsePdBPi7fGLlLa1DasTgaOEQyIpKGXvgxqNMlCGQVsxqkyE2BNt0fj5a5x69NlaBKgrMVrs9qH3ZzGYVUK4ziJ6a9UH+zctiLoVQ8VoF7o/1sqihueeQlvKT6l4VtI2b/KI9mXtXI/BI2r0Cs/49xvtw X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 6:NXE6IPa0WD/x87rQ/OG+6jB011Abl278UHKlsLIEEG/VLteJjuOdA5bmUVWhuw2h7p5DYF0gEWxApN3szREG0RkPbHKj7390AQgkbU4cHXnxNiW6jMIRcQWV8CrULtYMfaBs+O4Js2XUFK9wdh66XSDCexG168YCuhHh9fwy41oLY+XNnOV55M7g3jEyJapuJzMx2+chUc4WszdV2dbj801KjFss62T2AkvYyRNpGTl7vBIgB/FXONt/fsV6WkxK4ms8Z5PMValqI9wcgsjLDAPjyRs+cZ/meGgANzY81/uiRDkg/s0pfeGHPqnWSs99UbdGEqKvc1iGjd/+3PwgjtYlVLwq32cS3hsj2rNWxXM=; 5:gK15TQgIZ5vu1FqGjOTzv5D0FCkBKXWoIScw4KX9ouupHI9H2glMDvrxJVICACq1OrNw8ngGEXV2gFjczooF78fRjTYjwVRg/pN6DPJQ4P+jqRhlhZ94tbrCG1o+Y/uQfKMXvqa9UhWMCctpPY5tMAcNO/542ga6OXVvrLV5oJM=; 24:hht9PqKJwU2rgzNZt8HpW8J38ynUWNt5HZvRM8vYZBEkSj3l30bU2Sun9a8u2VQ5n0zq62xvGnN5CKSpDHf+BAZeT9XsLuQAcxqkCBbyUu8=; 7:df1M73kWt3WsQHwdsb3uEfT1FruklFqcUs8fKPubp5igYQPM/W0gyAavM5LvUt7J9E0GW1JKCAV1ITmPLOcvgauFiFHPREk1d4UDfH9OyQCZnVnUhXi0cLUokq6w6bN3BfDJVYgEGOtyIorZNuMeZcmdiRkpGUO5pUiiPLTYdSP9n0Ot98tzgF9ZDuWoVJsK3r86zJiotCZTH0/nR+QPgpGmZFtPTfbRhCT6ZQvi+r3iLD8/CGoDENC1FDff/95h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 18:16:56.8287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b05dbd4-1e2a-4b18-d000-08d5884570f2 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: CY1PR0701MB2091 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 Reviewed-by: Hannes Reinecke --- 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); } }