From patchwork Tue May 30 17:54:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9754973 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 2B2D7602BF for ; Tue, 30 May 2017 17:55:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 178E325D9E for ; Tue, 30 May 2017 17:55:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AFF827C0B; Tue, 30 May 2017 17:55:08 +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 4312725D9E for ; Tue, 30 May 2017 17:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750938AbdE3RzG (ORCPT ); Tue, 30 May 2017 13:55:06 -0400 Received: from mail-co1nam03on0056.outbound.protection.outlook.com ([104.47.40.56]:33562 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751002AbdE3RzC (ORCPT ); Tue, 30 May 2017 13:55:02 -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=Pdk4IYq0Ndu6ZxPqYvmYxg+fVAyuXmupM/fFkxRwGmM=; b=VorvjvcVDiHxhkl9/WoMKJH+wvbO5VnsT6+/EykXM1N6bOfUL9lwI7/2RgQdFrAD4wDMU3T9uRZaID6DraNV+IFqB5+M24vXkZaIdU74Vm0TTOn6moEYT6arNXDKtavL22Rj/jDYsqMLY4V15MI8CpicGWYgY3rPYbuotI06Ecg= Received: from BN6PR07CA0047.namprd07.prod.outlook.com (10.172.104.33) by BN1PR07MB424.namprd07.prod.outlook.com (10.141.59.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Tue, 30 May 2017 17:55:00 +0000 Received: from BN1AFFO11OLC004.protection.gbl (2a01:111:f400:7c10::150) by BN6PR07CA0047.outlook.office365.com (2603:10b6:404:a3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Tue, 30 May 2017 17:55:00 +0000 Authentication-Results: spf=none (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: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1AFFO11OLC004.mail.protection.outlook.com (10.58.53.75) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Tue, 30 May 2017 17:54:59 +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, 30 May 2017 10:54:48 -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 v4UHsYFJ027051; Tue, 30 May 2017 10:54:34 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4UHsX8E027050; Tue, 30 May 2017 10:54:33 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 08/17] qla2xxx: Convert 32-bit LUN usage to 64-bit Date: Tue, 30 May 2017 10:54:23 -0700 Message-ID: <20170530175432.26984-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170530175432.26984-1-himanshu.madhani@cavium.com> References: <20170530175432.26984-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)(6009001)(39400400002)(39410400002)(39850400002)(39450400003)(39840400002)(2980300002)(428002)(199003)(189002)(9170700003)(76176999)(50986999)(86362001)(5003940100001)(4326008)(101416001)(33646002)(105586002)(8936002)(2950100002)(8676002)(81166006)(42186005)(356003)(106466001)(1076002)(6666003)(48376002)(478600001)(72206003)(50226002)(38730400002)(47776003)(2906002)(189998001)(5660300001)(305945005)(36756003)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR07MB424; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC004; 1:zahRO2b74Dx/8h4mw22j5tyLKUFfjedETe68niwPk5tlOZgyay0QPR6LfSHYzH4f9Udwn/TlO8cvTVdNv1Bjn6wzOT+N7fEkrWIBEXy/1H6mZ7zNbYQZvvqzReJn83BlHQ27mWk+GPQ4YFGd8mtQWMC/2B21HDwc6OPQ5oUHwn12C4IGILb2091+RgzCD2un34tm34PL7x9inDl9pYmptyO7F9I5wDthMy+ULQQ7iRdhxqIEvYjv4ICrPQni3CtzL7qzD7HGybyjUAlkeC3CsxPR5fl0guXrSxBo8E0+Li676Q1xAFKe8KsB6iIVM7rin24UzSFZdpxoJnC27IOAAocWrrHb7rUvKrfu9/X9q7zK9YwEI6wUVCNCnjtEByjhkSHfPYEHuE/ien9IpRApXCm4IGLig8eKNmor9zB3VdDA7lW7qPzfmEDmOkGo15Dtuf5pffvT7vafK/esjRtBDGxyi0yVj6sIYBaAP6T8vmjOt/RAXBmb6LGZvzja996P X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PR07MB424: X-MS-Office365-Filtering-Correlation-Id: bf3261bf-26e9-4259-b34b-08d4a784fdbf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BN1PR07MB424; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 3:N7MqgUilNfyBVcSQmQ+puRTFJWmshvELmT2Kp/t7o3YB72xosy9YbZbLmCcLKG/F7tbOE7C0o3X69VY+5KKvOzMEvYPW1F9+GaU7+bEexaXiXu7yW2IhUZ1UbxyEcD8rp7Zz50uOohhLm+e9bEOb3i1T6XyIig+z06/yRbKotlH0M4z7REGeG1rZ55R0PUc0ccnD1osc9XftPf1QWm/gHtCx/6DazY51Su4bUNhjEZdUDhvBioytt3yYS7v+hiI/OXH2nxBGK8G5GCZ/GZIv/6H8r9QrPHg5a5YNbpZirLebktOCB53fxBJjyanKD+chr6W1ZNKdy3IqZC2pY/Y5zErmfKYFzRktiAK0truVJwl5QY9z/14+9YcqRSNflVIUuoBdAoQ88rp2MOrcvVick7VYTgFR9/TVnAHvjDQ8VXSu11S+mSN04Csmpv3b3fQGauvwhDgwYd+dvzaG985/TWdFVfFcuclBC+c0OzJnzx2ATXB/hLfv6AMVhVwo5S7/ X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 25:Sy1xRwPY/Z8lZ0qovANam2rDIqlpJ2RZq+5UnE3IjuU3HJ3evnw+gpf0CJ/l7EFdyVnL2V4BjAqumOaYqCb6oCyiZvPNNX88qGsaEdv8CzQAMJ+L1GatM2RZCBv3lLkwuZZI5/IpQaXopLeweNB3ytNxmcTMxsGoyPw01sfUfVhq7Hp33QRPUvQl3Z5T2L16mPL3aJNOzvmqDJfMoc4cKnRJnBRXlK637Fxk5i/X+Nsbg6Z7kNRv595PO02+Hv4cmWVuNpW1UDDcjQfpIPkAC8Q8vE4hxfZULRdtQX/sPgRsiK1cfh/9R2vmiMyWw06A+++NK1rm60qnCMnRnxUQMm2eSuYpIqKAMznPNp6Zur0xQ4U4ACEZIHEe+WIX5pP2RMAA2p6/osp/tOHdz4GuXLXyJChjZyeBrdplnCTc82j7cT+H3VEU/Qhuc9BMA8HXCTIojMPduk/XLXHzXK3hba9xYizCBPZ5ZEsK6fszvH8=; 31:nDxDYlQjMbxpqAKT4XGJXuHvqsNzVUnwmo26cMCAE21Xm1RUDCKbhvfJH/dsug9IHXJmAK1uAb2QHnkZ8GgoUbLZFeiWviM6cbVFfxo0wQAZyX1GLGlHLXtbdLvOrC7fZYhuFsK0zYTFkr9v6ZHZPBH9WmKQ0Q7So2fRkR06GHumnhhmUt8CZOL3WVCQlFSYKHwvEtxWw8yTEbjgD/XS39Npw3+tDvOyA0kmTwLsIu3YWiGjp+wNMfHpMCBR5fLU9awW4UmQdMTKCh6bQDnl8w== X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 20:zQ/V0q+Jiqpx27FJy8Ru9IzrFwkN4yDN3PgwTXItLWJrn1HyoySZD0rkPMi6F2NX1oriwDyBe63TL2CyFmYrwU51pzCo2+DS1GeY7SpqoZHPjnDllrBOUca7WG8SnWSd626ZDDrpKhmMOBLRb1n68ho/XVJG8ONueAitIpez+ym/lV8+tadk45RubobusIgcd0yai/+omZ2epCCM14QmXOpOOG7Dh/IcU6k+XSmATgQRg/Q00u8RH/B/4LPjhU4kRS6NnCCKZSBRyOAjD/zMRhUkIaIV/a5iyzflQaWHpKeHwGjQeyKbxP5J9Vsrn6g3Dg3//mDj/OUkuGJ6aQEdNIKJQ4bJVXcUtwDx4rjgUmf04GO3SdzObaSbmaEnQiyYkzJtu51e6tLcEjGLJFC+nZ1GmzQATo/OyI/p6T/8P2DRyq4D8DGCOKgQ7PmQRNhspfb+23CFSB54/k3k1bZlSoqwPelfSfskYWmnJIGNgpMWZ0N1lzXfVJEwprV5bTPd X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13018025)(13016025)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:BN1PR07MB424; BCL:0; PCL:0; RULEID:; SRVR:BN1PR07MB424; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 4:eacGkSkbM3WZeXp1N1pMRjz/ZaVPtX0/CARjG5PNOmJZgbwyVkHL19Md3eZ5DqcebR/Lk6HchCpLh9IXXMPeARrSZFKNp1PjUonraw4FexY7ki8SpujwoeyFtDeGS7OHnPaL3WNfWZ2Dz7+Jx0CfEhCAJKAeGYCWKceWqX3/F6fpvtHOOW+XcQAJ4ZpqlmPgitxSlZ3WuqJJKxoQ7XEeyacwYSBw9FOa/ezMKwPNrhZmN6s2jxXBj3ZYMiyLdJGFCmsaKOSqwypXRahGWXSI/XR9Ar2IvSAfenn2bHe+jgfLkyVGxqEAWoikPzNvTGKsx03W1QJBy5RqIMZ1ABQSdcvNXD9tf/0o9ObO6Md2hp5/lGblK4EiPAtcBuEqDrd+l4waOfH7wxHXz90xwG/DxQ1ShSS4zPVb3Co8UWmYjxTFvCVGg7hEWkcE3sayYx78FJM9Yj2FJH1te8ikhQ4UvUhygcTrU64SmPM/+NIDaRkjejwGj1obPxapVg9Ctc3p5CuCL6UrRm0oJQLN4n8jq+nOKKdjC4K0Eu3lareqpvA7jwjfdrsjTJCHx6gsToOqbdgcFomgJ4ZwNd/DllxSvIkIKc3iJtodYlfYVKqkL5E1GlHNw7FTKfyAFgnGdM6T3tK51uvzcfJu9Z82lu4kN71k6URDmSwMbhmPcY4dFqSWJqsfx68td+YCE4tRz1I2iNuI/zPvJOTEA0SdyXeJ2hBw0UvqgYfLH6WbLcn1hdLdQvMRNW7+YQHAkGZOWuKuQEYBZLIFBiWoB9vQ6Ie77a0T+BdMYKoSt2fTM0UgOuiS0IOfP6gZNjBNfnH+w8pj X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR07MB424; 23:nzpUU2ocsiQONcZV3RtTOzzV2dom8zZYv8pxf+WTPO?= =?us-ascii?Q?s01S0YGESr0v8Thkow3nfx2jxNzOdNhtVvDTC5ZhhrxOWGNR6cm6IUVdnv49?= =?us-ascii?Q?wvkzggEKlH1TR6Ic2YSmzSRpELCm3rGxBioZD1RbqX9QKsUtDmi4ajPY0dey?= =?us-ascii?Q?f0vss9iEnkw5tqJSY8RpL5zdeZ5Yrtq5Z2zoDW+JnKlHkRNtPoHaEXpazhAm?= =?us-ascii?Q?5dKZN/KiLrtLuHueUn0Om9it+FtpKfDJLZnbwJUH5VA39BBKyYU/LZg+mlvp?= =?us-ascii?Q?VUtP6uB7YHBSn/Usc65nCVe/eoeoXzfaGGbPVYlGzz8m8p+j+AWjXp92hNHS?= =?us-ascii?Q?lrqeGbRAWIjjvzAcnbVRst+nb7ClMB3IQiroc33UqKR8jp9FKfFTCetUeHN0?= =?us-ascii?Q?a8Vm28gDZlVjpVnzOWC/A6zCfzNFvsfIBUDi1ZKmz7/3+E4hA2hGp8ufvb0F?= =?us-ascii?Q?IgAvWn5h4tS0SGloF5JRt+DTWoOBathvur69xXLo7SQFFYDB/G3ZYODYWs4u?= =?us-ascii?Q?ezi7fZ/h2fLXHyDaxMkoDrDRB8zk6zHjJIIzO7fUA2IZuPAnSZiz3tIumn6p?= =?us-ascii?Q?q7t9w8gg4Zgsgx5egEUK/1iLFzMEE5ulcaXT3NAK/7Kaw+Zsx4P7koOQH3It?= =?us-ascii?Q?5YvGFniaEj/WOxGC2rAUGnpwMV6lX+KHp2zDE3lRSylV94TzRAJxgXKXqT1G?= =?us-ascii?Q?+9RbTZE6C2t4wgh6znQQe/Oh2AV6pAf89iCGmoO90WI2RPDnPs2yXoVrzeCj?= =?us-ascii?Q?mgeZnYOUNUvHboemPnnyrov+PayrGvTU2RdqUHS3DsrgyR0naaizH7/z9buz?= =?us-ascii?Q?p27ldesloYFKPokHasbXErY2DRkBIuiBgC+uNQ3eTtaV2gPZgesm8YCtRBE+?= =?us-ascii?Q?10kwioOBNvxmYWhpDb2a3DfAw0nbbIIIXWCKngVlOpa5jowAjDvjdDeStnln?= =?us-ascii?Q?Mre2jeNU+2bF8GA2JOagFPnS/8nyC3Si4fa7oGkhGhaL4S1egMSZAmYkP0S7?= =?us-ascii?Q?UiTXp5OkRAOkUc4Ns/d2Az?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 6:xLEZlxji1msiI3Ba/J7dpHzApsFOCn58Av+XDQ/wzhNQXAmz2rgnMoLd5AUheHs75mYssaQur5F0yI7pdxS+GlHSVSF2IMJIIV3ijdSOc4r0WVOBdS5fOzC4rCW727+7mqRw6VrXw3aPC//88VmXiPgTaQJWEw6R0kZnID8sERh9nmw6mV//feIs7mejp1qTYCp00iGlEYmfiqbdZp0UwskDm+e+iSfV4UjfXxTi0ZPz1/Ve54S/e0tFfwahJ5W/vZetfFvoztm0kW3szuutiKF14Ohm03FMyj1RFwq3k3s+iRGnJw3+rLe/HmrpvGVL/orB2gI4+EXDTHyXwuN2KuSi0zfK1XOMOtljVsRG9WKO2+GRxE4RNZotd/QO+YF4GC6d2LfYhE4oauMsawqHwEDO/Qz7etXQH9lLWRSpo9SKQIboUwqCmeF9e62BJWDR209R5G73CmsXfrbIm+edhkF83PKO8GRuglvAt66kkVgqxh0nJCbljjb/HXC6TBJx1HqAUo7uAqI8nCa/x1/ojQ==; 5:WjlNM3fhN4ugWTYBuyApTaKpVJl33VvLe+S4VZE5jXtoGbXwQG9EZXQo65N3wRo96dhGJ47eJo84oatOmFUx+PNVA/Tp4WgukjNfIr0/u48rM8tmoIoQQGkgk7ezyiGXHdV5TwTM6q9907jBWGi5yA==; 24:xMNEVVj4TA071yKmvGnCTaNCw22l5qTHytGtA2qvzMSD20qS9Wv0Ep8NjS4GYsS2bd0MJjk0i1/YnQbcmASPJrHqmRzxibicLbXKEAHgoDU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB424; 7:vfuLH6SU0X8ohxRm4XS2czLwIMfq/1gkvyNzifQMQ4P3OqsIo9rJThI7hQB0nkzWH/lheHZLTeh54iiPl2hSN8fXnbxDGMHfAWlgEKcsv/CmuJJYReJZgoCHdyxUIwsHOvlS7maL2QOq5I5k9Z8HWdAB1+/J6tXMe5kRtbatmrnVmOnzrmrrbfSMnoVXbKEo7LSYn7oT90bznd0norikk/Ga7Eg9eaMHwJ5ncqdrRD7qpzzMCIgk81ymQ6CwxkSFpr2glrgDLkMw30NZCuuFbQsB4RoBX1qTxrHCbEotzaFfj6sRSW5WyeWM/fIWEAB01hQ+tZEF4m1UfCx66N2o/g== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 17:54:59.7371 (UTC) 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: BN1PR07MB424 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 From: Quinn Tran Acked-by: Nicholas Bellinger Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Reviewed-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_target.c | 32 +++++++++++++++----------------- drivers/scsi/qla2xxx/qla_target.h | 4 ++-- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index a2e17a5794ab..a1f33b06019d 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1799,7 +1799,7 @@ static int abort_cmd_for_tag(struct scsi_qla_host *vha, uint32_t tag) * for the same lun) */ static void abort_cmds_for_lun(struct scsi_qla_host *vha, - uint32_t lun, uint8_t *s_id) + u64 lun, uint8_t *s_id) { struct qla_tgt_sess_op *op; struct qla_tgt_cmd *cmd; @@ -1810,7 +1810,7 @@ static void abort_cmds_for_lun(struct scsi_qla_host *vha, spin_lock_irqsave(&vha->cmd_list_lock, flags); list_for_each_entry(op, &vha->qla_sess_op_cmd_list, cmd_list) { uint32_t op_key; - uint32_t op_lun; + u64 op_lun; op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); op_lun = scsilun_to_int( @@ -1832,7 +1832,7 @@ static void abort_cmds_for_lun(struct scsi_qla_host *vha, list_for_each_entry(cmd, &vha->qla_cmd_list, cmd_list) { uint32_t cmd_key; - uint32_t cmd_lun; + u64 cmd_lun; cmd_key = sid_to_key(cmd->atio.u.isp24.fcp_hdr.s_id); cmd_lun = scsilun_to_int( @@ -1850,18 +1850,15 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, struct qla_hw_data *ha = vha->hw; struct se_session *se_sess = sess->se_sess; struct qla_tgt_mgmt_cmd *mcmd; + struct qla_tgt_cmd *cmd; struct se_cmd *se_cmd; - u32 lun = 0; int rc; bool found_lun = false; unsigned long flags; spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) { - struct qla_tgt_cmd *cmd = - container_of(se_cmd, struct qla_tgt_cmd, se_cmd); if (se_cmd->tag == abts->exchange_addr_to_abort) { - lun = cmd->unpacked_lun; found_lun = true; break; } @@ -1895,12 +1892,13 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, } memset(mcmd, 0, sizeof(*mcmd)); + cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd); mcmd->sess = sess; memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts)); mcmd->reset_count = vha->hw->chip_reset; mcmd->tmr_func = QLA_TGT_ABTS; - rc = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, mcmd->tmr_func, + rc = ha->tgt.tgt_ops->handle_tmr(mcmd, cmd->unpacked_lun, mcmd->tmr_func, abts->exchange_addr_to_abort); if (rc != 0) { ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052, @@ -4334,13 +4332,12 @@ static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb) struct qla_hw_data *ha = vha->hw; struct qla_tgt *tgt; struct fc_port *sess; - uint32_t lun, unpacked_lun; + u64 unpacked_lun; int fn; unsigned long flags; tgt = vha->vha_tgt.qla_tgt; - lun = a->u.isp24.fcp_cmnd.lun; fn = a->u.isp24.fcp_cmnd.task_mgmt_flags; spin_lock_irqsave(&ha->tgt.sess_lock, flags); @@ -4348,7 +4345,8 @@ static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb) a->u.isp24.fcp_hdr.s_id); spin_unlock_irqrestore(&ha->tgt.sess_lock, flags); - unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun); + unpacked_lun = + scsilun_to_int((struct scsi_lun *)&a->u.isp24.fcp_cmnd.lun); if (!sess) { ql_dbg(ql_dbg_tgt_mgt, vha, 0xf024, @@ -4371,7 +4369,7 @@ static int __qlt_abort_task(struct scsi_qla_host *vha, struct atio_from_isp *a = (struct atio_from_isp *)iocb; struct qla_hw_data *ha = vha->hw; struct qla_tgt_mgmt_cmd *mcmd; - uint32_t lun, unpacked_lun; + u64 unpacked_lun; int rc; mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC); @@ -4387,8 +4385,8 @@ static int __qlt_abort_task(struct scsi_qla_host *vha, memcpy(&mcmd->orig_iocb.imm_ntfy, iocb, sizeof(mcmd->orig_iocb.imm_ntfy)); - lun = a->u.isp24.fcp_cmnd.lun; - unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun); + unpacked_lun = + scsilun_to_int((struct scsi_lun *)&a->u.isp24.fcp_cmnd.lun); mcmd->reset_count = vha->hw->chip_reset; mcmd->tmr_func = QLA_TGT_2G_ABORT_TASK; @@ -5877,7 +5875,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt, unsigned long flags; uint8_t *s_id = NULL; /* to hide compiler warnings */ int rc; - uint32_t lun, unpacked_lun; + u64 unpacked_lun; int fn; void *iocb; @@ -5913,9 +5911,9 @@ static void qlt_tmr_work(struct qla_tgt *tgt, } iocb = a; - lun = a->u.isp24.fcp_cmnd.lun; fn = a->u.isp24.fcp_cmnd.task_mgmt_flags; - unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun); + unpacked_lun = + scsilun_to_int((struct scsi_lun *)&a->u.isp24.fcp_cmnd.lun); rc = qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0); ha->tgt.tgt_ops->put_sess(sess); diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index dae278859554..25ea90b8f6c9 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -675,7 +675,7 @@ struct qla_tgt_func_tmpl { int (*handle_cmd)(struct scsi_qla_host *, struct qla_tgt_cmd *, unsigned char *, uint32_t, int, int, int); void (*handle_data)(struct qla_tgt_cmd *); - int (*handle_tmr)(struct qla_tgt_mgmt_cmd *, uint32_t, uint16_t, + int (*handle_tmr)(struct qla_tgt_mgmt_cmd *, u64, uint16_t, uint32_t); void (*free_cmd)(struct qla_tgt_cmd *); void (*free_mcmd)(struct qla_tgt_mgmt_cmd *); @@ -884,7 +884,7 @@ struct qla_tgt_cmd { int sg_cnt; /* SG segments count */ int bufflen; /* cmd buffer length */ int offset; - uint32_t unpacked_lun; + u64 unpacked_lun; enum dma_data_direction dma_data_direction; uint32_t reset_count; diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 1131fe8e2dd2..238abad4b481 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -595,7 +595,7 @@ static int tcm_qla2xxx_dif_tags(struct qla_tgt_cmd *cmd, /* * Called from qla_target.c:qlt_issue_task_mgmt() */ -static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun, +static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, u64 lun, uint16_t tmr_func, uint32_t tag) { struct fc_port *sess = mcmd->sess;