From patchwork Wed Aug 23 22:05:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918565 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 DFC70603FA for ; Wed, 23 Aug 2017 22:40:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3104288F8 for ; Wed, 23 Aug 2017 22:40:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7F1828A9F; Wed, 23 Aug 2017 22:40:42 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 68110288F8 for ; Wed, 23 Aug 2017 22:40:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751187AbdHWWkl (ORCPT ); Wed, 23 Aug 2017 18:40:41 -0400 Received: from mail-bn3nam01on0084.outbound.protection.outlook.com ([104.47.33.84]:19264 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751005AbdHWWkk (ORCPT ); Wed, 23 Aug 2017 18:40:40 -0400 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=RExnkc544EiUdiWE4pHqu7Ifhxlx/6UVlxrHZT60/04=; b=mkjQt0vLGz27PehH2SA2HPX19QthyzUVZnzDxUsGhkSMZrH9FmGdNrq5jxUkIYEqCNjawg6P2JOAPLmp3tyK6Q1sAtKEMUgxM7DJPBL2rQwwIITm9vRYbCugIL1QSReFiKL1p7VCwVlqXlOQOKZSRA9Krrl12cIqcUoAUvGB7Tc= Received: from SN4PR0701CA0014.namprd07.prod.outlook.com (10.161.192.152) by BY2PR0701MB1943.namprd07.prod.outlook.com (10.163.155.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18; Wed, 23 Aug 2017 22:40:39 +0000 Received: from BN1BFFO11FD031.protection.gbl (2a01:111:f400:7c10::1:154) by SN4PR0701CA0014.outlook.office365.com (2603:10b6:803:28::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Wed, 23 Aug 2017 22:40:38 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; oracle.com; dkim=none (message not signed) header.d=none; oracle.com; 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 BN1BFFO11FD031.mail.protection.outlook.com (10.58.144.94) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:40:38 +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.347.0; Wed, 23 Aug 2017 15:40:35 -0700 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 v7NM5TNs003262; Wed, 23 Aug 2017 15:05:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5Ts1003261; Wed, 23 Aug 2017 15:05:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 28/31] qla2xxx: Skip zero queue count entry during FW dump capture Date: Wed, 23 Aug 2017 15:05:22 -0700 Message-ID: <20170823220525.3115-29-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-1-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)(2980300002)(428002)(199003)(189002)(8936002)(1076002)(50226002)(81166006)(189998001)(81156014)(356003)(42186005)(305945005)(48376002)(5003940100001)(69596002)(5660300001)(478600001)(50986999)(50466002)(76176999)(80596001)(106466001)(105586002)(101416001)(87636003)(8676002)(47776003)(4326008)(626005)(33646002)(54906002)(86362001)(72206003)(36756003)(6666003)(2950100002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0701MB1943; 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; BN1BFFO11FD031; 1:hUl9zEylFajraWAovYWfPl0+o3dKYeI6OrSwI6BTFOKTlyy+W07rbYiQdvc/fUbY0ecZ/DQXmHG5lzyu6LLZqPjCncYaMV6ajUOrPe1HAfMc6wkdA5FITmFr0riykbOB X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5f4554a-44ad-40d3-2ac4-08d4ea77fa21 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY2PR0701MB1943; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1943; 3:34Juxr24x75rFqBA933AFI2z1thMScTtHf+G1/hQbdRDd3Pe43DVRFjJ73sCXahYVMm+IM74P00z8F5yPKUPy22c/YL/enctH2vPgsKQe95mDMjsXBdZTMXHP5QZztaY8zd1JMa5PfyQ+MP8pErZNbBHy8NsThMPdrCO1WmB9ONRpwU5NtP0GcP0ONMFkOx6opjMGHOxW3cFg+xYnsP4D5Ik+1HlKP0vI/6OyUKx0B2030b02AyP2FShoumBeI4dhs8Q4lpnxM9VEmAvifpROqn4GxF3aQVb/0MVnmeN8V+ooHWF7NzzjPG4iQr+8faohfVxzQTTZQgDYukjwpgIow==; 25:idfJFAtMZX+CAzAs3IeWwdUav4dqGcwKjAHSlHuwGCT1/DFyqbb1xYG5LQwzytoeFOlIw04KPAdpOdU6Q+PdouEZUC4iV3fncRfxR//0WCBQhlnd9/OfCmeQV8F4dlYFXMUna+NBIU8UD8iyQDZaDoUUmKUc7fIeOMBFKDIxHeNliiS1Soa2Frk9c05QAsn2oNWvf1i+70w76LaEKLzzbFi2RU0sdf9IUzipFimDukhnh5UfT0nucwcq6KqGmzytG0NHg+Ju58cuqyqtL761u8+Ctfymd67X08ahbHHf/FVbwS0eMuJmxsxAZ1IdvrFppms+Cx3ytgcc2OfTxi1WXw==; 31:7ykL7N136uTrvoOoz7+33rXCTFy7qL4eONIAv4NUNzevdAqqm1T83hYUfNIj+tcRqzn4hVTxYG4KgGcAMheXHkWc2B4UgXSaul3us1lQGNSP96tDNVY58O66jzi0ntug6PYDH9fj9Qw8hzNVDNG5/BV9SDZcgYF2AQXzafE3YF0Yj6QVnJlHBSdrCftfydIizMnp3uuihI2F8dgAPpFenDER3NicrwuJWjSlEpdHj2o= X-MS-TrafficTypeDiagnostic: BY2PR0701MB1943: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1943; 20:yTqCar5TyR+4jOYbY6M8TOlQtd4KO54oiZrwYHIMgQJoc6xiiqRb8QW81yvHBOtwMUt3zTCA9lUrY2OgX8y4OlV6GD58N7OkxLfUykDL9L3S0JWBOJxo3Hg/YzVBVhjrQXE+34n6ggLO1t05dRutiRatphasMwIj30HYDiZqKSVpxtOeXXVHPavszd+1hoJ5+r+hSdsB8A7GTAw9b6Xk8j8WoB0UZ7Frax9snzgZT25q1K2tdT2U0F1xvvP0rcIiYV+M+0gtYzvYNYlwW0jgMpV8/euUuLlr4yU5DvrwL2BtGR2jGOcR3hJGkmcIlb84xfJhTxNAHwTxvXl+Vkc4X/SUtCH/l+YdAafzWITixhcEKVj7ZDizFzowNvsP7Rld7dkZ/1mFwKzbVGF+TCFl3MND9OdJj+uKDkeKJKERgRm0WuR4e5aFDUVtzSVR8FPLaZ2zNnj6mCuw20Y9qZXJhHSVkytYEQRwzfDxEGFEClHCD2uY9ciDD0kILCwyfuBn; 4:/byssE1GOc+gLv9uWdwBDcOb+v5x9MSFvS2mMhXQRx6ggQ0YiGztNIt6QUeNrmHXfZsRyD8HfsTUeihFGxX6LKx4idxlh+QDNjZ3aE6AiH7P+7e5qYFqyVvl4da/HAfYWUHLqQI537sPwf1Twml6z9bL+46XMbHt2Noo5B59OxrBRT92RBLFAamqlVPkwOJgDJdy6dlBZlGZrpcb/AE9fepY8U02kpHhbt4hm3Z6UDsKAD8dlre5LI14vtRU99yo X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0701MB1943; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0701MB1943; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1943; 23:jkOorqjI9FLAQDrVG39PfN6TmPbLFG16kYolqfWXi8FrfL10IfhocjYHTWBkVxcQvzzBQOgHDmqVIARosxdhvnhnpPBzgNpUCkGxABhn6IjkLG9LQm4O4gQq58EAu1drYNn+T3z7SD3yOONd3uQMQgqY1SgrMEcYfA7DZgHa6uPu1cPSZgznOtYVRDy7rGPUd559qTwKq1B+2jn3x0kVY/cfRZgdPIOgxwtAgVsix1rVYHJPIfudY4Um+zIw14tTVBzXAfsCGsN6lCkeuU516N+Izf5gMDGi23ZlVE7YQy5JVmlEg1TyzOavyZwXUWnZsKrfSfeQfw/bZWrp1MGOLHgrTJsryDyxo/ZfWzXVPYiIlCBJQ0rz9TGmcKb0oJg36izuK0KkGI57N8D626tGmRxm73EeZeqnXgfJ1uWX4CmbWNn41h/0KSY/zdR1u+so3BzqXHsqUbZ2KY4uf/b72n/fF3SBNG+lgKzDzl6y+A4dJqZPCBarwl9eapXHyFMTrer3RmOcjXrqKvk9uD7s41RtQoPJ2yGXX98BkEl2WJp3gU9mdvRmDDC3kFH+2oJ38WYBkgSo2wbr1HqEOyINBcTBwYo5b2PL1bs+gEd6lySGXpkjBarRUlicgiJ0EjIbq0L4ZCbChkEYK6E3F+JjdNGDb0tPSr8KuXwFKq0DCeIkRwjqevt5Gf+SoQ6jgMhE6PMij8ESpeLBVAqHTkC3An7JnJqAj/OC161tCyCUzGdPAF4Lm+mLbYzbf8rA4SdRkIZpIC0I7kt2a1+kHR8JOLim4xw62Uz/GXf6OKSR0Sb1swXPlKyuT12c2K7ho16KQMMvEF3UjQ4ibPgMU3emxBJyUcM3BA4eHiz/q1/KRlSOfsCCzTUGkOwPMxMopQOtJpbTtL1n6auLsLSMXHj2uLMTy9NyAbbLXPh0CiA 57vKNqH4+4VZ1P6Jk0OKlso9D X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB1943; 6:zS6NakPksPKhUBcqnoFW80zhPT45k9qPdxXrUsPfeDCCNzO5FCr13rhdva2yqjeKysb1s88LzTo0euKB/Woo2ZCq+nJde5c1HRT+MAgjUZ2TDpbQ0pj3uyhUQgX0gbav159DsiJZtpZDEvSemcRAIrE9YxRtWcHmDRUOkbD6luyvrC/lwHHACDKdzG+smcwyWAeISQkWKN0iyfm6hIq4dFI8ve/a6Ty5ZniCMCtcs6xSrVLQZO6ZjL7Mr8q2bNu2mAyAWMKJ825gwlCloDFkNQkqCI9UERPBTAG6W71lJy2YVa79UQwYG79WVUJ+7J3Iw4U3zM+GOtBACAUdHgGfng==; 5:oCkfVOS8NXUM1Tx4ISV8thJSq9jWmqmv4dwq4PdHM8kkUnJLNXYY8U4ywsPeh/DAIZyj54sEUJ0swcMKWCp+/bqpx5j73aXSf5EV8en16LsXtp/mEZmN7mOPz0/EL1Q0glyJm4O7lNQo1Lnb6aPTOg==; 24:BeplgzLCShZ/aNWAiTVi64QGWFOgRUvsJCfRBFVlidmK/bE/ryreHhGyYGKNnWyJAhjKBWquiF5K9wDzIWx1+pulfK6Z+8vshvNxiqxgtuU=; 7:o3YOhRM1Xd/Y2YG+9rmitLjJZiURvT5Bg10qEgGB3S1Ett2UZ5hcOZjAIn3ErESt6iIP0JiNw+xGvZltsQmUJYrpIUUgviWDk5Az5fZwQ4GB93RVKhEPieJd6ovr22Vqwy8BiIS/2c06s5FbWgVLdoYSWuj1SRHUEd5Wl8yiNnLUVM006Fp6cUqUrQt2B3sW+0gCwL3DsYSfhKJnBNnS1rdADmbey1tf6w/9yK5XhYE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:40:38.1135 (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: BY2PR0701MB1943 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: Joe Carnuccio If queue count is zero while reading FW dump template, for entry T263/T274, skip capturing those entries during FW dump capture. Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_tmpl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c index b18646d6057f..733e8dcccf5c 100644 --- a/drivers/scsi/qla2xxx/qla_tmpl.c +++ b/drivers/scsi/qla2xxx/qla_tmpl.c @@ -443,8 +443,12 @@ qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha, qla27xx_skip_entry(ent, buf); } - if (buf) - ent->t263.num_queues = count; + if (buf) { + if (count) + ent->t263.num_queues = count; + else + qla27xx_skip_entry(ent, buf); + } return false; } @@ -692,11 +696,12 @@ qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha, qla27xx_skip_entry(ent, buf); } - if (buf) - ent->t274.num_queues = count; - - if (!count) - qla27xx_skip_entry(ent, buf); + if (buf) { + if (count) + ent->t274.num_queues = count; + else + qla27xx_skip_entry(ent, buf); + } return false; }