From patchwork Tue Dec 20 04:33:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9481085 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 E1F8760237 for ; Tue, 20 Dec 2016 04:34:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D628327DC2 for ; Tue, 20 Dec 2016 04:34:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAD06284A9; Tue, 20 Dec 2016 04:34:17 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 5521D27DC2 for ; Tue, 20 Dec 2016 04:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932892AbcLTEeQ (ORCPT ); Mon, 19 Dec 2016 23:34:16 -0500 Received: from mail-bn3nam01on0057.outbound.protection.outlook.com ([104.47.33.57]:45215 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932473AbcLTEeN (ORCPT ); Mon, 19 Dec 2016 23:34:13 -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=/Cektz4KwJqh6NeCR9y98PMFlfgtENk7+yFNUpzoZ5w=; b=mK2IHn/BVoyQ3k3ffGD0NeCdv1ruqvj/1yFlHBgRpJTed6huvnzUWvVwuoAyF3fjQ2vTjm8sVhchX096PTArwP3SbNMapgIEFhFWrL81zb3+/4y71BFQy7uk4xd2CzYT23Om5nP3Pn0Rdb8pWQgUP0D9x2kk4onqNst6fuPZUto= Received: from BY2PR07CA0093.namprd07.prod.outlook.com (10.166.107.46) by CY1PR0701MB2092.namprd07.prod.outlook.com (10.163.142.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Tue, 20 Dec 2016 04:34:11 +0000 Received: from BN1BFFO11FD046.protection.gbl (2a01:111:f400:7c10::1:145) by BY2PR07CA0093.outlook.office365.com (2a01:111:e400:7bff::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14 via Frontend Transport; Tue, 20 Dec 2016 04:34:10 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; linux-iscsi.org; dkim=none (message not signed) header.d=none; linux-iscsi.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 BN1BFFO11FD046.mail.protection.outlook.com (10.58.145.1) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.789.10 via Frontend Transport; Tue, 20 Dec 2016 04:34:10 +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; Mon, 19 Dec 2016 20:33:46 -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 uBK4XkPN012419; Mon, 19 Dec 2016 20:33:46 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBK4Xk2L012418; Mon, 19 Dec 2016 20:33:46 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH 08/10] qla2xxx: Reduce exess wait during chip reset Date: Mon, 19 Dec 2016 20:33:42 -0800 Message-ID: <1482208424-12358-9-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482208424-12358-1-git-send-email-himanshu.madhani@cavium.com> References: <1482208424-12358-1-git-send-email-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(2980300002)(428002)(199003)(189002)(86362001)(92566002)(5660300001)(305945005)(80596001)(2201001)(69596002)(2950100002)(189998001)(6666003)(5003940100001)(39060400001)(38730400001)(4001430100002)(626004)(4720700003)(47776003)(81156014)(81166006)(50986999)(76176999)(50466002)(8936002)(101416001)(36756003)(107886002)(33646002)(50226002)(5001770100001)(106466001)(105586002)(26826002)(356003)(4326007)(48376002)(2906002)(42186005)(8676002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB2092; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD046; 1:8GErUkAlpQgDqRA0qExXiar5pqQnSP2oPOAmlbvR/gm4C16yVhRRSnVT1pW+zCz1B6xqofbalS9GS3yRX5BuIi0VeFOr22iJF7muOXkyeXaYtUEulwSsw/TAjsHlEMCX+4dlKLsVIyP+8rrIc5eRv7BxKkgAIEUuzI59dq7dJ/TfoGBU2PYOeWONgo3J71tDAMOU/H9byoA6o+ZJSwiqVBvByBl44mnxjumsqbc6EWbYM0Ipqu+l2nshPNHpDAxYr5mHDKhyDG7qmdy4NKD0oAGgdP+XqDbx5+wDCkC2HXzu8sW6Lhhxm8NGmOwVzWxWYuCJqlfpvkrFQwA9OGuHD17nNsh3nXByyZH1qp7sC5oHlnsTs+UBazcpxIWeXGQHnW31e+j3Kw0KDTRqYwTwL5k3sh+ioCrIoME9BKuqirE22XmESMU+RaOKUejG94v/9IDJLUTwHgpcr/0tS4MKet1d/AepJE71i9pyxf6i8aINZbxlob2/Q/xFE6VS0Ci8PgpEzOvUahkmglnocS2gig== X-MS-Office365-Filtering-Correlation-Id: d0ca5fe1-90d7-4bb7-4cd4-08d4289171af X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0701MB2092; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 3:xXbY7Hkfb2katXOw2RfY6GOXtmcqb/waTKgm15ESOEO9BqobuBabu8rWZdZA7f+fnE9Wd9T6PSDBSCnVtSVbQ3cUm/o6ACV4t1d7v/iCr6v2pU8gwpV0U6Omk6fUocHHXSul06LpJgQ9Iv1wAGcXodA8YgRVY3xUM/WCwUOxkAU3WOF/Wc/6fh3xsDsxVZ68kV2ZYfs9LUwnoxAg52Qq68jls7CtdgEh+nKwR3naCqFuYtk5Wh2CU6Gad03sHJ9mFKfSaktEDYRR781tMM08lawkbDvFGSvAeI+kZTPISBBaKRdN21q6uNrDusSl0K7lZTBbxBtQTbVf0E/kO7daz1dyNv0iirXQPEin9syIN2bk5Xt84fkbV41xpTfyzeYr X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 25:4/CeenrmMbCJwmZpOqS0sUfA7IRKJwMIFjDoK0yNOdl5or/vU591K/xd0Kys0+XV6seh4z3CmPFBFc4A3eCu9z1KtfNsULUchSCFsSixUNypMO1UEyCOGsPaYC9Sp6sfRfWfbirNJqfgW+1/93OHyGXNUjn1ELtNYmm5mm5KV9ZSIog6K02d1oG1Yb+v9vl691Tj5WuBNhIT+boEMhfHFJNQkipB1acn+PzPPPj0AeGBU9LaHve3XCTPP2vGLGqXLiG7BhlnV5ih8zSq5m58UreHvn4eEGJDegnNYlheU9r1goAexG2jPtOQw/K3+4T/Ll7OsO2zVN/zS7/L3ws3Ey9RjxhbGnwL1Bjr09t3BysLIpvGrhbZLHtckHeF5D255xoSoMrLOnzF0E0ifJ5JmMfwclQKIAQ16YAjFqa8Di0maD3EFswnw5qRDyHkQVzaxeGQN8/hD8jzAFUD/xZ2/trTIM0SnPms96p9rfo48GjvB8aLI9qRzmcFE5fJ8a8G93GmooieK1pYdVb+QYzYX9GUpHXO0I8ixhMQHCU4gt2yCCFZJYoSi5DLXgc9aozFFiioLRs3lQ4ea8gacEtzrqgzO2FLsIXns/DYxe3tXyzmRNIuOa8GuEMQYiZObiJH3mouXgVzl/6sF/djnP6cpz5YcpXUGD0k5cYcKBXOtlFMySPyGhYzy8zEP50EDM37InDDOZIX9d+cjp7ACDzIt2iiUfFqs1yysY72GMmq5oMRBzmiMOZyCzygXdyR60xMTeR7hVFKIavPg24B2PLf80CeBzxYPwj2XNqCWZSXw1EQI7kp+WvCAEZiSDm2oANeRiMOWC1egf41rvxU+14631OJaSDiO2RHa/0ZJCxnWDU= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 31:MATo8yWZwffSUJmkeZJYz6j+9rtshY9DwZ7hGl7Vr+90/efQjo4BH5Zz+PWjhoOtvZ0wgv5wReGWFXQO25P+d3zOk0ztjvBg8rpwXGB3pZyfE6j7eAYCahjlTBuoOX+L66ieZE5ea2CGs7gFRdvLKeNb10Eokm3Z7fzLzLwf/+cHDgGaKS5kbPfO/GpgFaETnFheKG6QbK4D2XG0vPOy78sZ+E/A6tFV4NmxWG5PaYKKKIekgtL/AoWthspAgSuHt7V22sNBC7QjTFM3OK+OlQ==; 20:N6CKPfGIw69k2Zv1SF1CqLZsUB7hnjZ3vUDeVaqS5J37qwrq0/3WdJ/m+m6VYwZ76XG5EbHmz3SEh5Q7f6c495VvI4p5/7Shqhp2H2Vmmu21s+UJmWo+QvQx0Vn9jr9qvmcSeJpYhqgNyLjXQ0B1YrM/xFGN2zA7cS31KBwLvSwcLJZm8Qib+2aQk5kTC/ZkD0wUhCpmSLWvQKgsMpAZDwISkbuhbtlIpB3wEPyRc7x4OBq6yncoHX3LpQOynmPdk+eaeIQ2jGLToIHdh/jLY89aKdb6zMyy6Pdl5tnxgFUDc38ccp5+5veRPmOx1I/JmuKpb2SiB/8T2ou/69Pap0mgrOlTJLs7JdaLJi5qjZQMVRsMNW+P/lNEFKty7sB19/yzRWRscsz+bC/YBCFIJqrbFUWp9YC9nDcMDKeC5DE2LkLiugIACpgTcK5D1MJ84Ef4BoBWoSUqTGdJIfv0eHBcK50IF52MysOJlAtGT2GfYQsdCyAuOdzYQXs1Esbh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(13021025)(5005006)(13023025)(13013025)(3002001)(10201501046)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148); SRVR:CY1PR0701MB2092; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB2092; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 4:rL6zshyZOQ9QY/6AqSCfRjydMHS88WnNZP1CHIU1bPkN92e4mu29ZIyUB+5SXZpjcB3JEGeOv+GDu2Emg+cHNDmKe7J4e3zyNheaw8LJIqpoJlOnkSl8bFgm9l0HLSi/S9RJ7CztTOYl5LQdZkyae6+QtOdx9Mw3YKmehPMr/i8c91Ca51zmZ2tDB1Dj23hnfIeMb3hTxKVBx+s/JDAjmTyCN+Xn0xN7BbzHsuGJXYc93oSY27PtdIeOOOoAHFoq2np7HRU69gBC/cJkDy/sgS/oi5arXVaY5brYZv6UooIKaHWK9CVZlZ/zy4ezYSpkVGfH6K1Z4tiJXUJWyS1pEHj3A5C75Sh+GfMnI0QalazJ4xWuCorJLHdsvO9k6ISYxP5IJldLxsKedb+ju4zPBsgbUliFJjE/+XeauOEV37KK3w7EGPIl2mJnnNeVinGbgwquZQ5H7BHCmBKTY2lf1OLn4xr+stkCY5Kw/rJtZfYOF9/rXWtblCJOSEjyvUAT+Sg/yZFkRRrTDtxrN9f3dWXHBex+J1uI9Ng6aQcIKgDpa4nt+D4sjk4xb9d+iccaQnXTOdavl7E7sJ0/w0UMyEibdFNOuueu5CsUBCx8VgYbL6DQvq0N/Urm4/89sptO X-Forefront-PRVS: 0162ACCC24 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB2092; 23:ijMP5Wte+aQm9yC3fkyRXg1hU75TL/TuRznSwm2?= =?us-ascii?Q?g/lq8DxfSCGaCt32wTEZBtimyWTDpgt/X6265dhTVT+oYarSvv7t4ocnBjSU?= =?us-ascii?Q?pV+ldo/V6sWzw0olLP7gEAVxLK7sQpWNW+EUJot8STp66SWRoQiWNcPWSdt9?= =?us-ascii?Q?f2DeVSmNp3u7/h7zUfr+rLEhyPQ2plRuTBUsOW+iyaP1vHtSsq/25IPJSbox?= =?us-ascii?Q?/iWT8BQXY8kw5chNR0j5sxFm+497niJAJCg1/r99txjkKqfOd1jLLgmvE3Us?= =?us-ascii?Q?C4qrrDvLVayLrZqBF45xBYduaYaioIke/0PTkAoEpfKeuQ3S8XkqGnh7PnTL?= =?us-ascii?Q?xtNzVcVU2OwVxFdJhU2xYvjUk/UJxsD+AQU2dLQs48do3xE7ab1spKLxzqD0?= =?us-ascii?Q?8fmjFMWt5qby/r5L71no8lr4/fEK/MI4380S03D6IpDkAojaD9Y/7Bqo4jEJ?= =?us-ascii?Q?n73kt0cPzabr9V242vwZ81xtZuc/NFc9f27IU6ihIABzKxjhBFYHwQdRUj5P?= =?us-ascii?Q?nDSeh3aZJ7DqUve+iSY4hdD3xi5xBEykOU1Mjsv6Z6WbA25s5XXS7u7IQYK9?= =?us-ascii?Q?s7EZAiMIirFUepEvwYw2T68l/CnpEVXWHGwZz3oWDWDaCrLJXvuJvEnVOdTF?= =?us-ascii?Q?DU6Xr258d9yx4B4ynkug36sDuhI4fEOQWrzXcugfqV4LowRacBVb47QhKvqZ?= =?us-ascii?Q?yUMrO79IzPl1qkCLprDzUyV8slPPPOYZK8iy+Y3IK1i5cwW3cp2uIaiJ5U4p?= =?us-ascii?Q?6Lk+AeIBQbspeLNreDjQCkkWZHkUcyRetFuMXvsEMOnJEHm2OMr4uZltupgp?= =?us-ascii?Q?TQKJ0/f6ePvVJmbW/imu3adNPyWH5zL4X5SwSn66G2MLVfxS30B8H2MD1dHX?= =?us-ascii?Q?YeG+qv+nkUFYCGFlsOvB/4lIsavx90oeSfuVccSp1lb86GBGikjoMylnjB2N?= =?us-ascii?Q?hOcRVuYi4KjFC1JiKokU1+FoXv6rx/uYau3CASoqnREnc6WBl42vPVdRRYvy?= =?us-ascii?Q?WBKHrSDkvsDRrwI4CrpP+mLCCjnhEOy+cpqpZF4r85TyVvmb/xvbWuF4bBqV?= =?us-ascii?Q?dPJfhM3ySIEOT7JT+1xJOV8D+40I7DcFKfhB4WyWQTdMhr24dYlUJvjZi0QM?= =?us-ascii?Q?dExE1qMTo/9xJ7MosviqtVS5FezcGvuYH?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 6:ZxVEkKvxSFPU5l71pCKl0K4d5aKFIT4llgjVNxxd92E0Mz6hLnUisJFxDqMVdQkVtbVOgedrziRRBfYLVZ7RJagnCrIxYq4Aga7XEvWdozy+c4BpwLK+1d0KaPJcqKmgYTsihXlsJ+wG5vJpPYpMnp4aQGtZFaLtxmwt2/TdOLjdP33EAyBV2b15wg4YVDm+DNRvj8EsdvLuOFdjs/0hlttPeAoD/IUFsewJQkK7pKIQ+t0WJZnfgWOgpIck8JY1r88cL/T6KuV0OoobJ1uju9TutdDNc7m5niDVQRLpMuvkqK4i6yBYNsjCe1kwWZownVs1WavfEDySKNHMUcA1zkAPEtTwEFwXYO39gQTrczHG4AZqTIm7RuYtg08joIcNxK+H1PRjbYVsgAbZ7HigxmW2+U8ZgWqIPFyw3UYGcfU=; 5:aF0DDLr64z/RrsnfLK2YP90d+MSoosikUxupzZMLsbSx4FBgU5eBCt+0ZE8PbKayj8y2fxAgbhgPsGQ4h12gRNuDdq77z9+eErdfwnCmU0WBGLqIz7x9B3kheZqCcemUm6DVx2NDktIujAf5Wk+oPw==; 24:gtWZEYrD5UZFO/x0z4H6Thgg8GaDTycgwkKoYzS1OSAwXV3xDSAzVnxpvqArK99RGQnk3gD+jDBW1JfKsS2JILf1d+2RvfgK8uH7uII2FWM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2092; 7:XzX6EwUgpdA4K4PmDxVJe7ays+977OigbXzWTo1ZKTgz8QA2/rpxyk+Kvp6HZ1sfLuVMPzdvRpLdBvNhnk5RUCLzJQAswRF9G99coi06aSaskNfNofFgW3t5g6XC2OtoRR/w2a1RLHF28hprU2vNfW486me+pgEUTjUj+30GGf9JFOpkMdqBJbmw4NBScoaNkcNlnDNxwEK06iP6SpD/cDsWHEC2HKBm0kjrcs4C2W47d8r/RB6cxUtIEuQqhk0v2EqBFYeepYU8uozqIRT3zxNTWGoO/JCd9pl78TV7/z7HGcyfDUZ8736uAkriOf8rPXMaWvjARdR2z3Mp40SEWqqfcZIn+HgghuYW/sg4FEhmYUj6FHCTfVdoLGKf10suDVut8TsW3ubab1P7u5bG8sm+BakOnEdtK8T97zwy/p5UQoG13bNTXFtznNfUoSfmdSKtQzsnfSUy/KHdTtDEZQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2016 04:34:10.5177 (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: CY1PR0701MB2092 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 Soft reset and Risc reset should take 100uS to complete. This change pad the timeout up to 400uS, which should be plenty. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Reviewed-by: Christoph Hellwig --- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 632d5f3..7b6317c 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1191,7 +1191,7 @@ static int qla2x00_fabric_dev_login(scsi_qla_host_t *, fc_port_t *, /* Wait for soft-reset to complete. */ RD_REG_DWORD(®->ctrl_status); - for (cnt = 0; cnt < 6000000; cnt++) { + for (cnt = 0; cnt < 60; cnt++) { barrier(); if ((RD_REG_DWORD(®->ctrl_status) & CSRX_ISP_SOFT_RESET) == 0) @@ -1234,7 +1234,7 @@ static int qla2x00_fabric_dev_login(scsi_qla_host_t *, fc_port_t *, RD_REG_DWORD(®->hccr); RD_REG_WORD(®->mailbox0); - for (cnt = 6000000; RD_REG_WORD(®->mailbox0) != 0 && + for (cnt = 60; RD_REG_WORD(®->mailbox0) != 0 && rval == QLA_SUCCESS; cnt--) { barrier(); if (cnt)