From patchwork Mon Dec 12 22:40:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9471463 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 A73FE60760 for ; Mon, 12 Dec 2016 22:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A195284F7 for ; Mon, 12 Dec 2016 22:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E27C2850F; Mon, 12 Dec 2016 22:40:22 +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 47467284F7 for ; Mon, 12 Dec 2016 22:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752272AbcLLWkU (ORCPT ); Mon, 12 Dec 2016 17:40:20 -0500 Received: from mail-bn3nam01on0052.outbound.protection.outlook.com ([104.47.33.52]:58272 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751697AbcLLWkT (ORCPT ); Mon, 12 Dec 2016 17:40:19 -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=3pH4/gHBWPHHd7Mzz5V3pV0+/UBIIjGYkhVz3nx+fZU=; b=G7rbuo93YVJlvSZMx9wWr1YxuO3wUSfsUyBrf5h162mLBjRDeMwjpGnyV34sVhsxWEQllZIRM6b75FJO8iYez7lrKX7LPxxoc+s7TagtAWjGcmu+qs0YUTBcIPa0CiMM+4I5NhnuPb4LbeNp7FannIulL4pGY3LWs/1VpsVdijI= Received: from BLUPR07CA066.namprd07.prod.outlook.com (10.160.24.21) by BN1PR07MB199.namprd07.prod.outlook.com (10.242.216.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9; Mon, 12 Dec 2016 22:40:15 +0000 Received: from BY2FFO11FD002.protection.gbl (2a01:111:f400:7c0c::170) by BLUPR07CA066.outlook.office365.com (2a01:111:e400:8ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8 via Frontend Transport; Mon, 12 Dec 2016 22:40:16 +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 BY2FFO11FD002.mail.protection.outlook.com (10.1.14.124) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.761.6 via Frontend Transport; Mon, 12 Dec 2016 22:40:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1111; 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; Mon, 12 Dec 2016 14:40:10 -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 uBCMeAC9022060; Mon, 12 Dec 2016 14:40:10 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBCMe96C022059; Mon, 12 Dec 2016 14:40:09 -0800 From: Himanshu Madhani To: CC: , Subject: [PATCH v5 1/5] qla2xxx: Only allow operational MBX to proceed during RESET. Date: Mon, 12 Dec 2016 14:40:05 -0800 Message-ID: <1481582409-22027-2-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1481582409-22027-1-git-send-email-himanshu.madhani@cavium.com> References: <1481582409-22027-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)(39450400003)(39410400002)(39840400002)(39850400002)(2980300002)(428002)(189002)(199003)(356003)(8936002)(50226002)(2950100002)(38730400001)(5003940100001)(8676002)(4720700003)(69596002)(42186005)(80596001)(86362001)(36756003)(2906002)(50466002)(107886002)(48376002)(33646002)(6666003)(81166006)(6916009)(305945005)(110136003)(81156014)(189998001)(106466001)(5660300001)(626004)(47776003)(105586002)(2351001)(4001430100002)(76176999)(4326007)(50986999)(92566002)(101416001)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR07MB199; 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; BY2FFO11FD002; 1:BAVVzVZRM1M0oIwnLbYC/EmR+yxNVH1JmWmTs5RK/ZFO+z8m2w3ymTm78Rpgl2oPuwX5reVVQKBsIUFtbvvBuFHaPZwIud9Zc35OPwQ2hPSZeGUkMbYzzomR5Hx8QnNDdKUrMXukVOQ9P0UrnNryJNnC1zRA9XA3JLS/u1FECxZT+50FwLe5YCe6WL9Z9G5CgKyIv3XtYKhx60eNmj1y/431ri6+8KzTpSS9792t6K2HCihKHExzqAfm3HZykGv6vvD9b6U0S2HeT75Sf1b6wUH27qXyq+omBkRRHi6M+8c/6iGvhltErEN2mIn8Zu9cCnBC7Y51/62FETjqSs720yuveWVJ6+tMRWuoX02pAPHgmHl1goKT3aALfwnKQvmOg2Qd6v4noIR1QMTkV8T5PyjptvukwyLHM9h8tS+wZHB4wTTZ8ydpWQy1X+VeDHGZHyuzdklzyZFEiHAsmAB8g4YVB7H/HrhqcnHm6FVyIWPqvyuIdjUHE16RyETMOPsq42AoMfi6YyRnFkLhShILV//JWMhW8Q0ZH8ojymN2UPgKgvo1UBpJaSLlbDFpl4ap X-MS-Office365-Filtering-Correlation-Id: 7d6e4a2e-e62e-4f83-c10e-08d422dfd7f4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR07MB199; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB199; 3:2yOyFPVJB3VPRcCLy4S4ObfxGIl2AtRWFJwJHTlfPkgmMT9e+iSNC54XeydxV1LUHkDCrSsV3oMHzGHZhCB0zVIutNjHjFKoJPkHNKVl2GgTTOX0H1MEw0REEoTco8GCJAKGtvxOIJKppzO19NtEv5ayGggJUOkqSCXfkeI1R068V41pGmmiVgp6sge9STKV6DrxvBPJz4SR9f6zR4aSN3/t81yrllTys/Q7MwExMQqHwe9tmESaY4xZBvMlKtoI5EaZyZhfN65EufofnB9qwYAN4g+T/cg55mnM1VbnGXJ5GwoxrdvNPgmZbyn2tcr06Oj8E8ADdggzvLIkv4m3pdLMK/bIwE/P7BSZp0AmxzF8ef38VtmhzM/o4bvRXPEv; 25:KaZo5gJR8c0knMTDdY9XWPlyXO0Kupg3iCLWz4cfMMqAlyxncRZPXmC87ZrFH2UiMLtBAB78UMUkb28ZjOD7hXJRP2E3p2x9t6uG+pB9iVlkAGo8XUlZKLaKiR2nwz3Q+7zd4nvZVElAMX13LAkra3iG6yk0vs2rMHtQc9tvlxWkOXDrs3Fax+7drH500h43girHn524Fy4Iu+hCvyVy/U+CTo5sD1A/1YqiFdmWgtPA9M9xdRAziLxZgHbokDV/xrT14v/bvWpA8OsHBoz1+vMPqqLcfxQGqA4KLpFoaunBrcUK0Se9GBmaIvImSBz29aUMzxRuUthhQFmyIw8b3p6dG85/Pthx6e+RvZ9iCwOmCiAuSCr2vfvx/d9OaS825+N8f7688/DnjefF21BUaRY3mq4cRcvdFc6JNYEPwARmuB7HzHHneOFmEZQ0S6t1xIC6oEigqnwaaVkqFRI1tg== X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB199; 31:41ECnqf5Go0h7OT2GwlW3zhFBujxjuyFN4OXCOr7HSzjHYzpnBOA4VX/rNQXKmvREAeEFRHrm3dhcnkyWjhw3sNVHl9tLUHltz6UxZG/qoIcIvWNfupQpKm1UR4R/YUCJK4C9ahj91Ae2YUkxxJvA9eIbrorC787XiEm6eZAkarpzwHS9ynpl3hJrjEhmU8ds7QAOZQIlhj0W4CppQuwo93CuUFKWouqywXjdDk/Oe1mxbYw3GAlQ/JDAw0MIMxfp35omqa8X4NYxEMFUpEkYrN8hEfUyRy8xX+tkXBc+ng=; 20:KyTUT1ybjt8C4XFlOlyvdjF/YTaVap/WpzrW/m4UNsGpi6ChT2rP3eJu7kbBR5pJrnXXvsxevx0AH24qSy27nmOxXEDj/yuFgbMzJyxt61G3CDf4XxncV9VksiKyyjp4KP2B8w65Ym2ZCJfOOgaOxRz1/Wg/ox8uQQWMdsOBEnpbAfaCGtyvauz4pZDdTbjjZHLVO7jA4Y4uQHyNIzXzEkEPT8lFl2ukEmUdFbV6NxQvlABeoVgXooH32wvDh0i1eo3AOVpFirIGWak/4skczHeZs76aOQCkjhy+xKuhmDNWqwfb90dDMwaHqWwJ5OERVxCm2tu1i7s5Sj3S0dR5hejIoTy9Ws52MQicbECsjhIT1ATTZXu8lGEknjghIf52Sqn/aERrNxZ3J/oeHt7N9CZ6dIbZHXjx/2r8SwIws8zn9hBBkTjJWgYAqRs1iazk/f96LIMbTTYfD7hCWbI33S0O4HxV9Dg0hSnWPONBfYELYMX4qvjmkfXh8nRpIIFi 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)(13018025)(13015025)(13024025)(13023025)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(6072148); SRVR:BN1PR07MB199; BCL:0; PCL:0; RULEID:; SRVR:BN1PR07MB199; X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB199; 4:sh/lBYWNxkwZeHkTCfi34V+YDADwp7SoGBdexLxnMEMQBmImSJ0jfyeuCjG7RZWko/PDuPbk+UvtyxdnaVjxfu4a4lOvecfhgQ8GJq2WJrsnT1ja2H68E7cLEdWqwJO2zyl4agTesY4Mht7WSF0RG/ZVDeuQBknfUb+Li+SVxcHQwaXnYSm799LsxnraDsovtzZUWnh8Or99FV7n+H35DLsB7aUp2Vz6w/PCu3RzMMe46Ik2FoOV/oiDtDr2CpRZK7MFykIzAEueEFmKnx1YRVws1HkkC7r+1OQiTyzxy+VsilJbI/gjFeBp0mD+ktMVcqH8QFUGTbBarvHzGzSceB9aOa3QqNkwDYZuGDmG8bkczo7dZI8nI8g5aDMBmRHEMrBzQI+G/TCDe+6Iuc+NDyMbSdYKuC2HcB51UbF8FztV9I8hsau5EvNLNDFHmnTiy+Om8mxHvhmoy7xmITRntKON88KckjhK4YimEq2jQnGStvvteE+jn0S0JVm/VaDsADTvOrevVtA7yf9JiKLj82YDqjnmDVvw02H00m0hnYVA9BqUKN62QHftzCT4iaO6a600K2ZFpO7MBBA4QIgE7jG730iiPLRxgwnCCPhSK2IF6rjTTN51b6l3fTdWWhjCr3geRVt/ka1e+RAuZyVU4wuEgQgrOwUS9eWHS0HA7aE= X-Forefront-PRVS: 0154C61618 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR07MB199; 23:6LJ2oeY+kDqjwWdQN34Jwci843q41ZFWI5kAvZck4t?= =?us-ascii?Q?AFlj5lfk99pNlEblGDoe3hKNzaZwLoqIcucoh9wFZO/p70F053YtLRXXIGOe?= =?us-ascii?Q?i+3551DQMk8YMvdR3OegBXBA+a6wICbs+Pq42njTPagk887xiiqtTQk1GE6g?= =?us-ascii?Q?Bp3QaYIxY+7X8xjx6+2YwyA/L+OSqgfPod/eRKG40VJvU28sSSoywlt7AIIV?= =?us-ascii?Q?OO3zVoBCDQj2E1hcXaTYpChFS3CU0JzTTggKlg7cxZq5+nPpF0OUSXgwyM+1?= =?us-ascii?Q?NB1lS3xCXH5uhAcgt6NfVGOqxgNZztA+unV0WBYlbC2V454tZrD05ZgWvrtB?= =?us-ascii?Q?DXxQYn98bGu5axGv4aoSU4NQjqxv5K7I0BSjPxSxt1Agj2Vt4o+ryyl1Gowo?= =?us-ascii?Q?KoIBufwjLJuudWdFmRUIVrw59t25HevrUy+Wys8BJ5RbbPD3/PpOev//JJjQ?= =?us-ascii?Q?696xijRra+0ZDwBJhL6HTk/NkjQNY4Ew6dGfbJyrVPHdB4BXrqYhhLmXEj1z?= =?us-ascii?Q?eB2qadowWFUul4srl0jyWv6rmk7A9f9R/hQxP1q1ghd15JlhbhJWKFztesy/?= =?us-ascii?Q?DcOyI9EOE9UEzIe8CiSHSAtz/gK9BhHNVmKFybK16mkhof+1KvT15TpRdGG7?= =?us-ascii?Q?e5oPFhLus5JknJYPiggguDAQGiUUu6DO3xCPfKrOWWHj69FT7YAhgNsv669j?= =?us-ascii?Q?ofTctGDZxN4ikgkiAx6wvfEJgf6jbMcPfQ0BgqQ6gGFN0UpXFOxFoekNruRD?= =?us-ascii?Q?lDD6ZZT9W1gbZZg14xIELuPa08Wf1ERT+rxKzaT3+a4enHKToNdLxtYVigrq?= =?us-ascii?Q?fQB03fi+PjtwZYV9aJmhMYSS4R3nu3DiNMXXyo6C/quy1+//kh2u2285+F5x?= =?us-ascii?Q?UTYJo6w/IAwN7mNomgfBt66GCqomXnqJRgtPLkm9DgyDCNgRLpsG55gha2Kn?= =?us-ascii?Q?fUt8IjPs0W/T0JITYZEAOx8swbnGK5BANd1u4/NhHB6T3zdut1SYN7R0G4lB?= =?us-ascii?Q?uxQtJ9gNVWPovmNFNXysqB0D+noQovyc4e7vZkshTNdgjIacZdtIch0NLHET?= =?us-ascii?Q?Qq0g4YqFaK4Ff4ZOGK5y9sX6oYMPip2sJ6dO5bgJiXlNZ8cOq56HlbcHW/hC?= =?us-ascii?Q?U5mZ8VqQMYk5knAwaJJfYX7LGGiAZ5uz+SGyaiW9Tq28c5KFrBEvmCp0K1xr?= =?us-ascii?Q?wwOYkI3SATK78=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB199; 6:0HxzAK4jTYzwV+7cStLJ7WDjY6eFHFqWGTvTkmR+24AFo3mh7eA1eTIaJjeqTBJRHoLglJB474U5zOuddhbJaO4buNmBKYLIOJUmldGEHfNYInIL7JDSuiBORQCROWc8uLd8oJFPvqRhlTFuGQAa7rdb8xEImOFuHPH0UxEyNUzy7hyA0fpb+xqjjN0gXT49b/eK56ooQkGPIGBj39xHms7ttxcocwdy8yVnA9C73hrKxIs4nlxq/c5qyCcbBHvubQs6NfI4TL9Dfu+Vrq4YOhShxAvcHzmgYmy/LMXgUUuOMBlSJnOaL98UgZfuIuYpCwq2jJZQoqJYp0CjNPmE9ZGYscy0ykdbnnajqPXaZe92ONwcrR6vfVkrfl9jt2mMwUOZa1GXXZn1iiozjTSPXjeBqKcG0pWj2DzNoQaLxuI=; 5:h8gOVMxZUqyohNWY+e/lu3wHrertuDaQWiq7YNADTIwL74VEy9w7fVArKdGRzQlJOpCkMMAJjGglz1Ti3gC53AQk7p+sByDpL2i9MTfX38MzGKkOUIqEJi7NbExE8C99j57ajujecx8HRMnBt5s9Cg==; 24:ze7QJ75Iv9ficnrbpbIjY0qvg6YY2PtM8Y+U8tFNOP7eo2tRJve2aZSQVaH8b8sqohX9q0NK045SYRXxMiqhXe7ZclbNrGR8u01a6SSirv4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR07MB199; 7:PXcGMmU/uiqqDeT1TfJN1/7oRWEpnUMYYKxI+yAa6tCm9Bn3dmTgnoI4lMYjAMwF6J0ow5rj3Ougupgv3dR8YQSini9d2sQRTtuAYB9op0BhOf6wWNNMkUV79POc4ZehpufoE6w7RvqP+/P0PnSZ6k1SYwRHzYK1vhysKp8+4GrzPEA3wPe45bQCWvZ3nUjXodXfif9+mMHIAPvG+WjWK0F2joGyoh0iV0OfhOZJN0Ru64lM3kSEt9KgSShpCcjM5/UDC2W72GkySEM3ZCXm2B+b9ONcbwt04UmUW0CMXoGs3NswjEcgK8NIQESfMQw8FYv083d2eXl13cVu9I0Jco9KgMo1tc64E8ehUCa+944ZLDApwmfdPbY49go7DJcX9g1kBp+lmgjTX8uwLD0I7jd9e3da+piGChz2Kx+o/s0qCN4vdTU7BeN9WD05p57enxpy29C30g/1DD9H1dOjvg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2016 22:40:16.0247 (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: BN1PR07MB199 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 This patch is allowing only ROM mailbox command which are necessary to initialize chip after a reset has been issued. In a target environment, there could be a user space daemon which can issue statistics and other management mailbox command which are non-critical. This patch will timeout non critical mailbox commands immediately rather than waiting for timeout, if driver detects that chip reset has been issued or chip reset is in progress. Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Signed-off-by: Himanshu Madhani Signed-off-by: Giridhar Malavali --- drivers/scsi/qla2xxx/qla_mbx.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 23698c9..b31c36b 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -10,6 +10,43 @@ #include #include +struct rom_cmd { + uint16_t cmd; +} rom_cmds[] = { + { MBC_LOAD_RAM }, + { MBC_EXECUTE_FIRMWARE }, + { MBC_READ_RAM_WORD }, + { MBC_MAILBOX_REGISTER_TEST }, + { MBC_VERIFY_CHECKSUM }, + { MBC_GET_FIRMWARE_VERSION }, + { MBC_LOAD_RISC_RAM }, + { MBC_DUMP_RISC_RAM }, + { MBC_LOAD_RISC_RAM_EXTENDED }, + { MBC_DUMP_RISC_RAM_EXTENDED }, + { MBC_WRITE_RAM_WORD_EXTENDED }, + { MBC_READ_RAM_EXTENDED }, + { MBC_GET_RESOURCE_COUNTS }, + { MBC_SET_FIRMWARE_OPTION }, + { MBC_MID_INITIALIZE_FIRMWARE }, + { MBC_GET_FIRMWARE_STATE }, + { MBC_GET_MEM_OFFLOAD_CNTRL_STAT }, + { MBC_GET_RETRY_COUNT }, + { MBC_TRACE_CONTROL }, +}; + +static int is_rom_cmd(uint16_t cmd) +{ + int i; + struct rom_cmd *wc; + + for (i = 0; i < ARRAY_SIZE(rom_cmds); i++) { + wc = rom_cmds + i; + if (wc->cmd == cmd) + return 1; + } + + return 0; +} /* * qla2x00_mailbox_command @@ -92,6 +129,17 @@ return QLA_FUNCTION_TIMEOUT; } + /* check if ISP abort is active and return cmd with timeout */ + if ((test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) || + test_bit(ISP_ABORT_RETRY, &base_vha->dpc_flags) || + test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags)) && + !is_rom_cmd(mcp->mb[0])) { + ql_log(ql_log_info, vha, 0x1005, + "Cmd 0x%x aborted with timeout since ISP Abort is pending\n", + mcp->mb[0]); + return QLA_FUNCTION_TIMEOUT; + } + /* * Wait for active mailbox commands to finish by waiting at most tov * seconds. This is to serialize actual issuing of mailbox cmds during @@ -178,6 +226,7 @@ WRT_REG_WORD(®->isp.hccr, HCCR_SET_HOST_INT); spin_unlock_irqrestore(&ha->hardware_lock, flags); + wait_time = jiffies; if (!wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ)) { ql_dbg(ql_dbg_mbx, vha, 0x117a, @@ -186,6 +235,9 @@ clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags); spin_unlock_irqrestore(&ha->hardware_lock, flags); } + if (time_after(jiffies, wait_time + 5 * HZ)) + ql_log(ql_log_warn, vha, 0x1015, "cmd=0x%x, waited %d msecs\n", + command, jiffies_to_msecs(jiffies - wait_time)); } else { ql_dbg(ql_dbg_mbx, vha, 0x1011, "Cmd=%x Polling Mode.\n", command);