From patchwork Thu Feb 1 18:33:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10195859 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 B2AA260362 for ; Thu, 1 Feb 2018 18:35:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAE9526E97 for ; Thu, 1 Feb 2018 18:35:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A96A828A31; Thu, 1 Feb 2018 18:35:30 +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 DAC9A287B6 for ; Thu, 1 Feb 2018 18:35:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752292AbeBASdj (ORCPT ); Thu, 1 Feb 2018 13:33:39 -0500 Received: from mail-bn3nam01on0061.outbound.protection.outlook.com ([104.47.33.61]:41024 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751567AbeBASdi (ORCPT ); Thu, 1 Feb 2018 13:33:38 -0500 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=OUIQdU1Gtqw6Ipfl0Kvw6Z7xUtQetoUHPMFEMNbNffk=; b=ImJqsQ2fcoRUA/PqjqcWTOFiLAp32Bczewj+o6iYanqQuG1iEjEsRja0CBSMQYivOoAs6HL9Q3gGEBe6yktkW6747c/hh9+vp6i2574rM6jh8Jhy9mPTMXKIDB5TOUjTAgHz/g1itzVrIFNlraFW3bmEEfLrL6YmSgApnSVOSAM= Received: from CO2PR07CA0073.namprd07.prod.outlook.com (2603:10b6:100::41) by DM5PR0701MB3814.namprd07.prod.outlook.com (2603:10b6:4:7f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Thu, 1 Feb 2018 18:33:36 +0000 Received: from BN1BFFO11FD009.protection.gbl (2a01:111:f400:7c10::1:182) by CO2PR07CA0073.outlook.office365.com (2603:10b6:100::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.464.11 via Frontend Transport; Thu, 1 Feb 2018 18:33:36 +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 BN1BFFO11FD009.mail.protection.outlook.com (10.58.144.72) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.444.13 via Frontend Transport; Thu, 1 Feb 2018 18:33:34 +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; Thu, 1 Feb 2018 10:33:19 -0800 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 w11IXIjI000633; Thu, 1 Feb 2018 10:33:18 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w11IXIEl000632; Thu, 1 Feb 2018 10:33:18 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 2/2] qla2xxx: Fix incorrect handle for abort IOCB Date: Thu, 1 Feb 2018 10:33:18 -0800 Message-ID: <20180201183318.587-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180201183318.587-1-himanshu.madhani@cavium.com> References: <20180201183318.587-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)(346002)(396003)(376002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(356003)(26005)(76176011)(305945005)(36756003)(85426001)(81156014)(5660300001)(16586007)(54906003)(42186006)(86362001)(110136005)(8676002)(81166006)(51416003)(2950100002)(316002)(4326008)(48376002)(1076002)(87636003)(47776003)(72206003)(2906002)(105606002)(336011)(186003)(50466002)(80596001)(50226002)(478600001)(8936002)(106466001)(69596002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3814; 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; BN1BFFO11FD009; 1:toJArMbdLA6LNW5J89RjeYsb0AOsC1iCWyyBSee6Ew+iEX6gv4lAdxrUQkvOd7z/imTM/6BbTodCDENVnF9k09NESY4o5mlrLomJ3HygS+w0tmuF+gFvOStxALKxpsV2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9fce0eb7-c721-49f1-eedb-08d569a24e0b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:DM5PR0701MB3814; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3814; 3:syoVTo+oDKKc2K5h2Ia5VCnzaYE/G544Msv5MRQq2PK4OiIQnXw+OCkRPsSVFjR82XVIQ96BHTolJVyARhBnpHQJN8lZNkaBMDs+EnT3HhMWsAEqxi8jOoj9sMqqPfsDWBGbsNVDuEtB7+3vuKcGedv6Z48AHrk46u91Pabvjolgcq5jIa4B7hGuN2T68TueSbGPGEMaPBiBYH/Yh9wLt8xJ9UbQDFL6xO8Gw2aF27C6KFjlParsELVi/9nehE05wavcVWUR2OiWJJYz1IZ4QGpkuHwqrPWwdAqES8zYyIKCXCGYgQARLTKwyD9tevxgvoiczMcOpqosi+TQ7UU40rK/5e1i+y55326YTiakuF0=; 25:CcxFZ1OATgCMJ82R4Ur3Ek67OAKmJYC/1DJXN7E7Bon0xNlTPij/jCurDIkpykqd52kNV3X61RcBHaHGrG4hVvf1NAAJuO5WjJdLhNRRx9XulDqJiycmSS9gNmUJu5glKOcsMbpaFMSrBjW7qXKtT1f9Frg8RJERI5xCiQBQaVDxVoJcp79wmOH1cTwebKhCw7nCajthbpsXtV1tkpABhev6r7K+hSaZMXoeWleMLkl9xl6AOPzYnSbFO+vpdx9etVWYwOpr0AG3+fyE/yctOLaQW6cvcQxM+5zBf+rd+qSK61gL7pvfmfpi/Xr3MbTxXztVA1St3TtBO5ZOx1hs8Q== X-MS-TrafficTypeDiagnostic: DM5PR0701MB3814: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3814; 31:Gvxp4jX0RaouDHxvAbe44MyTHr3jhb6k07rYOzro1THEo684BQFBrTxuld99JZKIpbeSeWjFRiqa7QGO79S5Naf9oTYBeMtKn7Whnal+8OaHBTXc0IOl9uxRM9Qpn1aD9kf0nZ5MCc/vRMMZtHDEiZ3NVzALcSsQkqp/PE6EYIGNokSE94TbUHTzj+2wct7CfoFFn2KXuy3rLb2XeButYQ54juRp/M7IWHirgzxT+Sg=; 20:5Gg3zdqOBYZIlC63Z2xVaPSg18Qit9Nx6yIL0a8f8bWAP+/9tdxluaW3gPEvHRBidOQdB9w5kw3NTe9jUjV8lIitwkTmlUTcq03Hlw/9YHx62Vd54CjcWVCwD6SvUxKa0vigW46Emr+MCZztHuvFDegDsp/Mh9QoSAlBG8eo6dShbns7rj5RZjaGWJpTv4bjkztXzeXxjvBgjzWhon0mcHKeVd7yFWlX+XmwhQJ/kK0J6pSSmaPZAgDQPeCQyX+ORFt7DXZqeXkp3KtN73hbyKLXLXwht21mH4QF4i8BjOmd++yO9n5b2XCTgc4xd1l5WpyTeJjNEEP8jnOfSLPkNQ8v8OKpcQKvahvQxBDqxJN+NJOc4NtvfEbwwx6HVaU+FnkuQuUVp69rCBVqYXCXx6WEdJoJgPkpK8bbYTxT/CxaKo9r7wmxDKdjXZsTjFqnt6ZKuVM4JTDf19csGjmkJVucBdPv2xlArWDN2ei8hptJENijlOxPs86vMW2Ahb31 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231101)(2400082)(944501161)(3002001)(10201501046)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR0701MB3814; BCL:0; PCL:0; RULEID:; SRVR:DM5PR0701MB3814; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3814; 4:uQUn0kbYnXUoAEWdOXvJwyb6L9I7btgXc1zbpiTJS9TK3rLKDq+Gc7Pt33AMZu7PruBZCGHawLNEn+c4Z862fGy3D8CSEcK+Zu3eieJuXgO8hev+AqR0he9mKCxSCb2P6/GWwAdfcFBrYO4UCZPC71/Bd+nCi8VnzzgtDeyasePnr7c/5Axar7d6+IBJ2xyHRs3tRNpVQCLHiJppldrWOwxKMad9SpGR9O5IOsXKZnqo8QyzfUM3B44LCl3VQIp8WJdTcRFao5uoCGKtdqa/+w== X-Forefront-PRVS: 0570F1F193 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR0701MB3814; 23:CJ2VN4iUhK4Z1KxvjxEtrafUZA4feWU2Eo+zFOd?= =?us-ascii?Q?etqRsjCAV9ESlNmsnBzfclWo7JpYaE5QRR41YrgF9Dww1QlSNvBvgp5L4ui2?= =?us-ascii?Q?+nTuPrW/UwqyMDXHbXl4HwX/YCgfKfaEt2a4MvRrUBV+MTCxlCu4PIdUuxmd?= =?us-ascii?Q?Y5ytbcMsru6y5fSzJFUUVt3z8DkI3WvMpZsuWv5WZ7SiAwQQqbTnUL2uh7WP?= =?us-ascii?Q?TRq2E03b8vNA0uAX3beHlko7fbxs8yda5cBirW5zW8OuUYijcr1mxPZYJeRA?= =?us-ascii?Q?4ayDGgXxWGX5jkNo22mJ0jaYy6ECaNz4d/yiQuwTZLWlskd2D89mYh/ETykY?= =?us-ascii?Q?uDtAk+2P7xYlYq8u+7el2WKWddyK6HBQ111HpIvhQm5Ce5eENqdJ6+kZm9TW?= =?us-ascii?Q?zKHXVanVERVocXXY2CuyOvV1hMykN9FffbP7cCLObVixbWlJ2YPU7BGGNFsg?= =?us-ascii?Q?0hBeK9bJW2Z+qT58oo63zlodZkvTeFGA1Xb++KbjlG1+Fkht/GuObnnOOIcl?= =?us-ascii?Q?VAl1KpLVMDSgec63zEizOl/k7gzj3sSJ0yewzN2LwQ8pM2q97sfKzRG3UjdB?= =?us-ascii?Q?oa4XfpVb6zelftf704nOcWKLV0VtBb4+eHLM4oFitpFyZZpqNkESppE1DtHF?= =?us-ascii?Q?f+7iy4UXe2H0A8ORgee9tKAOJWQDwpqBBEOWnNhdT+WV+wZrDziw92vgJQF2?= =?us-ascii?Q?wT8ZkMpP/MqncR0vXPLIPGpxIuEoOeez24+TIV+Q2PfwtR03HDp9VMmOFsZo?= =?us-ascii?Q?Tt+TQ0VhVBUgCUfyCs9QNuw5IF8oum/1of5GRCa/34F0nS67ArEmOBdet3Ou?= =?us-ascii?Q?FTLUoAVGw3amltGK2eCAcnrk0WeHWhKXLjsNfLNTGYvfzrWvm/HEVSNZXrk0?= =?us-ascii?Q?jCH8VA8K+EKokP1SKmZfSJRz8TyTvga0OTm1DaHAVadU2wOsY4OmtiXK9vLl?= =?us-ascii?Q?c/ysFt0hVG9UgWLUaJ3j0kUq1KE9BS5q3Wh1IomS2wslVneg93IYkOsd02ru?= =?us-ascii?Q?EayftdQwA4kO6UsKQXqnoGitNdLCZzA/A4vFgYPas0n45vF34Vedg4cqEFMv?= =?us-ascii?Q?tjDRytoIC3gTikxWTRtDSuKiJYXEE?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3814; 6:rTYYSubqBIlPtA0jSZ5OkIMEeWcYIPRGbJ05PFSwwFtapRTsNMnK9MlRwHKkk4FgBe7VAxdsNFZgf13X1cBkFnF1B+ZdeZx6bRJen2tmqf6NJq0o9XCjwyBnmeoFXKij955SEy6UynMm556TtVCdxWgzw7Cd5T1QpuQsgp0117KugHR47P43POKfw5jtCvrNoRk4PP5GhaGZdhonqLsBkoatyaK13mjRyF5bnQobNNPkqvFIXs9eNHVJugNtWR/rBCHHGr60PfShJbmKzhOzuJcO4fYaJMLh3sAQI6w5rua+iDjNbW/mqSxRFk85pmTnFhCgZ3yB5m+w0sqagItbiNcxuIb06iginO2/c81btVQ=; 5:24MrYd4eZX8b9gAO8mU5xMrLVwQz9BlefG2+/UiMmwsgq8RQG0z7N0Cpkq1t9CEQbMxhgWEG1rik4JSc2VWrYCocoH3RbHd0PK0FgKbM9ESKK/r2n3usQDnD1mvWLL1Ob0Jdhid7SxwZvDB2tg75K/N2CiRSCU48NxnMG2v7sZ0=; 24:a2m2yzgQt0oqFGOiv3qGcWaTSCnads9K/cCBoeHKx3WylX1vHRDnbOicIrWU30xtKR5vAe/AkZzJY1pNL7PUPpZUUhVDTpe2pOGwudheBbk=; 7:bQF2FndB2OXl7UqpNA0oMC8A7v2Ht20UMKTAjVh7Cadzr77bJ3GKtwKbTkKVBFqts8Wd604BjbYK1kkYfskps8kVRsrVc9CweJSfEAW7Py442HXtnTxQzlOo1kPgRf2JCItM/f+H5opWWImDN3NjwOp89Xi9XomSi3A51RipKrSyviMntVz/CtQ9J5otXqqZYjubpdO7xAqCFhUEA+PPC5Ia4sJlB/pX21M0XTz0he/WGEegOA5LOpqRTCCWi+Am SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2018 18:33:34.6428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9fce0eb7-c721-49f1-eedb-08d569a24e0b 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: DM5PR0701MB3814 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 This patch fixes incorrect handle used for abort IOCB. Fixes: b027a5ace443 ("scsi: qla2xxx: Fix queue ID for async abort with Multiqueue") Signed-off-by: Darren Trapp Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_iocb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 1b62e943ec49..8d00d559bd26 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -3275,12 +3275,11 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) memset(abt_iocb, 0, sizeof(struct abort_entry_24xx)); abt_iocb->entry_type = ABORT_IOCB_TYPE; abt_iocb->entry_count = 1; - abt_iocb->handle = - cpu_to_le32(MAKE_HANDLE(aio->u.abt.req_que_no, - aio->u.abt.cmd_hndl)); + abt_iocb->handle = cpu_to_le32(MAKE_HANDLE(req->id, sp->handle)); abt_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id); abt_iocb->handle_to_abort = - cpu_to_le32(MAKE_HANDLE(req->id, aio->u.abt.cmd_hndl)); + cpu_to_le32(MAKE_HANDLE(aio->u.abt.req_que_no, + aio->u.abt.cmd_hndl)); abt_iocb->port_id[0] = sp->fcport->d_id.b.al_pa; abt_iocb->port_id[1] = sp->fcport->d_id.b.area; abt_iocb->port_id[2] = sp->fcport->d_id.b.domain;