From patchwork Wed Dec 21 21:57:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9483815 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 CE2AC601D2 for ; Wed, 21 Dec 2016 21:58:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C06EA28481 for ; Wed, 21 Dec 2016 21:58:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B549C28494; Wed, 21 Dec 2016 21:58:37 +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 5B59E28481 for ; Wed, 21 Dec 2016 21:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760073AbcLUV6f (ORCPT ); Wed, 21 Dec 2016 16:58:35 -0500 Received: from mail-bn3nam01on0065.outbound.protection.outlook.com ([104.47.33.65]:3284 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759680AbcLUV61 (ORCPT ); Wed, 21 Dec 2016 16:58:27 -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=OP+dzUmnROTQ1lmvdmUv85L0Rawa/nuJZItgBbegB31B8XHTe23W8AEl0jZXgjkVYr1BN1zyv7m/lD4SBguSSEc/0uMTqsqqxvejiaeWxpDxqkGsKUf3jXI+c9u/9Ap8ETK9yjkZOI8P44PUszBP+2yg3e7FzZCAppFMCMEWmlQ= Received: from BY2PR07CA061.namprd07.prod.outlook.com (10.141.251.36) by BLUPR0701MB2084.namprd07.prod.outlook.com (10.163.122.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Wed, 21 Dec 2016 21:58:24 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:160) by BY2PR07CA061.outlook.office365.com (2a01:111:e400:2c61::36) 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; Wed, 21 Dec 2016 21:58:23 +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 BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) 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; Wed, 21 Dec 2016 21:58:22 +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; Wed, 21 Dec 2016 13:58:09 -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 uBLLvtsR031140; Wed, 21 Dec 2016 13:57:55 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBLLvtpM031139; Wed, 21 Dec 2016 13:57:55 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH v2 08/10] qla2xxx: Reduce exess wait during chip reset Date: Wed, 21 Dec 2016 13:57:37 -0800 Message-ID: <1482357459-31079-9-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482357459-31079-1-git-send-email-himanshu.madhani@cavium.com> References: <1482357459-31079-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:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(2980300002)(428002)(189002)(199003)(39060400001)(356003)(106466001)(50986999)(48376002)(76176999)(50466002)(105586002)(50226002)(2950100002)(42186005)(6666003)(305945005)(101416001)(4720700003)(4001430100002)(626004)(5660300001)(92566002)(80596001)(69596002)(5003940100001)(38730400001)(5001770100001)(107886002)(36756003)(8936002)(189998001)(2201001)(81156014)(33646002)(81166006)(4326007)(47776003)(2906002)(8676002)(86362001)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB2084; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:RZYEo3QYMdq9/dxM7SMDKjqisSUrV5NDp5VoquigIEm4Sdg+nv8lwYCDDXa74lSnh3y46V/H/o1pmdDDRGi3DTrEnhl7rWn+MyI1xBMUcK5aZonymhiN0wyTOta22KJpbGDv0ZtbOzDN/eBGoI2qJhS5yjHPXa420QMjqvFkdErM8JY6hkw0ufozdGm4ikTvl15+966EmJMOEneolRqiYtaQ9d6VYuPMr/+w5eaDLdWdotZL3kR8XcL3tVZAqmu/yaDt+KlhkeI+qcVK7jAwCyqbugFjog5MIlpuFpMsk0WRNzWJdn2ZeJiuFf9EVHbsDuaXu3nzsobc4b6qVRguuKvRrN4Qt3p1mLFBvA3aFf8N43F+oBjtrId449KVw6BF+TWL4y2j0h3kanP6FVZSJ/NaHX2YtbbO4Z1beD25BFTX6ABAkCNNYsALXgIafGB33Md6gj7kPgiu6dYgR9xCb5lEviWMjDv+ALRX5evzoXRPUmIuvlWpEb9Zppe0JqePyWZur+8SItstDFMku1wklEnaOSfrR7aK4WjCs04mh8GDkWhrm/SJo+a0W0inWhT6 X-MS-Office365-Filtering-Correlation-Id: 7cdd3130-e905-4b60-cad5-08d429ec7bb4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BLUPR0701MB2084; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 3:zx2K+O1A8Win1koN9ASrW/HjI9VHAoLp+xX0t3kVPDTNKwtuMnHA/53Gj4j7jpL40SgNB+0fgMBkZ12CkEM9B6+kL3zBbQ/JwTdXY9Ik4t/QyU1IQY/htB0jnqpVcxsHSq5m3qhGt3Sf2jVusa5t1GTVlaT/hPheohjnonpaJjxXU0l55E7qDAf2ppTzqbgRrfoPSJfnH5KCbNi/4cdaLjgQdplEnTHpFD7esBYmgeCJ5eN5S4M64htmEsHEbNb3SixIJovx2NCVcZ0Q9BJLY7yTiOLh9OEX3Matu3D/EWfF9EgKxTleu0jL0QWnNQRwsN1vV2NhHDTS4MHAxSVq9sDMRflRCnyi+Xu/G4ZGs66Kc+0uv5WU32q/e5F8Xf1y X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 25:Iri4JaFqaJbb1gDhdSq8EsXFg29jDbCvD6Pxp1qMcBvrI8AWj3VFK9YdfyvuelMCyRHg+uSuW0EyBXixZW8/V1pXfX5ciy7+B3HJfGixv88xJueOB5DFW61NkuayyhpP25Y3S8yPl7RDr3Gs5zCOhLnKKCl38+RxyKI52OZ4ANoKPydzrzD2tzfLFUH+X9th4l0XtFulvrioB7jls7OXw8VpIC0XOace9i9ZfUTEU853gteJks+PHirl1N/nmU22r9vVsd53kiR9OA/F7+PUd0ZDUSau+xcdfJDlrH0hkSqCdH1DfYHs8hHe4cdkDz3rPHmN+Y/XFi4LjNQUIakKSEKxhOlXi3dcQ+jWqo/mvm9Xe55Xq6cKcWlQM1CzK0FMUsNt9Z8B9iHJ4yBMpW2nZ4YMVIphbDzgBdIsuesIf2AGyNZI/Soyh5iKFz+DVxY7jvOrGYB1l3hIgknhRijHJ6uoKaBwkfRBMxqxyq8htWD5yHDcW286XFWkUqwIEQjEaLON75dufUC3gr7u89wxuSMieZ4NgoBM9SyjdX8wje3Kr59hzm72/jE/xJiwtiQNFQPHyosCBqjLygxU9xkRxiZaWM8suM1rJqHso9pxHlcchtJ539/5rzt+B4pnZyZY1tEiGPzWpHo04vrKrB3UhdOc9xSlJMxzp4MkQzJpjVKkWCAzcLFU8R85fHgI+xtr9e4Fbyq1XYpVU5J4dq9rQ1X8x9VRNV5W9nL3Tuln3nVMlhGLwB/5FxhRwsymo1qE8gcSgTdg8L+kr45pfNb1G8z3WFKzYlg+wpQS6gIQjSit8KBNHOoev6MONImUZUQyTdvBbhRTnWktNgsOol0qHfrAdF32Aythp9l92yEqZ6o= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 31:/2h1bPJI8tZTbBnxkkFU1KnyM7dkHkK5fQmDNJYNeGM3gEoBs77efrt7PR0G1nUH0FDEIank7hyGMZomoVOswL7pFGQElkS8ssswB+U6oQlkwR00+VeYJLg9HgQHeJo/t/sVt8AAikOQVMfYe99bWkkM+MMbK9zLRR5RieosMih6PAi1ZD8xRwenUa6Ixmmird5wLcnR0Dr9AdNmtb3pj7HdIO0oHF9XNI+4VYrTnnynhgfSJ82I6HLCBYjnqLoUtzMypCfoUxM7x/Xb0VmddNEFnpCF7last6pUsgcyQS4=; 20:c6Bji6Ccl0frpw5mr82A5ccuvfRdR4AK7FyyyLW3Q6+g9fXlXo5oDVk13roiDtyxiO/zqbiDqjZoLcUZ1+2Bmmwp7OkXTXBsGAJT5TgPAeZxSHZ34UpVDBZ0h/bTPqu9tvT7y5cKRmYlbQ8mjyfLjfbYTYyP3abIBp5kvxqyZ7Cp1J9nQsgcXm9FZSu4enu4kv+Fvi6rWzac+8OeZxNJnUt9+chiM4H4GXjqveUl1f+UAZPgKXtRb1c7YLCtt+ULKmbJ9lUYM+v3sVIahSMXL70+cWS7ngwV607UebTJgX44Ocy8/rB0wImAh69qwPAUcgkS0y8zMB1qZGwN1oE9Mzsn5Sif1wVduOLTmJq7xE0khflLJTJnqnhYGQ5jSFANZxES9OzOWm/GNidXlnlptB/Rlmsr1ylcT2k1LTWYwBXxnJ7HaFMi1MM8+QOdkLXpLFkRViH2fIYDciUrLUoyctKYF387Qu9N9auN30F2GYAMfbNqMxNDFLxwMyAtFQo7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13015025)(13023025)(13024025)(13017025)(13018025)(3002001)(10201501046)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(6072148); SRVR:BLUPR0701MB2084; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB2084; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 4:45YomBks19g7XBzi2V9sz1pV0aSDW7L/H5HzGwFwtPymLrwEGIc9RdSUWNNs98irDh+Gbsr0FdcPyl9HeK9vgFK6vGvK7sPlyyDoflGLgkbL/kGk2X4RIOjS9dkWPO+8XQvKApfMvcXnKWvuHNYa6o92tq481Ew1XpAWaGQoQC/Ck3MzZfkhrPydtKabFvULM525sUf24GI5peXf24dJjkjZdnNEN1ke6Oi/GyRbX8vdELPzhbs+TRanS4/DqcjgkrK0+gCF4Q6LMmOtFK+vlp+jO1br6xTvtc6NRkQA06juCgjuvf9f60Zam/pgKB8skfgtqHXeqXNKp0KCm9VdmaibgPsfBWOQvW+cuCSxBNOSsFLfP0/Z8n1qBFGo1tRNSLcygTNMN6/v71O3tRZZ7WCMjYXgH7FvEKX4ZFQdX8rX+4UpgT3bj2nO3Jn4/mV8N8wpWzqatOOby9/yudCW3pq3rv2raXLCIASmU1sqk1SbVDItfVhHXn1M9zwJmSRhl+SR7DnG2uxUQ+w90t0nXL75SzO1GA9uy+pfh9hVp4ltOg/IrNLEMy963XP9n7b5a2FO0uEjQ2pzXPBSPZ3qrbU0MLooYtVwIUyuNUAdSvxLCA63wBnRrLmzVuv0REj2mKwOR2QyBBSuVWCn1J92IyKjH/GiVrzsCMoh+dCIYd0= X-Forefront-PRVS: 01630974C0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB2084; 23:14DArt0ZolI5+TkTKoWICLfs1ZWwlNIVzxxRbQb?= =?us-ascii?Q?NJTkoekKZMJH4Jnlu06o9zp51WrmchV0OrzXdLsMuZ4CxD/ybTZzRRGlfprD?= =?us-ascii?Q?ayZXcPkyHeBEPQ5bEaIbcMVkiMSOwy3TpJJcnBgfuIhuSVUjCcyFrNdk4OYf?= =?us-ascii?Q?JNTsaGYHZmd353SJQfjKD36PhnNaPiOQE6aDnHkiWCjkfR5c7MrmAG19+hy2?= =?us-ascii?Q?Loc1J5Dkvwh1SglY3bf4VfHPTvvdldTEuBJffcCvvrULBmwE1+q9M18fBysO?= =?us-ascii?Q?lJ+utI9Vu17hOlzyGNpftom9mls85b7y79XtffMRbBckNBT/nAxpncBQ5Jwr?= =?us-ascii?Q?dugJU2ImUT8xyCELV3wMPkMylK7F/SpVCIhtf7F5sZhCZFvnQjcxM2BfBgil?= =?us-ascii?Q?aLIB+HDYTbaX23NyA1TgtdbpEnjPSxl1STlp0qScO7CDZ08Fy62SbdcH4GPR?= =?us-ascii?Q?Wmq8j3L00czOy/dZ5saOAn3PTC6c5V3NEDJSh1P6wh9KdYKTj5QTOo6XpPSY?= =?us-ascii?Q?6/MGJlidpkJC3l+MI14S6HE8kwBuPicrOD0gGtw6gDRgK7a/ERJi+qcfccqP?= =?us-ascii?Q?RTrvbYKughLiayN6rrnoUe+N1UDva3krmCyTdejIfSioxEdgvKzdxqLzbWdo?= =?us-ascii?Q?UHu1BYKnFplK1y6htYSLGb000NB8Z7qdmflitlx7e0+vHy01Eyu6biWlfM6s?= =?us-ascii?Q?QF6JUbsYWd5Eb9VpwVb+/awgwecJ+iP1oxPg/xK/OZTbSip2DsX2KZGa5hBP?= =?us-ascii?Q?GwNObknjhPeMnpOSAzOhCBao8zxADEz6W75C7AjLqk4+dzKvEnZUIjhpgouz?= =?us-ascii?Q?Wt0QoefjuBxmXdKhuDOZLs5b40WqLj8RIyXwKn1ohhoEDmJov0LA0hpmV+Ec?= =?us-ascii?Q?o5OL2FC4g/4JiImKmd6blTJZ/V0xmb4yEkkK1cT25rDp8R/6X6rqs107GRf0?= =?us-ascii?Q?EKoXNZLxXBz7dhZAAVhr7FN3/sbbgdORBn00sCNhsDAMK+aow2U7Cckd3JNI?= =?us-ascii?Q?On2iKYKdokICMERd2sE4Dl7jsqhU4OR4SqRAbbN/UNDZKZletLvTsqkayr3d?= =?us-ascii?Q?zQqp8ky7LH0FWlLNNYW2VQdH/UneFsqCx4YLgg7dn81g/Csrlfnc6YjMdGg5?= =?us-ascii?Q?MPHgz9vr3mXE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 6:laf7rxOrPZ4pkgfGe+b1barWMkK5G5YBof3XNx8/m7uCbtjJfqqJRHd5IrZNZC8NJ+bKMQh/Cu1ep4ztTYsdmZJdfj0ndGbl8KG+9BdIN4CvMz2tnaZWySd4GTJ6Jahj6QHPjeKLq3Rl5w2eh4srZe1S2O4KOcAVxzPoKdbPGU3iNMMwphFb09J0PeQ5POMRJ3OUbDW6Szp6eskapT5e/YM5MUtByzFsl/O+2z3AIubJbRANvUybCKsTjDvKAT9Wqbw3HirwiaIP8g5vPxdmkzsslLzzvB/tu9NCGkxXDz6RycCUK7Y0C+LEj7S/5vYcsmv/vERa7egMnx+br91RYSMxwqVutcqwrTpOb9CY1Aa/snIpfZbjG0gwMVObD532Exgk4CUUtLKug67YIaAlOERaRKCMfiwdGlFslgzStAA=; 5:JtcBXOJNXmdMibGCnplcVF9QviJuheijDp4DpS7pQIW9ifSXhEwwMkf7ANRtJJgVXvveH1vysL0IVywEgpyqkT1F2uJO0r7aahXRV7zj78Ywx04Lq9F9CqpqBlhV/FsOnEhRFsOtKMWk+B20vZ/Pvg==; 24:6nAdrZu6v/1ZiNwzIiJZLauDKrdt2hf/Zjflf5/RjwDjFZrFOxTiTMFtrZiDbeAT5aEuDWvqwoqZ4fx62Cf0KNdLzxGrcpWwzkjf6buwKiM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2084; 7:IgKe2gI/rWuA/DQ0NbGmWk2FFA+SfyJvhVuC0sToxCuo7Tk7XLfA52G0EMbe8oz8ySIjh6WJNYC/J0/dPgjmfH2rWyT/O8vHKLDLsDW8BkWURNt4yarIdPVhysRQLAb5svSHLTWepfdXq/4Z8NgqAHV/y9kFfg+IWwwOqA75kUeC7A9mKYhHVPQLYwF8Bsea5KeNg1hLGNjideqwUEBTIp5n0+EPfNsfszMDZXyN+L7+iOus/4/Sr/wchZZgOzqxT8qFP6zoiH1L4tf7qoZogHD0J7Y/dXix3OO1QcqAUMzgSKqgDyrw6DWZtbVDZu5e60PTKwr7m+SYl4p482Zpdfb5hO2wyNZfzH3ufnm68fq95AiSpOpPG+J5BYsr5y1gJxh/D7FsqhfwxCJjj3m7bOo6Xf448Si9OYgHcqJnhyzwory7mATdJQNZgpzMkLpt0GvZ8ulvVo7pL0YJSIF+Fw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2016 21:58:22.6805 (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: BLUPR0701MB2084 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 --- 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)