From patchwork Tue Mar 20 05:58:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10296453 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 CE3B960386 for ; Tue, 20 Mar 2018 05:59:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF0522951B for ; Tue, 20 Mar 2018 05:59:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3AA72951F; Tue, 20 Mar 2018 05:59:25 +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 4B40B2951B for ; Tue, 20 Mar 2018 05:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbeCTF7Y (ORCPT ); Tue, 20 Mar 2018 01:59:24 -0400 Received: from mail-sn1nam02on0084.outbound.protection.outlook.com ([104.47.36.84]:61532 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751610AbeCTF6q (ORCPT ); Tue, 20 Mar 2018 01:58:46 -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=aRmW9gbkNBKkzroVISatOIYwcaa8jYxIMsbewFd5E/w=; b=ehk2rD1sPJr6LOPywV1n+QllhJa9/sP+Q3RJloBpmmzLdFmNfDjMZMFIe59pTPMfFpDBUerdrJ9hb+wf4n1+a/5yS02ourUWMd5OboyjUydtqXXMfzerd0XieUjZCjdvY256hIjK92Xjo41nRLk28aAU8/G1mlS+2096X6IO/yI= Received: from SN1PR0701CA0032.namprd07.prod.outlook.com (2a01:111:e400:5173::42) by DM6PR07MB4217.namprd07.prod.outlook.com (2603:10b6:5:bd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Tue, 20 Mar 2018 05:58:45 +0000 Received: from BL2FFO11FD025.protection.gbl (2a01:111:f400:7c09::114) by SN1PR0701CA0032.outlook.office365.com (2a01:111:e400:5173::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.588.14 via Frontend Transport; Tue, 20 Mar 2018 05:58:45 +0000 Authentication-Results: spf=fail (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: 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 BL2FFO11FD025.mail.protection.outlook.com (10.173.161.104) 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; Tue, 20 Mar 2018 05:58:44 +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, 19 Mar 2018 22:58:38 -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 w2K5wca9005285; Mon, 19 Mar 2018 22:58:38 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2K5wcfK005284; Mon, 19 Mar 2018 22:58:38 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 01/13] qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe Date: Mon, 19 Mar 2018 22:58:25 -0700 Message-ID: <20180320055837.5246-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180320055837.5246-1-himanshu.madhani@cavium.com> References: <20180320055837.5246-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)(39860400002)(39380400002)(376002)(346002)(396003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(186003)(8936002)(6666003)(59450400001)(86362001)(2950100002)(87636003)(72206003)(36756003)(105606002)(50226002)(1076002)(305945005)(4326008)(2906002)(8676002)(85426001)(336012)(81166006)(110136005)(47776003)(69596002)(54906003)(5660300001)(106466001)(50466002)(356003)(81156014)(48376002)(316002)(80596001)(51416003)(42186006)(26005)(16586007)(76176011)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4217; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD025; 1:E4RHazzM538IUqzL36sZOjvsRgRYoNYFRYKOsmCr4MABAzv93cEz1VDhrvxJaeEx5rk9Ygu+FO9mRmtbQ7VAgBRO/U2kTSdesTiN2bRXXtRpfa45zQnXFt3C5bLFkjhe X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5215bb8-eb02-4bfb-a653-08d58e27a42a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 3:mEtjXwzYMcv09Woykk717jmneeOUDLpjwYJNYuyT62KP3bVXZlmKUnIliC7Gv6UjbC0IWg/yWyf6S5lTz8tZKwvvuNUBhodOXj/8MzFDtog5Kv5a3GHHMo8j+6AZ8aye2PXvyXEAh8FhgNdmiiHVyl91LnzvZMEd+DSl8Y+BoEXvl1OLI0MfffkZ2zPLN5DFiRKh7xtcYcDDArv3PsOaQPFVe5IslR3EqgfdKERAodTdvD4ToKQk3NGxtZvaefIIvSWcUwcff4fVmMMtS83DKyLJQxKYCsmrGo7tzN7UFoaPaDXJRej8sh285pjNGKDuFo5s1sShUhlQ9c9qba7TqRTNC0IV4v5Wth1xe6rem2I=; 25:7nRhl7/VmZdo979J5zvgFEZJjROY/W5iV0E1zZ89RlLaz8/Jlc2zud1EDLFlGOsXBZI7FPx9RMJkPQ23W+EK7ywim7tw9pps2K9JZF0yFv4chER2x9woQqrcUdHWRUj7ecWT2xHGT9G46X1l1j4+v0ztDpSfSIZzbF1fhNVvStYvRq4wMDsQBKCX+UCi51uI61pV9Au+8DIkkUuDXIlapoGdtW6oR3tbTwkGYJ/fvNqpX49koG8tY/Nxy+1lRlZyzNmS1JR4yNGEi0f5Qc7RVbCcJbU+yBXi3ULPgPVp2MApggB/FIWeMsBwAqRW0bftat/6FzkjhnWpDmykfG/j1g== X-MS-TrafficTypeDiagnostic: DM6PR07MB4217: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 31:SGO+BnxTcn38HUEESOX3OXF9gOco3Z6TwAfFopwRqBbL4u9g1QlXcbVwAtz6Jl36VnAUdEepZ5BOVvIeJtQlf2arah1RSAgP6l3lbwLpUHMvBGn/kg0NyB3QbbtWv+/XLiimnRcCxn/yZsT5nsx+dycqRBMYAGyYK0WgRIcWWS2vZ7VJlLGc8GnM7K/ouH+7TCU8zunOz8pbBY6ISKqezGkBXYzW2QmEiXLYhtIOlCk=; 20:xMH+6WbG/AnC0irZPaqgRoMS/VSaHT/fJOtcrOx3wQf7c4WnIgrdBTuEylskJS6P5UagSAaJ0/5WOzgJ+u+MSbna2r2IiVisTHuyd2mMrnr25Gq4GHIMlHNxLMZJZOUyfGgTqsOCM7OsSd1ekND+vfg03weMiG3kTgPNKIgZY3BjG5+R3r/Q9Ywz3GuYhDZnwcScwqzF/MYS+ieQ2wrh9N6bNdbscPSagzbyJXG0FfmXYx81VMBX9hvUg9kvVvUly065UC8HY0mmjhUaZTg8+5bPqN6+DnyVdmbsg64x2unEOnrU2nm6dyOGirnF33QQJmbN5Dt5IuqQqTIsiVt6Ihvq1WJDBGw2A3boAeoeWLzIr9opMSQ54NmYGtJeIBI1DnNmw4j9sBLVho50qcWTNS1h61fUtshCzeL0gGIhHpFYe5e1gh31id/Klo0ADG0BPcWatg9PwyweRNS1iSj0nmoociRv4DML09wuZERRevs7RqXrShKmF2CdfTE9Xo1e 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)(3231221)(944501244)(52105095)(93006095)(93001095)(3002001)(10201501046)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:DM6PR07MB4217; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4217; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 4:VbQ9pgGsWsFMYFzfBgblwJ5uVSfvs7XLDgqRYIr4PqaqU3DyZInxR+RFkUvqYyzPEFfoUwjYtayAYsBBCXI/68d+oyW5ec9JShLwzSqCLgIwLu8TeSV70KeGeRyHQ0Gf118UtCmUWQcA/FwU0Ztsohrzf0Gx25EEC1ljzboP4+fkJ5HoHRtHTlnGsl/wjeKf44yGcWuSIBwn8s+MSzgOYfvWVQz25uyPmMOsWnZXpB1zfkCSReHZT1Zne8/+lo1rss7GEJ+z/Cj6kU+7e8bOjg== X-Forefront-PRVS: 061725F016 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM6PR07MB4217; 23:rTSpkohkiG/REPmhnwz4oPZR/tNTCRVVPzmJTry8C?= =?us-ascii?Q?vJtJ4RsyRYnFR88iaWrXaQZpWTfy+c4niyM/EG+2FwVBnqLbeVHBO1ncxpyK?= =?us-ascii?Q?b8JRfE6nAYzI7Hawzv4GF2VYeFaxWpvy2ckjpMgyHyHbbYKWPDX26ElyVySC?= =?us-ascii?Q?Ws/aHN4+zXi7X0hU358MsKvWQjSwMqEINJKbeK9Jwebt69A46nEgUe/QbIY9?= =?us-ascii?Q?y54xgDzpR0MN/vKzLIUFMCxEpGit0tubRAmgyFgV6FAKOlIFZQpLgzFq/TWp?= =?us-ascii?Q?V79ybPV/9mitToElFsJWyGtNdlsdLWJhCBQR4gzaBScEUQB91UBXtMonEoiY?= =?us-ascii?Q?zM6Y03bhFb2rovA0tX7++2JYRmjuOqrs25aSkK75/R5yJ7WKeP807inVy1D0?= =?us-ascii?Q?r2OQt9/YawnciWlLXy5zAilbkVP456XSjzHzOuIuXWRC7srMydeUzRIAIP4s?= =?us-ascii?Q?cavXga0uQbIHeN23YCa0HyMuBFr161nWtnqtZuLGeyNKFteNesLOfEZmp2dj?= =?us-ascii?Q?vt/B7z7bbweXtazh+hGagAm7YEeSuBNfyxp8LIhqPO7VTJvm3rbcENLsmIQ1?= =?us-ascii?Q?rXGaWlX7Kd1wYXy8MOJolyieMiSmBqHe/44SheF2VUFT2sCdEBJiPqafRewS?= =?us-ascii?Q?+SxMyzQp6GVisGHqp69l9++2S/6qT7Z6xgLyug4t96jfCq03cuP5MfKgpXin?= =?us-ascii?Q?Q26O2ZoIeekUEyCkw6o2M9y9G5QhJbxXiL8/252O7reIZhVGvwBuZCBvXeVq?= =?us-ascii?Q?7EFkpr5ozCnwv6fRvQrHs1NxwDfq3PXvrm9U/aQ00Q/xGR7XDc+ZSs1WHegN?= =?us-ascii?Q?7uAj4hBFqPWpsvqCeSDs23IMhw1iXLul3zf2szG1rg73vVlIm9Cy9UM+6Rq1?= =?us-ascii?Q?9GkjEr++5bqzFQsPqXn74Rq9ZpkGME2u5IDZanXK9uEz5vXaStc2iZAyCiI+?= =?us-ascii?Q?6AiICGoPOO/3s0XH307dgghZKDPkjnotnY8V0NwFrT6M4SuplCBQGXqfBPm4?= =?us-ascii?Q?XJbPzMx2oK2lO7CS5c+BG3+cSTepVz9jUg33qcwdTci/GSdI8kCsc8tCpSNb?= =?us-ascii?Q?wTl8WwHkzpbPce7rxyck8ZWIzXkxOxxy4ldHjXUTuhpzDJaDVstbJC01mVkx?= =?us-ascii?Q?xkgX0xe9Mk=3D?= X-Microsoft-Antispam-Message-Info: qiZ1n5Dsp7b7vldRXafpqqSIhyrdvEC+vAAJjSUDWeSxkri3jlgT5n1smKMZgJEBAfmKvahZElkHqjI5D2onCGZ6ALVJK1ip56hSwtgllv+K8xxbDIWldxpc2zpU6NDQRCIc1bDr9ZhW2ozVFP6WAdZRuIEVvFhzEs7o59pL6AXJzq8S/yqCYu3bj5mtm9NK X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4217; 6:o3ork2+UC2y79LpxFk1KBYzBJ2tqqJwiV87cmEfpMwmBYrXU6ZzrRjhNGBqOlrNxy6aAVehQp+YMAg6aoqFf1VBDsLMHWAs7rfEYU2Cp7JEedIRnZp7nyNxRPqbLCmc0YsxsokOoIsPnPgF/FXDUaJA6nher1EaejZp9+XE3J0uZ/4DWbW4s1Xc9vkkaBq5idwTpBOuomh9oTOJIdlDpppYJ5cAEKoUlLrfbDDyS2CNJtdDtf35gzkiwHVwtExxIm9l5mMb9l9V+DYe5UIWN2SU9WPoxG9rFD09y7MxeZE4xESeS76CD970utvCnLQ3XqRPsie1NqC2GZbu9+AwDu88W8hnUhIqEuUtT/pJxtzg=; 5:GrXgSSJyUikFWFI+RCbbr+VjorXFicHgjECJJgWuS+wF65XLVPTrTGFLY4vxHfSB+nOMuBGhAyf/r5LFuzgXmpOSGXp4ddSylNxEH/iEVtd0yW1Y6Hvf9TuI+5/eXrdm6i2FYyh/NVi8mgSFGBRra8ZNzu1y6f7nV0QS2CUvRa4=; 24:YrfTc+ZrrQunVf+eUQyxC1cXiUPw1wjlY8JvUFoFtXT5JTgbsZ7AuOh71jNsOO7kMsVMmk4c9Z6/yj1I0EQarMkJSALUvIw09yv1MLuv7yk=; 7:xM73LwsPN4kUBq7In1ms+kyZaOi3TEq1cIroihdJ/iaE+LderVfJGwjbCH4zsxdDSzKnErGRdPL73xzGwXqgIKfMuLcIb4WUk83BqcQWDbQQcZnQVEgZiQCtMCjjeId5NIbQE8TIBpNDe3WFQGb7hFyEiFRAPZPPzSYdzGccsKSpK1xGJuZB88boTYZf8lIcMzRuKssPxZU1ULeAGW6iHQ5mBYy9+21MDNksPu67ZND1URaBDRZIlFyakVywWCMR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2018 05:58:44.8488 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5215bb8-eb02-4bfb-a653-08d58e27a42a 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: DM6PR07MB4217 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 Reviewed-by: Johannes Thumshirn --- 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); } }