From patchwork Thu Mar 15 03:34:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10283867 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 3A52060291 for ; Thu, 15 Mar 2018 03:35:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B944287AD for ; Thu, 15 Mar 2018 03:35:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2041C28806; Thu, 15 Mar 2018 03:35:15 +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 513E6287AD for ; Thu, 15 Mar 2018 03:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751781AbeCODfN (ORCPT ); Wed, 14 Mar 2018 23:35:13 -0400 Received: from mail-by2nam01on0087.outbound.protection.outlook.com ([104.47.34.87]:54448 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751613AbeCODfL (ORCPT ); Wed, 14 Mar 2018 23:35:11 -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=59qoH6EyNmq0aKT2nhITnM/vboImWQaRVRlpTJmqAhE=; b=FKujrsNqMHkkZs+FQH7MEBjUTtto6y2+bRX9Chxa7NZrlZ5ARAIwWukiwFvMP/y5KX69j2Ug33I8ohbt1/raBdLDzF4k2fVls4olW1fBrwSySCMFnt50jDNnpVict2vRd7jJSA3Av7qtpD+80izfR5fhERLBLNrsydMfGbq4iMc= Received: from CO2PR07CA0079.namprd07.prod.outlook.com (2603:10b6:100::47) by DM6PR07MB4220.namprd07.prod.outlook.com (2603:10b6:5:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 15 Mar 2018 03:35:09 +0000 Received: from BY2FFO11OLC012.protection.gbl (2a01:111:f400:7c0c::171) by CO2PR07CA0079.outlook.office365.com (2603:10b6:100::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.588.14 via Frontend Transport; Thu, 15 Mar 2018 03:35:09 +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 BY2FFO11OLC012.mail.protection.outlook.com (10.1.15.23) 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; Thu, 15 Mar 2018 03:35:08 +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; Wed, 14 Mar 2018 20:35:05 -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 w2F3Z5fk012667; Wed, 14 Mar 2018 20:35:05 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2F3Z5it012666; Wed, 14 Mar 2018 20:35:05 -0700 From: Himanshu Madhani To: , , , , CC: , Subject: [PATCH v2 01/13] qla2xxx: Remove unneeded message and minor cleanup for FC-NVMe Date: Wed, 14 Mar 2018 20:34:52 -0700 Message-ID: <20180315033504.12628-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180315033504.12628-1-himanshu.madhani@cavium.com> References: <20180315033504.12628-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)(346002)(396003)(376002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(356003)(5660300001)(305945005)(4326008)(48376002)(26005)(316002)(110136005)(16586007)(54906003)(336012)(59450400001)(6666003)(2950100002)(76176011)(51416003)(87636003)(105606002)(186003)(478600001)(86362001)(42186006)(47776003)(1076002)(106466001)(2201001)(81166006)(81156014)(50226002)(69596002)(36756003)(85426001)(2906002)(8936002)(8676002)(50466002)(72206003)(80596001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB4220; 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; BY2FFO11OLC012; 1:+c3rWtkXLHBydgbqQT/eOXurbgVy1vGVgbB9Pk+BcQ0jlRZ2L3ozHmQ44157KOZ0ZeNjpQ/aKJA8PY6m2g0QB01u2GhcbSPwpGmOsfHGq7w8OYegrWhdE12mKMhmKPM5 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c984ee6f-9187-4d49-3d70-08d58a25c06b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 3:nieHrUsIM6NasLKosptatW8VfAJUxTV0/xCE8P+hH+Dwb1r3rOABVB1WW6KhzobI67+2N76jb0w8dIdH9NBghH14KoYMG3O60Gt77p83Ut4fK0opYSRJPaMTOMJqYHYJMLKtElLASPwZ/IEMBeqlqaaxSU7iaZd3ZQ/w0OwWs32Je2OGyRDs6r3gh/4z+2L+4O8yTp9prgBSk80kUDG6e63okZMdyibHIZgu+wHOvv0cG7KHm/hbl3oNE96oLFux2AO7HAcB1THAtFneeVR7/6I07jS15MaoYxr1yX/j3KgpTZQZ7sloADcXlSCZSML9bjEkVmG9H+dwukhjlVqKFmmard1YUSi0+Z4DSsXqeEY=; 25:/Ia3cgfV9b82v6DSbkGKMJXVxroWvCPOLXfAJeUxtyLsTVhlXH98aHuBpcWn9AuJWrKWtV7iSd33w4+iBONc1muExc5r45/30Lu8J/8vH1pgduu5RY1D5ZQJcpYZiECa/x32VGEC5XHuDD49BdpOyb5wMmFEfPdPGbsVwz6Q8aSTtTFVFBhWqcegOGNgAd6m6HKmcft4X77Lql7jeY8U5fwIh+MXd0Mtu5s80nXyYWFZecCDepLrZCXL8pB6m+PVx8kbCct4wX3myE09l8a+HQabVIwle9tNWHMv/4cfZHvRqSfEMQguF8I4lxBOqBYfD0crJaH0FTQEb81nf+bmqQ== X-MS-TrafficTypeDiagnostic: DM6PR07MB4220: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 31:EHmwEdeDy0Zq6Zqrs0Z8yiLg5Y8H9NCpbMTT4mNGC2FPlDYZGVi6a8md3CKhQZDGYpmrCaPowRRc+CRzwUPcsvZBmO0P7V1hjDlMSOHVU7A/2WbxWmNxaI1MGzP8M2Wr4aAS7RcF1woTJqXA71uT900Pvnw7038Bc8WFADKkSwsqCVSU9jjW5pbJnOoXD6oBO5NonlOjcYuee8F9BAT8ik1YCJmh0i+cGSyD1jfkq14=; 20:2iA3JDG0ZWKMKCqm7899nrG69fQa2tIfCPtFS+n3t7kVSsb7vDNES+Nr/otsdZ/diw6LbBS59g44La//yvYMELZgcKTPUbZPROx/YIuj7cOWbO2/VFsiGsUTW/OsSXsAPe+xl0tFlN4H8zbJOnxYjmtHbz1HOcN2in8n6NxFuGPmrG7e7H3ujV+R/8s7yJ28i0/58+FWQvvAwCHvXMZtMs/1a2vWnUJa07t0/XiLVz6zC+OzOyW4a/dQD9TO58U9XhQvEgrW0nsHcI7ehBgsPhH7obkVIWzhzfxioM0Igwm3LVdGljrbx2cDGCrJUvhpssfM7sNYlYRf1UQEAVGQZk1cXDBNNgkifmIC/KhhuJ7y4OHroQkHlJasRxAyQoACKgoybo0c6OjM32iRtICMZXgkG+cRHgmcDJlvVxQFeE9KQHihofZd9YjNMsIu1ZFOzCcRatJFHOEWZiaYKpncXuSiB+kyChiao6r0YszXAkMhhtAL8tkAiedY3GcKYu37 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)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501244)(52105095)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM6PR07MB4220; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB4220; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 4:wimJh0vjEWuO3BG81bXqE9vxhUpETDRKR3cCZhl7ONdxZA7UexHZXlTLsplpU94UnTb3fuuqKPiWscHYSFEyhjt0oWk7JWjjvPb0piyrtbDmeLhoeaiHcK1VrmVzBfpaijDA+wtBsk9scUCWoCzmmQdL93nkx7Uwe9hnKn21kLpNj7uJ494syrYlqSoJ0GxbzTcoMp5ad0MH/Jjoge0PShU0xZWfG5OqHVZmgzQkbjb7C76NyRwN5YiHhYooLznFubZEz7lBPi+ZpFJ6VVdeWA== X-Forefront-PRVS: 0612E553B4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM6PR07MB4220; 23:+sBtf1vnm9MPXLUJxFWYa7x1ub+MpzO33wXZhmnfx?= =?us-ascii?Q?Anr4alcTITuyRJaLTJSqEMGF4rDpKbaPS97PfB66owoOEgaFbztnsFK2D/Nb?= =?us-ascii?Q?BqYnFr8tiLMDMqGbCPa02PAt7lqVuA7S+LrQeEliq7Exb1NYxSrjNCx+qdQC?= =?us-ascii?Q?M2nImvpHUYFXz0oy2ffjXMiJTzlR8hnNt/qe1TpRPXVepf3dhkhoBlAuFO/D?= =?us-ascii?Q?ukl+UErLZZgSnMVnvX0G4sXutrrHi4zCHOS+NkbOS2/3T6TbXKJyhnvBX7p/?= =?us-ascii?Q?udJLKvweNWRSCx7+Kv+utmexHfZpN1QFj75l3rrzlET0vR2KJMsWFLQK9iCM?= =?us-ascii?Q?QJRhRe//UBd1HoN+1XMOtpnv6LIjLugVP9g8hJPUykga8XX6yR01Hn50TOFb?= =?us-ascii?Q?MTjVi/hn9qfv+I/Cg0CtCIA88JIfEBTCiHC3fm0w2ZhVUmeZJr+bJ2N577oo?= =?us-ascii?Q?uoKnRIgVzVgpAF/ca0caiEPNfWrIRFkYhKTayQEDH1MI5C31DyOYfQMIBwrn?= =?us-ascii?Q?Z2ocRkEWD7BHcy14MDBAFMvYufMlDj+IEfzN1sPiPpNou1g8UElZvwWT6npN?= =?us-ascii?Q?0B08gucUyR02kL+WIM6EEXPUe/dLrum1dawKb1iG3T3+pD47SIdGmL7v/ZaH?= =?us-ascii?Q?02TzC3Nh+AIIdeUvJLhUD4SKjfp0B9czNiGL31l8JfOfj9Zlz2XDYw2OymU0?= =?us-ascii?Q?NhLcT1nFQo9jAv4xHzYaIKYsP2iwk81xHHytwNY27L2nMesF7z6CbINgYG1v?= =?us-ascii?Q?Nj/sUqiClfVuISaTuZP60uNdBixW2zCNzz4ySAOWmmzRbJGjDZZ72Z7LW7F1?= =?us-ascii?Q?Ruc8eq0k+7Ao6virAp8eNTZmL7XBc9Ke8qr6Hdkc0Crk/X7Rcfv6mi+Xu44S?= =?us-ascii?Q?3+OntYqce8JQgUnUWCrl9gy06xsBs7qFi2dzhyuBxrpj2duU0mW2DpaG5fbU?= =?us-ascii?Q?77elRKJ0EDvlgO/mZuu9/2dSlME70783YWZoh/mNv0VlU3pKR3GrnSkIobLP?= =?us-ascii?Q?Rmf2eyaqSkWTS1JZXPUMWpGNfZsRLkX/tSdflE0Z4Rvj/NZUyeW7bzlYe8Yy?= =?us-ascii?Q?n1uqrl13qGKNB3sJoQghUK129Pxb2buCa9V1zzxvmTjsXstOtGjIM07yjAsz?= =?us-ascii?Q?2pLZibaiW5I24cyBb6K+7aRiAOkvR13?= X-Microsoft-Antispam-Message-Info: AZk952H0OJBCldf5HVgRZATSgcZZX+/RnlgI0hs6HjnXpUNExc6gSGhYvbO1+aw6FcCYxf4EvNuOdmqapsuNvbGsHYEHDAt2qFrKWquzprNXIussZd9g9MABXwoHapqUZSlDHFvm4/pyMvqBDeUWGGM1hv+xXDJ367tMp27ogKRKgAcftD6gIAaMrHPMGSI1 X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB4220; 6:jesEQKtBMC/tGQ0upAISljUbpeYCLXYHmDLvAPcZ/OX1oCfsvIJczeM/c3gx/HiIAzU1AAsjnymokGmrpHVwPjNNOoaRFlqAfkzPsHEcWlS69gHL8S9k9IZzlhfl7jHMmltF++4EvN8bgKUJ6XwE2B3ZXbssOEVwwzmq1cqlq3pIvUjrWRhAMoFhqF82//ROhL7dXwJMg8C7ZTCNRBkAJC9cTpUE5R24k2L7vUfffJDukTszYC9MBJPvzFzijALCif+yGPV7FUUEY8cJh/cp2o9G3CxjNHDhtp+pDykTykncRIfUy8cRAN0PT740dFKAjj5FruSk674/7PMKF90CNL3IX4aCws05/raRujta3aU=; 5:7fmiyqVtBkI+sXPR4Dsk7JxxemBsY4gU4lLlcJM+o+JB7EwVcekT+mKl75ReOH/9J+zY/X9XqCDZ5X7pEPxd/Z1itXITWl/JuBQdbRpJtTHq1stgTN444zRGa0/50FfjLZmA8VvMHR15/W+DjinqwMw9k/PGq4ooS8VCKXm+tGQ=; 24:rSjfaCvdJaTMHsaXVEmz0Yp1W41g3ccL4BamA/T2DwjpnxQD/Gi9+mWdqIZxLhAIAESy3tHL9ftZRiJdUsxvNz3HHyE6g4C9rnr4bB94uYM=; 7:n995poWcFmvesD/nFdBKE9qLSM+1Dx2SmYhVjaWIK5v6eW9Oc2U4Cn9zQlS2+CEXsY7WWQi5ex2dLQIGuUJ4STVTge/tvy3fmGoWSFHi8f0vFLxMlyYqQRPVNizX4LwzW1kSxKcYhfQn57d++h98Ftd5LpPp/DWtuE/EMU5FcGNoAA5HQR/BsvlYZ6K2wB2wRCF+LfB7eKAeoc7lkD+9vgGVZZjmpX7rNCjOb4lXoeXyJeedmXcF2/YvUhkktsPA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2018 03:35:08.7285 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c984ee6f-9187-4d49-3d70-08d58a25c06b 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: DM6PR07MB4220 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); } }