From patchwork Wed Mar 21 06:09:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10298615 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 AB26D600F6 for ; Wed, 21 Mar 2018 06:09:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B73C29716 for ; Wed, 21 Mar 2018 06:09:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FBC62971E; Wed, 21 Mar 2018 06:09:55 +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 218FC29716 for ; Wed, 21 Mar 2018 06:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbeCUGJy (ORCPT ); Wed, 21 Mar 2018 02:09:54 -0400 Received: from mail-sn1nam01on0070.outbound.protection.outlook.com ([104.47.32.70]:17920 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751484AbeCUGJu (ORCPT ); Wed, 21 Mar 2018 02:09:50 -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=59SkqgfRub1/pkrEYiHtiEXX1LZkBiLLXEjDiNddaUs=; b=bsh7O6vXD+/s/5eSVzvAlBY5/1je0Redms5oBmzWnHiV+aMOwIYEQzX5AczJ9PaxlaW67ExWRMt07Qjpq4guipY+hCouKB2nw6LckJ33+uNVnSZ3YR7SQYybU5Yrijgx1BmlWzvgAKqxqmokOB+V274SmRLJve+wn5tDW1armdM= Received: from SN1PR0701CA0017.namprd07.prod.outlook.com (2a01:111:e400:5173::27) by SN1PR0701MB2094.namprd07.prod.outlook.com (2a01:111:e400:5309::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 06:09:49 +0000 Received: from BL2FFO11FD022.protection.gbl (2a01:111:f400:7c09::186) by SN1PR0701CA0017.outlook.office365.com (2a01:111:e400:5173::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.609.10 via Frontend Transport; Wed, 21 Mar 2018 06:09:48 +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 BL2FFO11FD022.mail.protection.outlook.com (10.173.161.101) 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; Wed, 21 Mar 2018 06:09:48 +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; Tue, 20 Mar 2018 23:09:42 -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 w2L69gec029511; Tue, 20 Mar 2018 23:09:42 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2L69ggY029510; Tue, 20 Mar 2018 23:09:42 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v4 02/13] qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe Date: Tue, 20 Mar 2018 23:09:30 -0700 Message-ID: <20180321060941.29468-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180321060941.29468-1-himanshu.madhani@cavium.com> References: <20180321060941.29468-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)(39380400002)(376002)(346002)(396003)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(54906003)(110136005)(4326008)(86362001)(26005)(72206003)(59450400001)(186003)(316002)(42186006)(85426001)(16586007)(336012)(87636003)(478600001)(47776003)(106466001)(48376002)(305945005)(356003)(2906002)(50466002)(80596001)(69596002)(6666003)(2950100002)(51416003)(76176011)(1076002)(36756003)(5660300001)(81166006)(81156014)(8676002)(8936002)(105606002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB2094; 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; BL2FFO11FD022; 1:aLIvIFpy83ykwE66B1SCaH05nhZwD6j7bBIawxQBvdaGqCrz+PC8V/ogcNBUjehlKN5XFK36MPj7mBYLtxjlEgt10Qbe1xYPUqyUTVL8QWeucL3wH/3cTtJ9oXxNALzo X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd53ffe3-74bc-4b4c-f2e1-08d58ef25a23 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN1PR0701MB2094; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2094; 3:2sReIRUrwf6LWJWLVZ/Nji9in/w/Ksu81nJNTrmCi94TFWgbG8BwdLCnsCOGeMO75KlfWumeSvVlLEazA+qY8BT+8GelHTTnltQPWm2nRAqEOy5kfYXsiEpkbKu+ZLPBKrneD03GcYwEU5bJKu8/szK2p5xktUi1n6zdnDLrysZiJO5j/wCyUUR/OGgOJxhsJeRaLfIJaNMiqUJeaCtiqiAHx/PTLZ8xnSqMvw/LszQEnePFK1B3Chok+q/TKvPYD/eWSWLIhBn9mb1cWQUjN1IUlm1IFt//8P7hxhWiBVleHEoL+LqxZX8X0QBC1Zh5sUhTIqYImDwBgrFo3Vkf/xbfhmZ/elqTLD/u9eMakP8=; 25:6xzPtxzkMrDfMIp6lOgDNGPGAPkVUUOjhdPZNQIPbm8xEIO5XWqBQMGiIE81RwqoQ0sBxpi2nCxzAb2yijucYvfhHMrC03qnt4ZLQ7Fv0KFgtuC5S8FeqAJMA4SmoNHVMQ4smO0Ggn4fBP5EIIZS4KcETDZBBthTqsHoULi0BpT/7kbyS5yACA/E4c0P8/YFrYiT86iY6oSTOL9RTj5ktU4MxAy8g0eCHfTt9j2zcXrxQB7JXMQwutYdGrS1K+AnsQlj943LDs/kL3u1jZfe0p1gvXL+BD0tPu0gPFIS2cABrLH0lpOgn2NC3X7b3/eeIsiY8kp7jYQhsiw2uUmOAA== X-MS-TrafficTypeDiagnostic: SN1PR0701MB2094: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2094; 31:r3hn0RNNEUqKn3aLk+g19yp0k/xSRMr1/6kk7aBzL3+f+4jbNx3LSPA0I22KdavDaLTIz3pbSQR7cdBg8Jg+OACM3SYjQObhvAYcgXDn44DJeIcaBIPLqxORSBLfLmxuCEb8TMBP/FLaVZs3jJcqQ7ORnoTx+aRed7YZT9m8p2d6O6rdnbKA3qA9M7EWfMFMCuKkp0mBVGxActjKlWpzSgI809VRm9Q62XDWAGrpcQU=; 20:gu4TaGcmCJJ3ntafzM7SGQ8Ah+arosnyEHdOT0ZfUK9dP/IVBpua4hLPDSTayNHmmBvdg9aaWXSGZhVbwefFpHG4HGmfRWF6bZFdMNc/o8aFr01bSM4dEv2woCzn947Ai6N1UuODQm5JE0XYVrmUf04y7ezIcSQqKJTC6Ad2HEIk9qLCCZyOToS1UPmStaX82eJl/McqXga6yYNAXhIGrHxgEfGn5c+V2gfkqiLRUad76xfx/x6Cx2KnP8OnCJlyp9CU54ZoQF+acy4v9xh8x9WKn8m5fBokFPsz/Jr1B4zUCJHfc+V2X508D7o84VJnYR5mW6JWbMlIEEwgEJiGfNDF1o8RzBrVuXpbEmm9PNz9Rn2FHsdmZGVpSDIfG8mXNWhQh4pbxCTg6UKgjNzIXLirJFV552D4w4tovcBnl++MZq5kKlqyhaU/hHao/vICP8UmNwRucBTOWnU6XGSWs+JnOArdrzl9Yr81hdEwk7XhfnTtUPnMz5Qd6Paz0QaC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501244)(52105095)(10201501046)(3002001)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:SN1PR0701MB2094; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0701MB2094; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2094; 4:F5UGoZ1dwa6gdZOcnLgpq+iv06q7lm3ty5VM5OUeSQCrxULSzjidKbIJM+Hf1l1/isW4SXCz4yLkrRWUSOfpPsfM9fhYFj46T4zjUO2moFO7+hqDSkf++v2YAFc1z3Iv3qkIFVz8luwbz8JU6zYB2t4Eksy5OHHDrC6ieJHocgAdTe9/wOeY52Iz/yExie4mM4kdyRksSVA00Sr2t5nCk/MQAVXW6Lf0dwnLBX202p0lYv6+672LIWNXYIDFcZTc81Iq0iNbX6RhrmksVBmgfg== X-Forefront-PRVS: 0618E4E7E1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0701MB2094; 23:hB74l4IRKGMKGr9vr9sCFVhlLDFO3NGAFTTCF49?= =?us-ascii?Q?mx0299tVzaCwTHIx928yjlhba+Y+SEWsgVBQMtXe7+BcfToBP3ZxP85QyvEX?= =?us-ascii?Q?gW5lFv6lXPo/UozkJLhDcGUd9Xf1Re+bnNerU9l+dxtyxSaQp4tAfPIhS63a?= =?us-ascii?Q?q9TKKmXKpIvlqoDSZ3hgUIzlLs1q810w5MOM26FTjPjXgXcWFJjNKlekJxVi?= =?us-ascii?Q?2IKckYK+QoGNm/O7Gm/plbTtEkC66J2iO4zuY8O20/m41FljRZa8keFrFvHQ?= =?us-ascii?Q?qwYob41tP1toYjQ93I+6dw4bKrad0GnitVVzelnPDmo1DuAB5+zD5w915Wsg?= =?us-ascii?Q?TOob/EfeOZhzB+n1hrp3yWD3mcFH8BSkbjDQTtBqt3AuktRZzrl7ia90Jo7X?= =?us-ascii?Q?UCInMqk7FjRSveXgtG/4LpnPNnYeF9b5vCijKpLBTX9GTC45JiUY96MUD3EB?= =?us-ascii?Q?OPcbrikHtRUg8K9dTDN7NRu6RN9+xDdEOJMmzT9sl/SMFyAiwpoyLd+t/tQD?= =?us-ascii?Q?UmZW5puk/KwTtSdkHWJJWu8+OCxo70FFf5EmZn/bG/E2RqDGOeD7al3XUjh+?= =?us-ascii?Q?zYucOqkrESiD3FTgD6B5aR+TzU+iQsRdhDzgO78LS+4arlyrwwXCYjgCqFXa?= =?us-ascii?Q?CAG4o8/XiZbsMRCyomwESfz/x4lRPJ7Wdryn0EpEM9ucowfJN+EoesOkya8k?= =?us-ascii?Q?EUfudPXs1R3kDabWcuj+39s/7AuT+TV8E4TLxNurKyxVItPYWVUlGrtNwnUM?= =?us-ascii?Q?Hd/3PsAwL8Z87tHGSaKhJsN19T52Tjm+FXvj+ZZRoGNLXX27kWayovH8Vccc?= =?us-ascii?Q?ORzTEgC6W9XiFufUgEUDY067Zoy66D3zLEHInXbuHZIUAbAnq4TMcWK8vkFb?= =?us-ascii?Q?ggkUlaKJaFwxQhAM2JWJpYGXxP8TeGCrSOfa3WBQUbdxY8Znys/CS4OoC9um?= =?us-ascii?Q?CbcbvJvarGm+Z2OiP6Zmq9Ch4STAwc3aezxWUn20WBF7sxm1WFxUgUxw3hpy?= =?us-ascii?Q?VCCMQU92UDPzNnSGVDBWL8NRZtlWJV0PJyLrZ5ZQQJhW/yw2Iu1dARrYToCA?= =?us-ascii?Q?LQ1jIUiE9fJOzRFMKS9ZTTxtp0VdJRoT5L2Z9h7qkqcZEqU+XWyvLNKeUQ5D?= =?us-ascii?Q?IaIpG3PMI7w4=3D?= X-Microsoft-Antispam-Message-Info: 4+gRTb1lBoAbJ5kxsMNWTONMpAihm6TVWEhBQi50jSThViof29pTCL64F48rG3NA0p9f1jSMT/FOcbcQ+sZV31u5cdx3fkO+lURm3edFoWCavAAXE9a/trwRT+CASBJyi2/sfOVz2Yay2K76HUe6bBoGixTgFA1WXJQU3TlgWjYF/ZLfjCLML9XiwzfkbE1b X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2094; 6:2PLuXhSudNrkf/AZF+7ZYKVCXDgY/9PZhWlO11f/9xfU8+pt1U8qByyPJNcSlylQE+xM7fpMG1Nii5excM54nuY6BNMzz9gteo6u6ZOeSktDIuZ1orAfW3zH9nwoZe8qXdOQUNHBaXhKOykLe0jKeyG8w3aR9AJyeNBYuJ+DFYn5UQ3DImX1Jgr5hrvGgQKCHtsr6PT7vULJSGlbCA2/IlDYALZbpMd2z0JhHHiz1TVBVHpxGYjGlwBh5QhNJxskon2biCRfZdUQC6PFFih6ihLgB4T0mRjBfj8dn3lzf1BfKooPG16DCuf+9zLxT8qrLeQe57yoSmVyJJ8hkCBv7U6cODIwzq7nrSDZTqFu9bo=; 5:fvVc8NqFYIR9X2C5kKZuHPvk0REadhTAZf/PVDgAmXqiwSvtm7MWLTBpK1es+t/1zR4VVuzFgUSf05Tf98x011xIr291m2xv+xPki+zcWujTqOSIXlzEnv9j1GfRlvb8KdMnI8iMu8OSxYW72Z1lUgtAJE+WhiyumBBmIoJdcQE=; 24:vgvrh8j/fd7cppJ3NUNCTJO+nmVQHCcF0WREGGwW1/82IuJ/JnmvcYoTT0oMlDBi5Bl5GPjzEFiwLiGEM2zltmM5KUgQdA8fvuqIZm8QA+A=; 7:OExdd1NkHGU2hmRqWj6FWU7z0b1SBTieC6n3ycgSPSzR8hjiUZQhz11/zbKS03KMqKj9up3k1hTXJrPYIBagqeEateDLcTU2NByGpjUlUY+lGXleDZDWrBXxTo9oDJN8h6T9QBbg/OrWF4xaOSvovDY3mjKb9aMgY1dlGM7HMAvZ1FXnJbHncn5cIP+LjC3YZ3qKfRvgQ1qtT0OwBOBqLEtLrmJpoMamZ6doY5CVhRgGT+dKmLLHZ+bYdMihXa44 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 06:09:48.4740 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd53ffe3-74bc-4b4c-f2e1-08d58ef25a23 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: SN1PR0701MB2094 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 7a292421a7d7..91f8b3c2afb6 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); } }