From patchwork Sat Dec 24 02:06:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9487775 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 2AC5962AAB for ; Sat, 24 Dec 2016 02:06:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 148192074F for ; Sat, 24 Dec 2016 02:06:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 090D126212; Sat, 24 Dec 2016 02:06:44 +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 6D7AD2074F for ; Sat, 24 Dec 2016 02:06:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939006AbcLXCGm (ORCPT ); Fri, 23 Dec 2016 21:06:42 -0500 Received: from mail-cys01nam02on0068.outbound.protection.outlook.com ([104.47.37.68]:10008 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1761856AbcLXCGg (ORCPT ); Fri, 23 Dec 2016 21:06:36 -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=e4T9nL/e1w+bZt9j9/uIROpbfyvvzKN3pLYFN6777Lo=; b=NJtbBnSBMIIbU+8/yRnFqf2zj9pSATCucX2ScpNdYQFB+N78JaHAEj5hDd6L0vGNYGj5QAGLF1clhscEe51fYD9nGTq3lBzlpfTB/WQWEx7kwd8Z9IHGiG4LP07GyYXdEiWOlCKvkdTYpXXRmO8S2bgDt7JuyqVO0oTU0eH2wHA= Received: from SN1PR0701CA0076.namprd07.prod.outlook.com (10.163.126.44) by SN1PR0701MB2095.namprd07.prod.outlook.com (10.163.132.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Sat, 24 Dec 2016 02:06:32 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::138) by SN1PR0701CA0076.outlook.office365.com (2a01:111:e400:52fd::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11 via Frontend Transport; Sat, 24 Dec 2016 02:06:32 +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 BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) 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; Sat, 24 Dec 2016 02:06:31 +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, 23 Dec 2016 18:06:16 -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 uBO26GXT000899; Fri, 23 Dec 2016 18:06:16 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBO26GuO000898; Fri, 23 Dec 2016 18:06:16 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH v3 08/10] qla2xxx: Reduce exess wait during chip reset Date: Fri, 23 Dec 2016 18:06:12 -0800 Message-ID: <1482545174-811-9-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482545174-811-1-git-send-email-himanshu.madhani@cavium.com> References: <1482545174-811-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)(305945005)(48376002)(4001430100002)(2950100002)(69596002)(50466002)(626004)(36756003)(356003)(6666003)(81166006)(81156014)(26826002)(8676002)(4720700003)(2906002)(2201001)(5660300001)(4326007)(47776003)(101416001)(107886002)(92566002)(189998001)(5003940100001)(39060400001)(86362001)(38730400001)(50986999)(76176999)(8936002)(80596001)(42186005)(33646002)(106466001)(105586002)(5001770100001)(50226002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB2095; 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; BN1AFFO11FD027; 1:L0sofunO32/Ge6Zy2y6LJw8mtCySqhfHva+2re9xxpPnTJF76PCGXVGSrxsr475MtQD3Kd3svhgkRXhqY+CnvDrRtlm4AesQGdnZ/Z/wspuedUBDaIYvTHOscix1oWqXHM1xW8BHHw1DkcimRVsd/vFqziphUrcSvXWVJSrXM6Lfe6LHP4sKFTkn9rCKKdNOgzS2Ey1GJO9sfvSBYH2ghNTtwfBA7qPOYa4/T/TKdsM74HRTBe7x++u4dWsA0mCr/Jdwa77PvAbG/DmwxSoY1qX0fIa8frQq0vdhdfnMkZm160446/l2i5du79ac6vEnoQdX+MFMTw/0Ztn8NSknT39Zu8RSDo2JrfZX2FnBMRALG+1ERLQZ4693uqMy4LUdiuHOqUX3qiiPKpNMpftFOaNgL8LGft2jBi1AYqmJ5JDTlJj5g7YWmb4AlTqXm2eCUCELSyLtbyfp8Kux+TUMPQVAKVsKxCgoahJxEpLCL7Hf/nhU0c2CfXDsLl/AgA6XwmKZXDcS6nG3sLfMntTEZg== X-MS-Office365-Filtering-Correlation-Id: acb0fed5-6943-482f-392a-08d42ba17b19 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0701MB2095; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 3:a4zQ8RAOBGny/q74XTvlELGIs310ehLdyMw9kV0ZKhmT+Q75jl0TVAAA0EQQCHgywZkITQbad6lOmyxX8xqu5dQJul8UkJGJH2Rk7R5cPoemGK819jVh/gVcpJBZtDXIT0z8TLmYYsPrmxSHbSi6h029gw5b/7NMs1upwgcreJfF0bl4fBS2s79jacP9V3NQzjcsia+xTO1jeS9LMCETMajzp/Q90hipmFePWwfuyw1k1uhVIZiphNhVh+A/RlYFkybl5wYtwz9vkd3ksHORMuxd4Jij4qDZVKAS4CXsyGm8v+kE9TbWdeZL9SGNoN9MLAJ0DAOvRQew3C2gZMksDDuCWS/lRPAouHb53++te2XmDsyxV+gLQmO28R2gzKn0; 25:TBQjhuYxrMJMeeOfmIp77xD2FpQPajlHzq4tixcALO6NtPgmP//rNSS6axh4d9t7jKBxqzcry61a7kxFMVzoQafXcrLYBhFuH9tMJBc7+IxJwZ73KgogYyUYCPezIfBgxtkpf9y/ZP/nV1EDW9dwpg+ZQIxHWkVuVKyUMhipLSGt2bfoBnBdLQKCSEkWaKAviGY/dwqQ6hJQKrTPJbkJ7OHTF+JYpedHZB/fRPn6JxZJa2GcmgbgmFUza5oK/kn7f1/Q+59Fc24jqyy1I0U8JUP0kefqCuBB1l/mzubqimN/5U+9oqNdEbbjbh2dSx+2EFoe43r1errU7NJdhPtXRn5PP6W0cD+XZ5+lvKhyKADYcvhtolnBhXtG+O45M/YM+IZk3aOOya2/u9ZZAS7F97nd52Ht/PGn6ECzlvmCTED0SEKIE3W5k/QXzxDeSoU9RCAOw4bqPQGPGolPGzYrBw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 31:LqurPcL1j2V62p/hfiFsMsdBHQh4TWocKuEGe8lAWZWxfno8zBG1bIxeQyyrVKkMjUxz5Ze16cRJVwQVSvbZLDnub7965FfqHQwZYJaimBCd2U+mH/8x14e8YKtAxWrduFiEtIJzGcGpEotE5IPXgYFHtd669AqNtGhq+5WVL3g62AxF2sMBJqv/pf5q8117DEH6sr9SgnFXNtO5lL9GpQfRPpyi2FTPiWZOzMX3qlx3v7encONvST9+XiZhmRGjnQE0XDICiIUHMYZLxGuGLw==; 20:W4abcVzF9Vx3HCIQgx7S/argOGJNMQnuxPlvm+s/xA87N1AYsm3PpUc2G7BhkKKWRWNIum5eP+R695OfRS/8wFOi19pzSqL7UBFSxN7lXlfxBE59HUce7cKvk/HPR532Zsi52cetEWfWlEe4PsjGl9KvSlYK0wUg5rsdejmctrovbRICbcMiq/7rwEeMbSUqh3GvYNAjH8bg3MaYmKtqV2fZSc5nS0+1Y4tbEiI+V/daqOG1xPyHRHf4imAvqxI7U+E70N/yKad31zSOWQpMYtUV0G3vvjMydPZ5sJ5gIAPQs7dPZCceRCVJkZ/xN8tLOUNyuyI3qb+RKRMLtBF15lYSiuxpv1nTkHOXUJngY7DKykipYpclNxVomTHw+QhrMUNNaQe3+6T/zLywk9erzeHKWoHg+pgIjyztWXdIm1BNwPPmIs5uAtScpBm1sUqSLMqviWhIPdmajKongZgiyWyxOgFuMilH+9T0GkPcI+Iv8/FKK7S1BnGpp5PYdlmm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13013025)(13021025)(13023025)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148); SRVR:SN1PR0701MB2095; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0701MB2095; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 4:WWwcgXb87hEPxTTBZ+UVnYjbXnuqq/8cyHx9E0LC5xCkRSoIUGsJt14ELMFkHwCcPEUeFunNk9+Ell80ynLKg5OdMUVW3p32vDfxtVKmr8gEZAp5saHTqVwzpUQtaQ5qTugDEXcq/8pb9Q64uBoPVAKDdC0J9JDCrfl4u6pDgoPDyBNjp5fu+X9uSuT+J1MWVo5/JMPs9d//Ngu1tb2HML9xBg5g5AXehBnrBktEt76bo0KGRukL+hvjsQkebfdis8qNsJ3Ygi7F4oltiFJt+VIXvGnCT6+0NjyfZwsJflYfkbuLgOgPTDDcy7uMsoHj1pBJpqTf1sS/tUEjSKy10yEr6HxbJp9zOHs3LDhXfYSIb6nGI0hx0MAOQgPi+bjrV4inOO2/fQFezqebf9umV5d+0uwgYkS5iIcPSqAKgq7FFTmmmvv1otrc6rxgcXGGgfsEnHc6gKBcR9PzI+UvmEwl0lwlzkNgs1HwPbVI8f+4pprEJuZQFbGsOoyr11XE01ENNPh0asY8o4+Y72kHyA9MnOD8S1yTDWK3C3P+rjMHaAkfxViQQRAaSwILGvWcyYeJ+f/puniQMIwpx1X/U0OvJMwxyrVji8hUbiLRTgppYmPFdAUDs7ZQHNkj1lGG X-Forefront-PRVS: 0166B75B74 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0701MB2095; 23:kMFHI7Tu0Upqt2Pao1t4aQshqCIBLeZVMCxvcmz?= =?us-ascii?Q?5Sq9Ghr48fbHqPx1dOiIYUzBbSCFFwQl0MrH054xhHmanZJ2V088lSwSjWgj?= =?us-ascii?Q?T0eiHPyLOAuiGWpqNsOmGC/ko7t3ZOeOOzDFZiCxd5e+nUMAN1sW6ggkyw0P?= =?us-ascii?Q?VuphdoYNw22XFMWKCz1tX8IbAUgIvuw25a60Hv3WfDXrcqjCOKxoCTKVSspu?= =?us-ascii?Q?F0JnnNq8kgbcUJeFmep/DYG7hAdCGTd9NnRe+zkXtQNiUbaOpvRS1bJBYqmv?= =?us-ascii?Q?tUOzJkBhgKWvVzBVkUjE2R+QhKbiJTKfUgahi+Yw+qYBxzeUZmsRC+oh7KEw?= =?us-ascii?Q?2+jrmbIQ4IqZDj1zK89nRPic+2GiPHzbJP/QsNgUT1gEBuOP4d//enTyIhIo?= =?us-ascii?Q?TIhRLA+1XrZcR5YV8cvKUQx+91fG563nIEIWY56WDh3FoufYUH4A+mYegAYK?= =?us-ascii?Q?3qcnrNYcb1cx+BJVHVlmyMFkGTn5ijDAU1rr579cOpBX70Z8sKZ+7fV6BLMI?= =?us-ascii?Q?iuOvGePkCHbUu6G55Zw3ldPbbGMG2KF3m1ShbsxJmd6AEScsJP0wZP9j+bsj?= =?us-ascii?Q?4bN57Wp0z38QgJIo8dGGhWIZFGAftv6DNSk4W0n6Jc30Mxr/6TysPtsOPw+V?= =?us-ascii?Q?iydZKPTGeBYi33jsqLY7FwGBEK9xcrvJECaxaL9yjWlLbwXJrqBeKDoQa1RW?= =?us-ascii?Q?Ll+l9Ms1tjlkU8t2NNJeBfaIPAMFZEpqjHnE98imnWdfaKfz1+pGb+pd7ztS?= =?us-ascii?Q?AOqk/3Zf1gxpuNz2LAzdnV2kEzx0JZj0rV1hi6/zUT6g4ftW11tuPy39cxpF?= =?us-ascii?Q?4evcBiYTWm1Jirn4QYv++Ng+rLjOJCuxjw6aVjAxAff0ICQhs8077q/bhbZQ?= =?us-ascii?Q?430b+/3Ex/rX0/2Q1WYOQrBJdqVjje8zjwNKrpe0TQqekVbNemcG6+SmgM84?= =?us-ascii?Q?tLpXS1fWbP5nNEsIsedpnDkYnH7EfGHHdHAguzi/fJfQFmr0QBBgndDBMTCA?= =?us-ascii?Q?GgPIXXN8Uglgfp3Ajl6iCb85bbtEOqkl4QM7f3HRRJzNZlwKmfb1sbawt/ay?= =?us-ascii?Q?S6N4wKcP85uWCn24vKjbzFE+wV2J6QlrnPoZGrGoSd999NpEjcwO5CFf2twg?= =?us-ascii?Q?KXrY/G/QA5Tguk9+mxG0UbJywgOtVONwS?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 6:4iMVmRTgVqI/uG0pQtFhMo+2oP0NJ7osYN1Xh1T7UmwQBuLsgCH1D1P0mSFmiWQgqM+CD+6PbkLUh0KjSRRAhqskMhfOTUKIFpOzOlyKLZ1dZoScPOA+BJhJr+lRD5s/3nchuK8vcCxy32XdkO/YlVQbE7v5qZi0lS/FkcKKTWqhTMUwVDuHyLynAATM4qunm6ZfDCpEGO0MAzpPFJaIBW4BBiXSf+xMBeMUwpmN0FxhA7js07DkuOPBCJYPAVUIOWwuPuo9AiegYGS23w2KJ/bopmQG24mzmFI9ny8ZYVfeZGxiudg2KDrocbFYfY0R41rR4qy6kwlKKErKL1vlDZ1Tbh0NzbnbmqzcuznznAPiYh0DG5X4eesQLcVB5WnCDasRBuDJclplOZka69nwZwCuK5cY1m5H4A7iMZ9mn3k=; 5:o6SUeWg5w2K2fT/Ze/K5jBmvhwm0k3ZxzPg0+VQRqaC8FH3ZpdFmrtYsi1/WzZL0uoYaOcWe5DNunFkffMRPX1k3Jtw2Tru9e8U2xDKY2kVs115W9nz9mTmT4F3r9Hzvqbc9wQRqbT+L65bmUR2H+Q==; 24:5ANHRs+HZiH1NwxL45nW2juXltyzMQsWQyBNxGL5koEuXCF0jssTJgrCI0MBBtoNz9mXrSacEflJHNOyJKR0hNrxWmZ5oCKL4U7mOLQgVlA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB2095; 7:68UBijxNfnomZqn+z/lJaC0UHlfv53WzGoNZwIYdgvtxbxY/331bvqilKUkKtMHMkyWc5L91gJRmfaZuzG1d8PC7/s2Nj9v93bEP2SyfKfrnplpAHF/+FgyK+AMqxP/9LfjHT5q6qO2jldJNpcwx3ok8eYdDC1aebG0bMBIDW0LniV26r8sbC+UOx8YG9RmoLTyqCbLrInEQyqR3mNsP4yRw4icQXoO/rAKiw6n916FfLvVxYGXNoDCLOPLoiz/kQtmW0u1KIX0wy2cKWwXjNaXHQy5mXJFlf23t31/0SqFzjND7u1VobEX0tZTAbgd5joNeNJhIQTqcMtEZssUuf1LRxNJSHW1Zpi3l9QSTOG1yShSvatNu/4WuEtmb3LjFxVwxzwGXqua7VTkhJ+lLc6oRKqEZNxYZ6aijoOiruPGl2G8BLUn/jU4qm+A63xBBVTrRvyXgKWOrgR18/GfRfg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2016 02:06:31.7474 (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: Quinn Tran Soft reset and Risc reset should take 100uS to complete. This change pad the timeout up to 400uS, which should be plenty. Reviewed-by: Christoph Hellwig 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)