From patchwork Fri Mar 31 21:37:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9657305 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 02724601D2 for ; Fri, 31 Mar 2017 21:37:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E799728697 for ; Fri, 31 Mar 2017 21:37:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBDFF286A4; Fri, 31 Mar 2017 21:37: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 1D26828697 for ; Fri, 31 Mar 2017 21:37:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755284AbdCaVh3 (ORCPT ); Fri, 31 Mar 2017 17:37:29 -0400 Received: from mail-co1nam03on0083.outbound.protection.outlook.com ([104.47.40.83]:54461 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755199AbdCaVh2 (ORCPT ); Fri, 31 Mar 2017 17:37:28 -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=abALRbzHz1KTqqznxnI7Y0qnSnHDY9TjHSBgAOx3mYY=; b=XvAyHwqof1j2yax6Ik4WwhCb1oztyAu7xZHou5oqq8YScdad8ZhKR1RC8P5UK5gKwbBhK4iKfuq+r28ea4FzzQKMP5lVKahNXte3kZs3BEFuDF6XC1vsjBGZ4KEkhzPotE8Ul231wluiQ/Y9LGSXHDku6bkLAfKhLnfnbg8oB6s= Received: from CO2PR07CA0006.namprd07.prod.outlook.com (10.141.194.144) by SN1PR0701MB2095.namprd07.prod.outlook.com (10.163.132.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Fri, 31 Mar 2017 21:37:25 +0000 Received: from BN1AFFO11FD005.protection.gbl (2a01:111:f400:7c10::168) by CO2PR07CA0006.outlook.office365.com (2a01:111:e400:1414::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Fri, 31 Mar 2017 21:37:25 +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 BN1AFFO11FD005.mail.protection.outlook.com (10.58.52.65) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1005.5 via Frontend Transport; Fri, 31 Mar 2017 21:37:24 +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.309.2; Fri, 31 Mar 2017 14:37:19 -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 v2VLb5bi005616; Fri, 31 Mar 2017 14:37:05 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v2VLb5WM005615; Fri, 31 Mar 2017 14:37:05 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx. Date: Fri, 31 Mar 2017 14:37:03 -0700 Message-ID: <20170331213704.5577-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170331213704.5577-1-himanshu.madhani@cavium.com> References: <20170331213704.5577-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)(39450400003)(39840400002)(39400400002)(39410400002)(39850400002)(2980300002)(428002)(199003)(189002)(9170700003)(8936002)(33646002)(50226002)(47776003)(50466002)(48376002)(81166006)(1076002)(2906002)(8676002)(101416001)(50986999)(76176999)(80596001)(106466001)(105586002)(42186005)(356003)(305945005)(189998001)(36756003)(5003940100001)(5660300001)(54906002)(38730400002)(2950100002)(4326008)(87636002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB2095; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD005; 1:pe/WEmdiYtQIsn40hyx8Zp4GIT7LnORs8xnn6iQ7NcERHy/cf2vKwwsvbEVJ5GYTXGbXdnRExDZTjoQvQTeriz3Ln+mF/B3Ev3QYow65yXMrR4RjSO75CstpxQ/6dZ4I+/RMji5eySBodX2T5XovvojfFar+5JrCvYxWF6qmUJo8lcjUfFUFUTXn9XvHk3yjFvUL8mH34eovTSqM0Aaz3TSp563v94aijSGvDNLy0f72yLZmzN6LWA5IxEGGLJ/ZnNOsvbEVJyH67qJG6xRTuZShVxXRaheAN7/HtabWQKpmh5zHqZFEFZZWncn+vPnz0E5kyZZG8e7QPxkiFL+Ea/B58SaEnprtpYAh8OWgA+1wrkszbIHvuzSmyf2eMI3vMQ1iC0U0wWVzAGyiO/EZMUbqAJSLJ7XhgtBkMWYPUXuvnaaGUFkgZ3IyeHCv6xjwd5iAarE2HvmW27VzoAepnjrNfzH7dlQ4RKlzHw9mA7M9DGBAaH6vXnY/MDfcoXFtZxMnHzkDI7wOmp6vQkcyaZ0I9tG04ZxjX8lKEK1x8rA= X-MS-Office365-Filtering-Correlation-Id: 11199167-597e-4e81-e405-08d4787e1f08 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:SN1PR0701MB2095; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 3:358nmjtw5j592nk78M0Rl7wZpwbfpr4uLphRsMS1k0eg1u0ErZl8O1hhyBbfDBzw65893hT3NdfG+Be7ItWvunmdAtZfPODkm9ITJNa6pQL6N5dMqbFBPHXj0lJKC3tsc8EaESObxeenXw7SUPQEqeuielFUhLuYt70dOjH47qcYVgkFGxBXVWsvDsGmRvBbMDdKAeoyReaXFGN7cGXIgvcWhh5FDMemTMeVnpZ72u7iSa01xJh0KQv/tUvFH6jkd7NNC7Q3d9Dz3GoyJ7iGfV5fuHtBwvVkw0Dek3YIoPAnruFLlVSxnnJLqqP/2aYBzs+csWVTIldFv4xfJU1+z1/TiEPZgKbygMftpZQlmVvW/ow0jVNTonaqsNpdzYSOWhlYduJIhy233Wa2WLVWS7e9hCMFDpwNEUkfGuVJCmFS39zYHgYLWeSG3UPJjGzchAG/QuvJnQs3inqYcf9vhQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 25:9u7V6GlHlyYwBNLQdP75tNNvSnbp4MHaUA5Lq84msOH8drSdid6oZbXChRQiM4NMV6rUJhp3yL0CVIxU2BBBcGhjFx9et0HA1kZm4HEf0Dk6SO5udcs6lf1qe/LRQKGvkoLrrMeoG+eCji2oWWAPyQtqsmA4EJI+rYsbk6jmmvw8lQQWTY5bNkMSWKp/U0jp4VYcZwmfaxbTrpc/jzfOUO6BNT0hGEuvcjHoUZGgfjSmj5QLuNGv9OEWZhWnndHimWHa+KO2idTc9XC7V4I2N4DnaRDdg/uKrlLv1xombkqzCoxW7w5/N7lMAkTZvIDIIQS2Xx10K//0qXrYzZRCVNX+yOTc3IPcc79P+Tz1RsCWKnIK7Dh3Bt+Q8puqkgQOfo1+JBLeU6QeQVYk1GBKIUQqoAxEDX18xnIeH0b4Q0kLKGpyvEWc6eu3k94O9bI2CjmifPiH4LfPZnjjzfMYhQ==; 31:w5wQOJbR29VUYtfqArWc81oUFPRL++FddCxajEqDrvKVsMEFqTWlSS9tCM50/4tpAU8gA5jACnXjdOeNFzLkviIjCvvfkP0JnheslDd1SNX26gpzU5qj2q8VNCq1+h3Fns2VblUnRFnNujNlFHFGoiZHJuzhQXh/q5bBvFbB6WpO63bt0wtg8ro5gi9CtZujo2PbbYtjre1gXkwtUMCPasqRZ3TEMCTpS/WDBWZ4IyRCusWOMp2ssLZvvph1SBmTmGta98gIjO6SdP/4rmW8sQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 20:GpxAgRUV6LKgJzMOOdafLoRTuxSyoIUhLUYHbaV58prGvnZz02qavfeKfiueB/g1V++kD4HYveGGNSbfsTxk6pjcFxqPpguJ6BLaVYY+cHm7bYBnmREaDmmqKJuyfKqNlfuhLxmubzm7TolMgiPPu3Jhy0KSEWHyUeR6Zy8xtHh485pkaoNGQSY7TClgYwE0fIsAZxTw59Os3j4HXsXpmfqqQ6TGjMUX37TVoqh6vicsogoXyfjLpEdyiZSAbAxvU1AcRZCZZOunr5VvnaANevArgD/fKPwXVvTtiRYZncZb1ZAEbppbo0uXtD8F9fs/8gkoeEowWT9AqaF+3c2n22kVCr3RaVzOZCobU7p0Cj5ERyL72b0bCeHOTRd6k2U2nWZjS4hja4QXQNePA1k8o8tqJdHlhKf9ci8f5nNb+BpRghaEeI16F6ydJBiOMUTdQfsylaOKYkj2G46J5GCaRtCDW9LT9RAnfUSuZvXhqUdWro1hm4O5SeXMjwH5FI0/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13018025)(13023025)(13024025)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:SN1PR0701MB2095; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0701MB2095; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 4:D51FbfZrdg6ZR6GtlpxyfDE1dLgtzsORDD61UzFxOXv03Z0Ypje0reLHcrBwEJeHYhimZtX/4uvOHPWQfdRznWYwwzDw+uLmDX9TMVHoVp/TG16qCX0TarbcXFXGN25Act16/0o+XQ/lXkRTHgy7xWO+bB7b32d8CyQm9iGfZtybNrzhp38qr46SKa69klbJXY3/UZuuFxuwtqJkj5vfwFasEYsnBBfIqIhN3lMhQkVOO1+3zUYKZ2E7s6rqdlxJQsrO3U2g6jNGYAWf3oq9lZnnKLpD10sq6f8y94M7f45uwpBYgliratseJMp/3HTVZJne7NOPhMMKVIC1jCcUg2/PhTDS9uDoBhM7K63GlITLoq6QOF7I3nsQjEF2VO45BC37C6ZaxQkOXEtEhPnUL1+tgTFnjI8hb+TdRstrGzxB+0GmYsmDXe5VcSjnSMDAFYBuB9Nb3P4dqzV8LhlZjnYryusHuCGNLXCl0ZFfNSMfAhWPAnhqT4O83xzdah2O1UGFxGHTQJdIhh6mj6AiV4rNXB4wv/rNoKGRBYQ0kEhITNEUSlps6SZrV5hkPgjhb/RnTih3F2lURk7vmUokf8bRcyZ17JQmYMeZY3l5ZjFxjV09yiDrOf58km1yZ6itsmjsM02McXvP7BmN5Pt4nRDLC6VhRsa4AVZggYGwytpJDPNWiDp9E85JAW/wHHm7bNzBqLgtvZKK96U7/LXjUjzQPAqNSgmzL5ErXatADSQ/3ajIDgWKBLTP5LKtFyvESMC4FYdaXr4y6tToIpx3bvaDBXfVjVoVkfagcFAAQVASpSy0AycswAhUKXR4LIR9A+QQspk/gurZr6lGtOz6uo8BgkSxGRMLzOdTBAL2x/s= X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0701MB2095; 23:22nsAdjE0iP6hvlHfJj9VKvXMeu0RBnvoA/BoLG?= =?us-ascii?Q?wVfXzxM4NmwD6IPuoVGu//g6C/ZfyqIAv5Ay+RNZRz7OgczS2GA8XFuVeEbG?= =?us-ascii?Q?JVv9GWTi3Gqj/LzlXg1L3UgmKEEdKnAX1fmkI300rsZ/+P8+RCfWISfTV+hj?= =?us-ascii?Q?DKS4HQGOiNlLwglUKw/M7AUw+t+a+0dPMESJd6e0t+DkSN16PElP3lOOppKd?= =?us-ascii?Q?vUPlwBBLw9eiR2fltlhtRsxkFjJ8DK3ysZex4Si19Y9Ar6pbQIb/a9Ky+Gpp?= =?us-ascii?Q?uWM0GkVtCfsIGFroAIc2eS4ZTaJxB8/QdPWYCfS/5U8EG4Tc0qhuHvBgzieO?= =?us-ascii?Q?DkXuvuhR3P02lfVvX6LiAcYGG0BBSPlAwH9PCFMy2SVYXZNVOGvPdVbXJ9v3?= =?us-ascii?Q?t1dEwdVPbKQZ57OBR3PgHVsrQHJWtl9Qjze9Sju1K2fS+goNhcEJIFAO2q4K?= =?us-ascii?Q?LFLrphf+sVilHjcLLuY2V8OxZMJ4DieE7Oyh5pUj1Vt7zu7NUv/6GhGyaFaW?= =?us-ascii?Q?tUc19OC2n7TCdBfQbR5oOzyuNbNrDiVZvSQTDnLenJ5TkdRoJMFVgBvw+UYb?= =?us-ascii?Q?nIuCsmJs++NfaQrx5nRdV5Ct9VoK4cjdwWMk1Qcx3oKwywUTyM2tjzwUFbvt?= =?us-ascii?Q?hC8joP9STYyNtxlH4uIazw0PEYWZzAiHiTycyfzRmD/3TmjMuQtJ0M8fCkH3?= =?us-ascii?Q?w3mAETb7F8yOpJBhMUNMGjY0j8/ckntheiUgBkvj25hmLNea3gVKrQWb7uZM?= =?us-ascii?Q?CWX6O1AbDx6qXYnzI8Nhc6kQtmPVI2clTJYH818bfL8F8boRj8oHPq1NlCRw?= =?us-ascii?Q?L3HG4uHGYf3u9ycqvkN0fHlCEmHqM8drbr3hMQd+VnEgHf2iNq9hK5QYR9/k?= =?us-ascii?Q?qcaY7h1Un+is08aDq/g2kygazoq+7RgZIVxNdH8eo38jt4NQR26UQU6PlXZo?= =?us-ascii?Q?bccI4CENjl2Ml3y5wcIpOVKn+VcrvlPyx1Sp4MH0nwfhFb2oDQJIR5vnW+wW?= =?us-ascii?Q?oLDSGUqxg3vxsjywxFxmUca0t?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 6:cC9bWzmJb5zs5KV0x4l/QYCU67b7r+IAX5QyEhkQCOvLSaXfzqws42iBdk6LGmBQYGN64HeeERQDxlx/Oza1sar9on6j22k27g5tzQLulmWUIURfGk4Vz7W9RvI7Tj4k/j1fmvQlN6se0j1F8/ktOWUqPHa4n/iDg3KqWZCkJbywCA4O0KPIMZoN+Ezo3XOEkSbRG4aMW+TblhxFXT5PVj9suNei5D1netA1aCHBH8v8nsaNDDo1U8TgcKJICsjoNnl3xDfRF/Y8saCzHPswwyNJM5GkcEBLjnbNnalR2LdGo215AHYSURNLpe9HcEC1WWEaTSGA8uyy3+CsMK6xyC2AhPAZm6u4WQj0Z+8sDbivQ18awmUnFZx844lMC/oI03PWb52mYcWGwSI/owye6A==; 5:XDlXWiJ3zZjHwZnJY8ks6N89n4TxJXwjygaz+iwf0rrfCX4eNQGH1mOJ0hOpLLPCE+FPO3pPkddiDfQSE0QNwPkAUVgyIWMKhTZiLRCLSRFIsKl+q2SC/HrUEhrxXP6iJ2b1by0k/qygT/Dt0zeP2Q==; 24:WNEUUe/ISKzBkBX1E6dRMLuoD11WIbe1QV4mrrdk7WgrOi6sLba6BXSRYGbBHVdDS4S89YHJystrpu7BZjKgscvqkxppNoCcBHRuPdylHWw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 7:xEXhWjXTpcAj0i8nHTzg2p6uIvo1ILVqCs86f04vnkyfPLVnebJW4wVWGSXntCSlbSyz92taV4ByPWXYYKSr0Ch+9Fep7wQahk6XEvHg2NGa+LoamZM24SYaZsHP3aDDlME0QS0JrStkWUPvVERbQV+N35BEGp+CvDhzMtSMoI/FYQDisyNZUYKK/0I8w3C/MrjkkmsAdfK+M84BJs+KHiYPORpi4rj1288ECAx4bzPsR76ZYMvrdLQlhUMLnzPd7kgJC5+Z8SphVliSxYrHxqRkki/7QZu54IJzqmKdhGjO/q4VVq1dsT62KC+1WvdjACVI+D/GwncD6Je8LUPTww== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 21:37:24.4539 (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: SN1PR0701MB2095 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: Sawan Chandak Add fix to read correct register value for ISP82xx, during check for register disconnect.ISP82xx has different base register. Fixes: a465537ad1a4 ("qla2xxx: Disable the adapter and skip error recovery in case of register disconnect") Signed-off-by: Sawan Chandak Signed-off-by: Himanshu Madhani Cc: --- drivers/scsi/qla2xxx/qla_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3e7011757c82..83d61d2142e9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1160,8 +1160,13 @@ static inline uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) { struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; + struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82; - return ((RD_REG_DWORD(®->host_status)) == ISP_REG_DISCONNECT); + if (IS_P3P_TYPE(ha)) + return ((RD_REG_DWORD(®82->host_int)) == ISP_REG_DISCONNECT); + else + return ((RD_REG_DWORD(®->host_status)) == + ISP_REG_DISCONNECT); } /**************************************************************************