From patchwork Fri May 19 21:53:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738263 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 222416034C for ; Fri, 19 May 2017 21:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E38228562 for ; Fri, 19 May 2017 21:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 028DD28573; Fri, 19 May 2017 21:54:24 +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 59D1D28562 for ; Fri, 19 May 2017 21:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756850AbdESVyX (ORCPT ); Fri, 19 May 2017 17:54:23 -0400 Received: from mail-by2nam03on0048.outbound.protection.outlook.com ([104.47.42.48]:53860 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756823AbdESVyO (ORCPT ); Fri, 19 May 2017 17:54:14 -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=i0Xcmde32HhI5jGBnYGEGLbDFahX+kPoGYQtdN9nwyw=; b=BPwsNQ8Y/O1bqBJw703aL6FC72KnpElNftxMhLIOOpzhjyryjaV5PtukRypz4tja2sPjiQ6Iv1qoln4arBXu6TCIdib8QetrV1lVsivoTWls3KM+qOFlRv1wiyfhdhHoWT/LYj+Q8J724MODIzV4P+x4OLi7zX7rnVe7NNHYLcg= Received: from SN1PR07CA0033.namprd07.prod.outlook.com (2a01:111:e400:3000::43) by DM2PR07MB432.namprd07.prod.outlook.com (2a01:111:e400:243a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 21:54:12 +0000 Received: from BY2FFO11FD023.protection.gbl (2a01:111:f400:7c0c::103) by SN1PR07CA0033.outlook.office365.com (2a01:111:e400:3000::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 21:54:12 +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 BY2FFO11FD023.mail.protection.outlook.com (10.1.15.212) 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; Fri, 19 May 2017 21:54:11 +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; Fri, 19 May 2017 14:53:53 -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 v4JLrrZT002271; Fri, 19 May 2017 14:53:53 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrrak002270; Fri, 19 May 2017 14:53:53 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 15/25] qla2xxx: Convert 32-bit LUN usage to 64-bit Date: Fri, 19 May 2017 14:53:34 -0700 Message-ID: <20170519215344.2168-16-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519215344.2168-1-himanshu.madhani@cavium.com> References: <20170519215344.2168-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)(39410400002)(39850400002)(39450400003)(39840400002)(39400400002)(2980300002)(428002)(189002)(199003)(9170700003)(189998001)(47776003)(305945005)(356003)(80596001)(105586002)(50226002)(81166006)(8676002)(5003940100001)(8936002)(48376002)(5660300001)(106466001)(50466002)(42186005)(38730400002)(36756003)(1076002)(54906002)(33646002)(87636003)(72206003)(478600001)(101416001)(76176999)(4326008)(50986999)(2950100002)(2906002)(86362001)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR07MB432; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD023; 1:kG5Q+I+1THtkeA7hjC/dHkB4pvkJdccAEp/6+KJXZqwtfVFMASihpWlxdCPPfbg1Lr81NoJANhPnyXjn63Zmo0kDgpGVfReO8U2U30BQM5LpdSkw09HoW4NfWlFue9VGKi55sNwCiZxgwsazltDC9XCZqjfHTgBbWQj0Own4N3LcCr1BsQulpPN2XDEPY23QXRVB7uHOmfHRoXT4Ma7cJ4TG+r1MIi8KjVA5whR0laWbpUDPwKVfQpJMLOevdURGgmr5E3bZ+nwAJ6kW8UJbQKVRHe03R36qZSXH0BT2G20YVmUpEA7H2E9C5YMdqfeR1gQfivnkPKjhRvb+MKv7QFUiNMqcR6fEJCfZyEw10ubpuTaTf1y88J1+zN8cQMIZwsl29GIKXcuZLEB0LlfGqH7rpEpI3ZqFtBkpRcIwSfUrZxlN67B0kTtaHBxZF1HvSZfz7SBREXylu3YKAYSlgS84V2nQCll6RQitwoLqT0tv/v15lSPpnOcoxF322GrNDEi5VAdYLE05PLdzRdOzHUDDEShF+k8RzsvEUJN52N/Sl7pLpsKCL7ottVk3JhQ0qgSDEy0kyXQ2A0gSVyzp+Q== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM2PR07MB432: X-MS-Office365-Filtering-Correlation-Id: 71bdcb27-2366-4e13-a095-08d49f0195b4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:DM2PR07MB432; X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 3:EIGURP8tIRdhItRkPubBB9PDchHhy99NJztoe2DcpdWSQvsZU0aJzxXKbCECjqrd36Tz6BoG9A1S4fbodcQHBvbJ06kZJGKjCW1/WiofbqsmGw+lnpVbwU4AK0JpCedVMhsmdI8Z6AA3LiAUQP6xkSF9B4VcF7j/ytP4dcTbQgGD0jirsfYrwpBaKIE+5St3bo2GkkeEr2aILdsAtRWXD9uO2sHFBYaqYTIKEEqvFp5BpTs91ADXh27R5kITZMEZpwEXv8wW+ph8caxtmwL8+SOyOG9QVtby35F4ZhQcP9wG6FCYPmydRQZp3hh+0TaQECgCqjvj5OHGmaR4RX4gyUpjbekZeCcaQQEm982jYqhFNTHJcdeNoJB4hRjCOcmwwquhNekz02M7fsa/RcKHu0XIGllvGC/52B4Dd1T2Idvimw6ruQOq7epg71Xhz2ifCQG7wlbqcfRlOmv//TxcjgLcO4imeMkl6s2R9QIWjcbvcI/5yjGaFgXAACgt/9t2 X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 25:yvfX2xICEjsLXv4cXvAdik7FKXjtd987EC2NwpxB9mguuo5dh+7WYIKwYH1MMjH69IjT29mLDha46eO5LEpZhgiw5PB+eC2taNur7JU67tPSKH/bp2hed5OXXZMLgiHqf16Dumhw0l86vQenhC7h/4G/c3dwGCrdLIXU/bkf/NNbLpW+MmZ/Juwj+W/HrJT9WsE343OIjZJI2E4aMqfQNTwM+vAbaqUxvOEuSELGCXWIiMYNxSH9Oacb2obUk/sLsBJvYZ7UW/WERFPk4rV9SiT2SdpDvWI9+28cLjZkTHqNNB/4UPLKQJ8v89fKFu1F8ZzrAQ1cuvhZtzLEZcIm63r4zjLy4bUwGKBb1YtzoFuSyDu03Cy4jyI1J/FmHMxc32DqAEdl6SCPnQsl/PZR9NI5LjNvc40Awk+o/33KDHqnGR8Rvzs69DD9spUWcHXh8Y74776UfVUyPyrmIJ9zC5/8vq9dis3MtQLx2udDaUY=; 31:GDryUIKBMZb133kw7AVzFwiaxjnnhGRH/Xe8LRCfxiKDveXjUo2yq5sFfBsRAJ8WzmEeDPBTrkVAGo67oISBOtO4I83JlpCExbMeFxyA/TOI3PpOhanKsyNnqNkCG+CecC7hxr4gVjH1NCw69r73cyJUpJAgfscE9sjucAAdHz6ZP9auADAEz7/XbhWaTgdavqBjG5h3vFTYto/HJaU8yvFOPGCQYSoPJiTXPnNm2KrkkuSDRLlzW7YmhpiloY6cFaJzjSLl8sn86sYLG9xV0w== X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 20:w0EdFzT+Nfg/Yh0E0/KllVZC/pjuZFoG7H8fjf+oJCop3gLIgoWu0h0mSfTFyTFJ6ylaylzvU1Cqmt/J+DZwKKzmMTEVdl0C1S3qbD6QHya0Mjiwi8zpI9S5SUnzys4McoqJPOICl51pXJtAuUC+EFevnnyvzxN5uqUuFg3ok/jdCs0xMRll7zZuG3wQevfcJYsC1xBqtafqIPI5Brmjt/Me0pax7jwpG5Y4LTluBkkfLGKcrLmFXRlWuyXf14VY6fNfft+yi9AQnGWx4CgdEh3Vr6m+81ePDGUdRX66YFSNdQhBd+3VDeSsn/rQlZqfjQYlpCSmZfQEixNk3eLD0DUDpyHUrDUQfqoTJBT8/j+eAMaaSqmQOpMRLTZ7kwVKT2xxtbPY/a7EBWfzDle7IWWxDLHKBpcUpLv4nbU61WO9jWWOZ7vjXKn2czDrRWDcMPK46oH6SmJ4eruk0P4D3Bvy1vhEhh1yEs08KnxB8L0D/aw9lkNAzkMz+iaO5zvw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(13015025)(13017025)(13023025)(13024025)(5005006)(13018025)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148); SRVR:DM2PR07MB432; BCL:0; PCL:0; RULEID:; SRVR:DM2PR07MB432; X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 4:EVuumk2m+JWQ4RdHVU+WEQH7qHxLYveA0Sl7v2g+6NzEO9MmBi+rN8KxRa5ImmBJx0+4YbGamh/67gb1FQ5/eZPqlt1irXNfl1A42TF8RbYp8taYPXq21GGKzkDppVFg3M8pWDihsRfSGMjJuSN1eh8rKSbSCqLC/thNer/neCTwJPyf8N5yt9J4+J6ZftMt5PT/WOb08bTDWDr7XOx0fXH/20jzcPGUZJvPMq9YutakSt1Xz9noskpJeXabQcn17D1m+0Q1B+m6zUzNQTSRhJAfsXwQu3OdOkK3BWehF0eSQJqxP+xZYLToYekNrVi4bJ2QFg+8xfAMSk7CbN2DGOXHNrPJi30ySSM5dywwUXISdNeTgGxj7DmoJt4jC0d/aGP+HupA1zxeUS8TBTDD69YOcLm3R8ibkvnfw1b2PvZQtgzB0lwAv6B3vqEI0iCmimHMVzhocCgLjrAmlB7mB40ey8IK4e4lCHRjgIKPjzxDtIaCv73OZtAKXT9182NMOUWc+Rm13mGG24fnfDgsXZVvuLw+urkmTB3Wqwpqh/BDWIBvOXtSThGtaq0vP8K/au3LkoJWzFddlOkdNy2+WKofK6gls7pjN39TBFHxSO1IU2cSmJioxpC0Rq0JgOP46Lfp9kD/YPW2qKuX7eF8Zmovu7Pf75+AuhNu1asvXkASxFhLDINek0FI1gmTcBZ5W6ptlsda5SyFuV5ubR0tXHw/igVibiyb37KGsM5Q5JFbev6jJm3KMwdTFhWGc+PDYUjk42t61O+7MKB4X0/XSSC4PCx1nMU2laLk2DtXk0SceVOWt6Wj1OlqtsYQPHxkVFlO2DBgT0FdYZB+UF7mOLCVZx1xJEgh8cpn/O/bmBqBhlbOtVGR1z8xKwAd8d6o X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR07MB432; 23:FdqkSSDKP2TgCa5T4NjvnUalOWT4LXPsJ6PrB15+uQ?= =?us-ascii?Q?Yjow9liX072wa8nQh3tmT4OJQVt0FPd120RLg1F75DKLCE6Hr8s+QRY+lDhF?= =?us-ascii?Q?rJywzLsXQI16rg7Rvp96QpHRjzhvceAJggmnTTBHMx2CaZtJttHtIocPKwd4?= =?us-ascii?Q?DeWWW+YLo0H4U6QxZwJDKWZ7bazDxYgltWk6j9pP4TMUxeBG6BlC7mEVDYKs?= =?us-ascii?Q?v+JRMYI+Hb4/f6aSSMXLA/nxE6ncBVIy7ddoIx1I8t2oMhQzhDKprB5deYFw?= =?us-ascii?Q?HFR7fJ9mHmDxHWuQuopzhdUG+/LIXDAD0aHFDbIaph0YngCqYLRn5dNhWbJz?= =?us-ascii?Q?6Qzvc0oC07LgrDEPpjTkX4LeKlizF239sUfoipl9xgdc5IqX2yk64/Rv6u9e?= =?us-ascii?Q?UIXvL15UksXVaaCqYq7u+k1s1HPFl0QFixEfeK4wYNqW4/f05gPxSwuDg90l?= =?us-ascii?Q?RBqabYGSbQStq/6SHPGGIyXbvp3qTOglajGgb9Cy2AvMMlTRhBIX7B/+wBJq?= =?us-ascii?Q?2jdO8QgRB+2wUIZU0IqlMjZHD8QspyhhKcIAkFOLcc/hNDr6M6Awc5wTESw1?= =?us-ascii?Q?3qVjWj2uSsq12cD2m7hWYhvmFzGd2BS4pem04RDi5g7q8BSZKhG358Fl0VwJ?= =?us-ascii?Q?kLXGEruLRaONk1/klzMmRNs+siXkArot2qVcr5MuUob7utLsvFjBEGzHKBLk?= =?us-ascii?Q?h26J4wEf3kwLG7aaAGRimb8eHrdaMK0knEdwlp+P5daqRueqJVNdr6J/Cpuz?= =?us-ascii?Q?Mer72FabXSbtM2lYOH9e/ToIbjHkdMs/PO3F8Jn1/xt9OKJ5gXc0sxqqBwRe?= =?us-ascii?Q?34yJ7Gt83Eer8ns0rVyJTPEbvO9vU3sm+1n/mjbLvfEMlRn3Rsxex+CrDWAt?= =?us-ascii?Q?uFQ+WFYBUWC6boOLhyN1T98TFmZRRl2ronradTuNQAvB/OTd+k8GBRCzd+R5?= =?us-ascii?Q?nUH/Jib46qpkPYrMblpH6D/rKcMqe2BkTZZaCJV0JXqT4+RG45PQVyVZ+KRc?= =?us-ascii?Q?RhxVDWIyVBYnHcN+B5c9WNQOW+V5+KqcIeZ5Bj5c1xwTpi7yiyaDcqEeH8qv?= =?us-ascii?Q?npSnMj384wKzpGyrQ3gnxvcFyk?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 6:AVC5oHSOaFYRzgImf87amFawhLmSiQ6SPNfus8B4kI+wnXdhSAbG3GBelSsuf4ZOJFeE/jPuUPApnNBn88kntws4WoeTHhHSIVO4VuEk16ZNPbvXNybiPYgR51rTop+niksLbj3WL4qXleBgQh8CwOjflCded6jDW17TWqTFcPWodyVIAy9scz+ifJVpNnGq8T2IF3ezAjpWIHFxzXyens2XUxi/RfwMNLfbnfSWF3aJkNx6NmkiaWfIDrSXbWHyMvIg1v0P1nk/xFSDS9nkFnIK4JiyJvrcE09TVGpyyO+VDuCi0kFSw0j4tgANqOdgsHCK0wH+UAmxlrZttuPzOeQbOcmHNp2RTLYZYdME9fSObxzXq41J78y8lOiFCKA55IfOubTwEZaznUMS4VrN0IIjjTDQ3DeABBqgFNbJvqTSTor0mhoZACEomOhOaXWwgqsK0ovJykSh5i1dXdoQC3qwR7CsxLQA04UXsgyGzHa7EOfm/y+T0QEKqKTUIW6mV/c1J+KnogVkqtf/d/QpgA==; 5:KGsFpmRVajvGK94L6d2DPORkQqlF/SJSYNufML7/DLceImXCjxpzYYSnsIZoGJUqChG5SSFzOzbzKYqv8FPDSU6Ci+4QjuGFqVAicWJlvCDQGNO8zCe7ZH0VIpkqH/48RWbTOu1T2u3ZW1/EDyWV4A==; 24:eSnz9glef6lYGQPTTgXkVyt7e5GYd4soiGPnlxCpsdk0VNrwKdEtGzTMMXUx4bggNfms0yXYFcyMKLOFV4G3VIhODPP8feUC0KzC64MO+j4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 7:Ozw/V/Tba4Rv4wJl0awqyyDMHgrIZKQYbtr7t4/JtrCpsgZMfrAS0FVqyfC/fvyxQh7D01FSPqgYoT0QmNEJ99QU/kng0PwVoE9oiRNsgZbdoK9h/jij0T1Vg+/EGjUZwbxOo/3OqFpyZ8tQxw4oGRMeIw6jdas6eceYb7d05rF0N7LAjjD9lAppMHxi/SdhvC3Duze/ijGRQP2yejSKlzc7t1u635+f/VzhNT/Lg26AZKwtJKYbgYkD0almAUAUxa3WSI8ytfnkPo40yRnuv2bmRzw4E+sZpasq/1fY3hGkYZAOiOS6WR3TLM1lgL7pBfZgFwIvPq8SGZwghmbSMw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 21:54:11.9324 (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: DM2PR07MB432 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 Convert 32bit LUN field to 64bit LUN. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Acked-by: Nicholas Bellinger --- drivers/scsi/qla2xxx/qla_target.c | 30 +++++++++++++----------------- drivers/scsi/qla2xxx/qla_target.h | 4 ++-- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index a2e17a5794ab..d6ad8d711e4c 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( @@ -1851,17 +1851,13 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, struct se_session *se_sess = sess->se_sess; struct qla_tgt_mgmt_cmd *mcmd; 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; } @@ -1900,7 +1896,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 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, 0, mcmd->tmr_func, abts->exchange_addr_to_abort); if (rc != 0) { ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052, @@ -4334,13 +4330,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 +4343,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 +4367,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 +4383,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 +5873,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 +5909,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 d64420251194..dadd9c81bd1d 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 *); @@ -885,7 +885,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 07f8ad001bcb..871a75ffc3a8 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;