From patchwork Tue Dec 6 20:30:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9463253 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 E9A7260231 for ; Tue, 6 Dec 2016 20:46:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9020284CD for ; Tue, 6 Dec 2016 20:46:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAC18284DC; Tue, 6 Dec 2016 20:46:27 +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 4F962284CD for ; Tue, 6 Dec 2016 20:46:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbcLFUq0 (ORCPT ); Tue, 6 Dec 2016 15:46:26 -0500 Received: from mail-by2nam03on0060.outbound.protection.outlook.com ([104.47.42.60]:65122 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751993AbcLFUqY (ORCPT ); Tue, 6 Dec 2016 15:46:24 -0500 X-Greylist: delayed 919 seconds by postgrey-1.27 at vger.kernel.org; Tue, 06 Dec 2016 15:46:24 EST 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=o0zrHJRNKIFcRklPwGloa0RCVZibHkf+tts2/vdhPZ0=; b=bvoETgAk3beBsoKQ43by/px1UgxbeXwCjV22U9hQ4u2mdxXvfDlfv/KHrNaQS0INu97CwlWvkhwSMuNB7ql6d6paHnyuD52Wz7hB2DM5o9WV+yzWmvEqHZaBN9CELhmQx1hlHM3eea8XfJSZ/OX/ii6H1ipejlsaIboj2N6yTUM= Received: from BLUPR07CA0037.namprd07.prod.outlook.com (10.255.223.150) by CY1PR0701MB2091.namprd07.prod.outlook.com (10.163.142.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Tue, 6 Dec 2016 20:31:32 +0000 Received: from BN1BFFO11FD006.protection.gbl (2a01:111:f400:7c10::1:117) by BLUPR07CA0037.outlook.office365.com (2a01:111:e400:841::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Tue, 6 Dec 2016 20:31:32 +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 BN1BFFO11FD006.mail.protection.outlook.com (10.58.144.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.734.4 via Frontend Transport; Tue, 6 Dec 2016 20:31:31 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1147; Count:15 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; Tue, 6 Dec 2016 12:30:55 -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 uB6KUt5O002423; Tue, 6 Dec 2016 12:30:55 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uB6KUt0f002422; Tue, 6 Dec 2016 12:30:55 -0800 From: Himanshu Madhani To: , CC: , , Subject: [PATCH 19/22] qla2xxx: Reduce exess wait during chip reset Date: Tue, 6 Dec 2016 12:30:48 -0800 Message-ID: <1481056251-2310-20-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> References: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-IncomingHeaderCount: 15 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(428002)(199003)(189002)(50466002)(50226002)(48376002)(69596002)(305945005)(6666003)(101416001)(2950100002)(107886002)(86362001)(80596001)(81166006)(81156014)(2906002)(4720700003)(356003)(8936002)(92566002)(5660300001)(189998001)(33646002)(5001770100001)(4326007)(4001430100002)(7846002)(38730400001)(106466001)(39450400002)(42186005)(36756003)(39410400001)(5003940100001)(626004)(47776003)(8676002)(76176999)(50986999)(39840400001)(39850400001)(105586002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB2091; 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; BN1BFFO11FD006; 1:r8QGEtvE19opJlTGmcgpjAWfFkl+1NSiKfcxG+i3qsG7Ta/ZPNh8DKwk84nI+103gWb4kMhlXZYc7GMgUKpcGtErxkU8GjQP5xloR+tdgBU5zliCd9QKc1KgRncXvFv7jfGWtdcZl4S5xEKLvk+YDJ5/RYnbd19x8docua77na9kn7H6e70UQGqPeGZI6u1n68YmIyoRkxulRwP59V8FlgjIbV9KEXX4XoM6QvPxaNB8RGvDzXPyUcKVjJGBbs6aOq1xT09leYp1Snk04BuFHfsFOB3dqDFAQ6j9UpN8EeWMF3sO7YTBqYSo5HCrQUdkWzS9dYBBAzvHQ+d4yDenwUtd+a7HM5JtLilNB5eKUBju1Iy1S0Nppr212AeOJh9aOW4eefGkv41S6gizl0dnQ+EiI0/WoH9htWA8DbizVB4zaXBTp1qOlImSXqhQubyHDmrY6slvRgmcmO+KaGqK65SldqZifeuDxtyBMfJau2GdE7C1xiFHfl56saxAZmc6rLboa3Z4FlLai4yKe+xqQQ== X-MS-Office365-Filtering-Correlation-Id: 7abce9dc-e902-4cef-3bb5-08d41e16dd78 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 3:5MdCtz8LTd7Il0nt/EJ9NYHdy3JS33bPK0cKu3+Z2tkUKq5s3TCYPddSrkw8s0i1j5+vwTKb4oPEaMbyqo16CobHw7pteOxVPRp4fuALju/gHZO2Qn4GyCGBsD75qcd71YRFqbtItk6jgsjWjZbFsLUzqe+jriE5yVXjp5LJkArcVx5WMzTgiC/SH3q5jsG7Uhw0Uo5DW0VJcMmpV9Xzkr727oCfoQZSHwJH65fg2eCKnPjZButJZRlci1JPrQJkezUy7tv/pSF/S6NCjldtUdd8FR5yhpDdEK6mJurUAqkI8Q5N83q1ZtByhbSWwlx/qmVzbTItQDIMb3KP/HooRrT5wgHb4dsL46ESdjJ8Y6w=; 25:Hz0estME/vlPmCTRwJlEgoMN/e64PU4i8yTmEOiRIQmZ0n4Z7Z/QnWC8VfiNrmDY0TEmQqVQVWmAZ2CpFvy8RLVPWvpT6U4RhOVBYx3a2i9uzXwWAz+EkdMHAGWJjIKSNl5nHQhDT+HZm2p5Zw/vCTRlVFsQwYAyrONKOnIwUUXGU6JGGB3W4JwSTltuJfLwgA8VzG0Vr1qOcxecHjHGi8U8iPmxoMPyGhC42qDZi/smZOEVoWK2VenUKuzQEoF0IkeehSjMA0f0ybJGIEVqzIT3G7lSo9iNX/Sg+RhpCTCXior+/sfCK12+gfyC18wXlRv/rgG/hdkCtVpc9ZzytmzG1akOgcFk7hUk3rq7eUK6KQ20EFr+I9q8kPiobjcmyrhiEEw40QJUr6cmtKlECsWVln4uNwBi3wpeHy8g49fvYDioN0WvFw1zod4nQNVsMRpAvzxx9LksLkat6BvTww== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 31:S+/gJ1hPGjwZj6cwAgp6liVfHyv22IxmxQbaqIpLAJ8RDeZr5PKKwa9LPSMZay1vhw2u6mcmz49S1gSqfwnnDmGLdhfLvXwdh7Oevl9Ltt2XsGkPz92KABeDUC7HBNGwMSgOzw7135gyIgsUpclLSgVyLoG9FwLuOPIMUdNW6Ip5NmDWO+TWfdKv0JoiREsC/mEpbsWeZHUJ/pLOYXYJrxeWc06jUYnra9BeMOQy1OFgEnY+uIYvjnzz1dDjrL6qZTeeEoLeRoA+thy6BXTTUg==; 20:BGF0va+KR3jmQwk7EiN6oAojCiKqEZffvUI9dmDBN3QlK4DgSlgW7l28MtL6wP8Noi4iJfMo4dPzMtlZD2gbYrZPf0eNlLL/Yv+SYu13xvRAlzT6keqKRRgqdJfT1MVaMBk25/JZ7nKNWP24Cj5XlI/n9Zn0RIn9eAjBMFYlx11n/OEPhWxYdRnUFDzXEdxMk+G05ywd3r9aWltx2kqBABEahS7sbt7G01fT4D5uH6JCgoZ/ZXyqR2aN70iR7GCMNBCRBpNKsY/1rhpyoxJKegiTE6+QZTw4hHfNuze0acaqkZHP147pG4FJiX3PuufuU6L5tiwpyjHkhxGV12OuG3JmeN0c5LMtgw2lPSVUOS61/Vu3U4rj11GifD7Kuyd3lcpdMD8O6xfDCuCBPmOaDpKGp4bAFBGubP983no6AwUXyJSzQPOEi2XpKkiFZQt196nD6Sh4j3ilYF6toSzrX3rW8QtrxgND0iZokUWKwXYDp8ueRMgh3+a1fVNjhfXQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13017025)(13023025)(13015025)(13024025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:CY1PR0701MB2091; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 4:+NYLozA9Y/vDrGDQdazPGtR2bOql21/sh+aHoZJmAdt9iFbdozOWMdivo2ZQXhhdYoiBVeaZ8jS/stX6HVGM/zyW6kzXCSNx+EnET79tzdbIt1YmKEcmKx63hjBvwa5chKUUWcfF3nvrK33jXDxmeixTcbg7fvnnht5fv9VKJ6i7ICywDcpQ46IRQ1bglQmW7tY2lgE6eFtGhsJrxtRGpKSXTqACKdqmeqk2MrfS0qjHnI9g+lEuIdGmPe5PgEDQmIbYa0bMoctbyMxZQ7vwqVDHNGG/rqeeCV1QutkxlTpFJJIw4D4IREnAKofR8EjANni5X1V7JNrTaX3MP+I4H2lwTfr5Uz5oXHChM9IqepYbr1TL95f500ckQ89WU1oxhXnUAjhnteor24UIvAshETu/egSYy1I8cgZeOcx34A1ZHkpP410qxuuloECm5Z7aBOfyFxuMbaIQK8DT2FKtyqzwitJvHAW0yuHm/ZPyFxuLPBqXDGIREdOK1vNLzmt84E5+snCrBegoTu1BeyYE59t0PRxS223MmQjEUPY89SiIrVq+tBpH8RWFK6ccgQ5xQoGaB/lQPLjtq//EpEECyMps1Y2Vt+Idpe1TSWu0wZxP92omeK7+G+94EyZdUsnsAYEvm7XhrrkJDqyZi42e63MDT50DDiov1r2KSInqH1s= X-Forefront-PRVS: 01480965DA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB2091; 23:Pxp2ovyOipGdxmc/TYhx60HpUHI0fjH2ot9oESZ?= =?us-ascii?Q?tHw8VNcdol2qpR5t+2LPXvFLKDC31nYXmZFnuqB577FkhMyUyd3mGbKhqSQT?= =?us-ascii?Q?GS7gnlQgbSmqPvHTx8pgv47Uh9HAJ75pSqmD8zbgua4XqSA7bMqhxwySC9GS?= =?us-ascii?Q?k238ECkzkFI8EaOpBkMHABBjs0Svl6AoKSBGwTq2+keSntiKDYQjkmbvwr7T?= =?us-ascii?Q?/amcsdifQjAJ812Yzp6/VaCX/LMkkX/5Gn6lqBtU0vEXmCoTlxLXfqXQBVcv?= =?us-ascii?Q?OKP3/mTvcu1D9NY8rTatMQgbhpOrLbIvBghNvC1bXu5xwZgACLRl8ETe0lBv?= =?us-ascii?Q?8Obc/QM3q5Uxe+0jFN6rnbDQzbukuoXQkVQ2m+S29UVife8PTc39/XX3XYU1?= =?us-ascii?Q?KVB+nZy7I/6n6/E1OHiXY36HSIKLYlJEmhnhFmM6c56r1ORwKV5T2upENUAK?= =?us-ascii?Q?35gtB/OeQ+lZrm0sa1YTBYaDfBM3YeKMxlN+sXKiYeXffCXsBXWfvcBN6Ql/?= =?us-ascii?Q?M7aKuI0Su/7RGJ0LqBPIzr++MACUp1yfWAERqDWXn9abgsCdrKV03naU7XNi?= =?us-ascii?Q?rhCcBQiexNZ2OBCLhrOR1GGdRnjhbGNjQEypEys+G+L8b1oY/CfEalkOaIdW?= =?us-ascii?Q?WE9q5Qbsswxm+bNWUEn/8IO/660HI9kXfS87iAhrv1b+HrUskj0XZMCFjo1d?= =?us-ascii?Q?48NnHzJxUvWFrGQeWH8zIob1ZbhggHfRhRpC4sQ3MT1liYhAJfZbT3LmURZF?= =?us-ascii?Q?7o/dZPWPyEwSAIL8gV/ep/cWi5k4NHm2FFMxhriwDNbmj+lt1w1C91bwUPPs?= =?us-ascii?Q?ZHC5DQ748+h7xY4IofN/MOunpjaF0L76PypOiQDkNwegCoI5zSO4tcrr3Eol?= =?us-ascii?Q?ydHNn0DuHpSK1zxqGAThkYHWOgeWermbUcCftndx/m6Qk0ZlpZC4nfJtcqJF?= =?us-ascii?Q?x1KLVGcS97FWvcqTp40zJryVLFCtetaIgg3j5muRjbPytJfozIFuU9cH/vaI?= =?us-ascii?Q?4CeoNwXCk6/zLJph2O/EGyC17FYwwQWaBTSf1XIqS90LEeiqTvCN2uxyZZ7A?= =?us-ascii?Q?Oixiq1S6OJ2iewOWvx/vPFdy0meJCGm7rZKcBfqxVnmoEqBzHIdfIj2Ydd/Q?= =?us-ascii?Q?V9RxzemllM/e9xf9sLmO0r5/JbfASsXdiWfi242ZU5WPtUpNLDhhsaqhoi0s?= =?us-ascii?Q?Vfu/6u2GC2OYuIkI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 6:N3IXaxg+9qNCY6bDM5qBblsk8BSKETHbD/LkIb0IdUWx5/Z5G3Nc7o60YXWMDdf7XH3gM/zQB12ZX3MWaZv0YEtdpAIl4yFTyy6S+ZKSWB5S/EJjmHJDF5bnFFs+DVajpEdhXzvzzrCS2FAZ/qjnI2osFDQK9jhvUZ8JVbtSi8aM8z4t4DSovhSVYhXiOy4mx+S0XCr2V00UhfCIVoHurFninP+BDgYSPeAjNJeOUv2vlPHaaLk0HdWDSTlJYcBKRHV3ZbZgw4W9qHNDrX4GHXMPC6bfz+WysGm6lzOzawRTiqDxywQzeZpskjs24qcfpkSBWyvrsQOo6H6ItEbzDeNJabc5sNnvkMIdwid5eNmspr2REwqVlnJVwczBDgry51jN//9lUp7IZ8xPAcc5lhfPt8PanKQhCRfkPAAB6KhBA3H0zVvi3tfp77OkvdoG5Qtby4q2UlnHpc/kF2KTUw==; 5:CmH3pZ1ep2Pv8EjPtUaDO83v3db0mifu9sUQO3H1w27fKHMjuplIXOr082qQMnDLNYclEIPnkiLRRNC6AWiYwp/sYxMcWOVf+dETv091HPLTlwrSEaGVYdTJbS29DGFXlTKG6hlMs+Ho5SqZo0jFfg==; 24:1QIPwCUJv60o/uu/ASEoTztVPjjk0XCGgG4PG05+9RWC38saQ4u8+onN/Pod7gA1Y2BXvvEDgmAMHFzbGMUQj1eaDL3QWSoHB5z6nydKeDQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 7:x+eZYXv5pOsEUwDTBvvUwdmzTTB8JpOl3TUKiNcz8SXWAA/icNIBGsZ7kSqslF/VO5joziYDofgpGDJL3szNosC3q0nyOeEOvFo5m27I+hFlf8VLDkr1irTU3q6hqnoCSA+cSnXvW5Lt3rBpSeTYGhGPARTEZEtGWRoD98wYlMi9T16YvdlfR082w3qxnPWdT4mLxOxZIxl7ubxfGlpy/jruq5L8Pc9VOVlxri6rdILcGrWRGHjCIhFw8sCDrCM7p/FLyoWKptjjV+JWQ2sSfScApmEnTfJTKJpQUzFtRXN1fidrIgPwjXVcaAeQOfQ6YvieoRB0tSCp7ghngHsIYWpc1ORuhm49SYlynvKB+QHGeTeHPy/06ESNg0IQyv6PInihe9I6uHS5OQyZdnL41U6wfdJS8ZrR1K1/UT6f8JQUxVFM3mMQRz8Ykp7cMpP17gwU/m7pdfB3jCh4sOKKtw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2016 20:31:31.6408 (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: CY1PR0701MB2091 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 Per HW recommendation, 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 dcb8c49..d8b18a9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2112,7 +2112,7 @@ void qla2x00_fcport_event_handler (scsi_qla_host_t *vha, /* 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) @@ -2155,7 +2155,7 @@ void qla2x00_fcport_event_handler (scsi_qla_host_t *vha, 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)