From patchwork Fri May 19 21:53:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738251 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 A8BDE6020B for ; Fri, 19 May 2017 21:54:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95B2F28562 for ; Fri, 19 May 2017 21:54:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8905D28573; Fri, 19 May 2017 21:54:11 +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 1466028562 for ; Fri, 19 May 2017 21:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756821AbdESVyK (ORCPT ); Fri, 19 May 2017 17:54:10 -0400 Received: from mail-sn1nam02on0041.outbound.protection.outlook.com ([104.47.36.41]:5734 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756806AbdESVyF (ORCPT ); Fri, 19 May 2017 17:54:05 -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=P8XhOqGgvbsafkc4LU1sc2F2F74IJZ2DEquq+fASx/w=; b=Lt9lBD9swrhQsK+lcWyThRRtA4LMT7oO3G8Fr7pOzxb0annTAyApi9EAZGU0a7KZnbBLlu+JrA9PBWB9aoJpHfCBVJYgDtLpyaXU0CZ0K+eB/jPO/8CqZyuW2ebEaaTT++iox5dIzFZL/H9HdyU1SZd8QiFqVMHN+ukkJTNMbqQ= Received: from MWHPR07CA0020.namprd07.prod.outlook.com (10.172.94.30) by BLUPR0701MB1009.namprd07.prod.outlook.com (10.160.34.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 21:54:03 +0000 Received: from BY2FFO11OLC009.protection.gbl (2a01:111:f400:7c0c::112) by MWHPR07CA0020.outlook.office365.com (2603:10b6:300:dc::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 21:54:03 +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 BY2FFO11OLC009.mail.protection.outlook.com (10.1.15.0) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Fri, 19 May 2017 21:54:02 +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; Fri, 19 May 2017 14:53:45 -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 v4JLrjTJ002227; Fri, 19 May 2017 14:53:45 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrjCH002226; Fri, 19 May 2017 14:53:45 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 06/25] qla2xxx: Reduce excessive debug print during 27xx fwdump. Date: Fri, 19 May 2017 14:53:25 -0700 Message-ID: <20170519215344.2168-7-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519215344.2168-1-himanshu.madhani@cavium.com> References: <20170519215344.2168-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)(39410400002)(39400400002)(39450400003)(39850400002)(39840400002)(2980300002)(428002)(199003)(189002)(9170700003)(76176999)(2906002)(50986999)(38730400002)(1076002)(5660300001)(101416001)(106466001)(305945005)(5003940100001)(105586002)(33646002)(86362001)(50466002)(80596001)(48376002)(42186005)(478600001)(189998001)(36756003)(47776003)(6666003)(2950100002)(4326008)(50226002)(81166006)(8936002)(54906002)(8676002)(356003)(72206003)(87636003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1009; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC009; 1:d7LODQdEPUxW/AiqvdcvDiEUVotuDD4FmP32U25C8mDGK/liZe74ZJzf5jSHPWY4hG8JEUKxSGb3SEeH7He3j6BIUYEXn5oY+xkh1a80kOwU5aNc8Bj2Rsym9KCcWkghp33oBM9re+xuqIcU8hl779M7EeAebE/regx9qecGhUQNLrC1gdrEv3tldUbOhJBcaDz415jxjyR8vuxYxdHj6WtcHTqmV4U0u8EEVBJh3HGndJZXOtceZNGJgfseC+xaOw52g5VicfBvkKDaWEdy3nWZLE4TxfaDY6MOW9zHMa/ZusVF+pv12XuwOqv0UCji2xs6Gm+YahDWHvJxMhJzJromKXl2X5UcAi02sv8ZEKFTgu9dtOevPszIByBw3FnVDosWq2VkM3A+fQtQTQ5HgvQWnp+yXeLAVnlALeziOFv6Pe23EnQYBDiU0uO3rAjQbGedWYyhLVGiwB6mhhZOldNqf9YGTz5q7y5VlGSE4PWxHJLgxKp2oHob83qPM0nVUhR56vKSMyY85Rjct5S/hYK2o0KMEWcqHUPyXMnd4zvcJVvma+vij/1ASO9aMeidXm8TnmgT++C10+1ntS4dbA== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR0701MB1009: X-MS-Office365-Filtering-Correlation-Id: e667fc64-acfc-414b-12c9-08d49f019049 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0701MB1009; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 3:YBhfDRK4/+SO/5VskbBCaw8Cu9MFdyfBSGrMzDS+9liVFxFg5V5OftP5g+S8fBGR2m21zDkE9DLwcYDb8hEGNM0B7UuudFfrCuvWFy+cnzIo2hnqm+lTaMuwyaf/AMURBBTils7Pg0B5Ul+rrEJgTPCyo2C2rGKrKrIc4wvlD6FAD5XwO114PEHS1HufNZm1+CMGUeoGOMHhfl4fVvtuGqFrHBcBcNdl0ENlbJS71vsf3fuWgAosubY/aX5wLyPUhe0fGvCqU9zETOeTfy6tpdzuhsF6ptPHCuyBqHncI/GlTxMPQE3P7ppprelCzXWDA27r4CkwXtxprClEOOtXO5HbNtbKNF14wEEgM5eudiOLSo3e2ZiJqwHO1UzvdJsNiPK6sb0YNhImjhRa6Bs/8mS64+4456Kp+LGpGKhLQoFXrxoDFsdUAJAqh/CuHQw1fGT8G0sXb6CmPQRB9FppqyeqA7dyKOAzUiZPA4k2nX7hh8RCLS62AtcyzNx/btUm X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 25:sDqty5hpkOv8crN23MahpI+r5Ibcb3iOfCTx9KvklvJuBzTLjrcQ2jaSBy30mAT7wc2M/Qv9hdl/pJjJuv7LfmElLXSYOtnkYrCQ8grUd3XjhJ+2kBehR2a94eyeoBU54/Fh6pp1elTpb9dIq+NeEhn20Y8HuvYsaTRTqKy1HCfHPOKXowwlJ5Be9MRgTGyP0LI4FapK42/UUfh485sAu3vqyBAVdLZTAoDBbb+NXX44fe/TlYV5W4dB9KfodYCv49HXswziR/x3endAhZ5gZBv7xihGgSynssaB3fnc4w8yreHnpRkt4pQQ0hIpEj8sIBD1n0FvjWPjiOlO99lvZW2DHfKM/yo4/aauPK3fHXuAfx/TsAGnx08Af7nbd1iupVJdakYaPd57b+3fMVoXhlmyQhncHZn+0c+NseflftEamrpPqTdEi5El+Rpmt6+58efDmPFeCb+u4fDdB/JYla1iCwQTdQgjHfLzIgzOKy4=; 31:UmJ94cxX33lP3Y3O9wRL7N7boFi/gKoe3pMhfVJVFRipyQfveVZwRhTv0OfLg0bufKlzcY0o1GKPP5VOhD743bJAtoYjQA9FiFOXhFSwOkc7k/3gibqfdqT9rIyzvjUz3+CyNl0BicYvQMJwYhei0zHaf2Zf5xEOuNqR3gSLqjV2+HSsmM+Ld4K/4POlL+qjDBoRnLHi+X2EBX4ylbWK1D5tOY3QUDS061feF2gHKmhbNHlznmPW6tGEoCZlDO4HgzaZsrkjPf1QPD5Mf/nc3g== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 20:U2guIGslXdfxb5TOB4ZiPk1O7Vy+nVYUOSgmYcJvIORHXii28o2x4TdWbx9/tCyuyodzRDVx18oJahcSPyb2JdMSUjzQmFxa8JCfqeSEX3TrEYaxvPBu/krRS/vDuCxatAUAjqthfahhZTm5wtRKoxwCdmljKxtEAAdJWzWpTXEuFqUMClvjJaJoyIv8Ol5uR2p06U8k8fQDq8ei1tYOb4/0kznE7SvdXYYxNDPnVSLTqYTFhNP0HNR0OfY9iN7EFDXvFcSwC4LAncW0B3iG4c2iPUYbAMqxTZExfomaEIW6hkviDpWDVn+Sg66sPhl+n4zTgcgHoo1iraiP5LelQO8kOkOYp+w8RC3H44hAVrk6hVd9p9DX6V5J4aicjRmVugLk1uxucgqYlPn6M24b4Pf8XR4LKWLu2whbdkisXexm+jBg3AokWEv6v4TxF3cUo/eqOlhHqew+h6uGsJQnjITzyYxQbspeXqHysdr1d9dZnThw7cD5zzGcHu8DQnwL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(13023025)(5005006)(13024025)(13017025)(13018025)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148); SRVR:BLUPR0701MB1009; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1009; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 4:xZx+Y/2lpW+A/3+33EpHjQdpnK7on/koPF+4wiNKcDWm9NvMpf3BA4Ky0LV9QtdYcjsfIe3cYaTdQ6ZHZyM+fXHnK6CBjOn40Z3Fa7TGqIJObU2BrApoL5s5Zpyw4KImo+TLnltoqh3VDaow8YR+AyJ4cHCLSnhtU4yHFmOV6mWmmwdHdinlY/zvqc2LfpgdnCQKI94cbY6ZAuCUMA7ea7R4LvypaqRCLH6JmGKRttWavfy+N61oLv27uxh4949MW0A1/8RkmkJpdj897P0w7cqTkcehHO2oiRsLwoKdazJ/wtn2vBR7q3M1virRLOl/yIxqY9xgnCjkS6nJPemaWbubOyqBw0SbieqEckbs1qFY7kEu9yTlfyS653Qmp8fiwF+zxGXHDlHdZcikG7tikc/7kHS1wM4vzB8h5gssYavTDD0tVfl4jFDf2mFgUQB4FrmTzLhXiF+gGJjDezIx5XWe/c9w/q18yVTQm026NUrLoi/W36uWA+UArggD0zbuSwAtQ7CbmlEQT+MsLtHp3q9DIQpOz6Vf+R0qFRo6Mt7uaSM9ys8Cr2oFypkbHNCMVRD09Vei49jdWuN5721PKaa7wJ8EXToPHRx1Xf7q3Ui/Bpus7CNwt7uKaL2kiR5ywDjmqJyQE5G/UUeL9ddHLmeXTdGP7vqHqrr72i+iSNFsj5Tv9MOkjR6I489a48wrLzdIr7d1Q/PrHZRbyXMp++x+tVRTeO16T2j6f0PiF++kBToaF5fm8Blrp7haEElwvsbUCydZaoAxgECkoVJIsm8QliAM/oHPwVp+gYlcwE525Sm5W8rwZQr2AcON6S2TqaPI5x1vscDNFAif6BWAT3KVYp0xY1HeFjW071MTW5OMmtv09xH7FtW65TmPcP2IBP/O10BiN6FaQxVHDAIx+opy1vsl9hGzhlibes8Y 584= X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1009; 23:395ae+ZB2gi5EANDW14srslxBUM+YBASYGOhmNO?= =?us-ascii?Q?nTQ+6jbG/1FQRP5Jll1Ubi3ChiWcr0BAF/Qs4S86xVSDRi4vnp4hb5AL8Ew4?= =?us-ascii?Q?PfqwZ5bSxHsS2GA0P9osc/ntwHtOgnuoOA/FNvxCvXOMqn8Xc6Ap68kXSd39?= =?us-ascii?Q?4oIp+QbyRfKS3o2IV//q7ZvVgJ0bxM0iqAwqO/cO/W4Fi7E9LoKjPxX6W4zu?= =?us-ascii?Q?eiu7YxHbovy5LrNtcJPDT/xjZpJ1FaTZIla73lCQrAl/WIKjWLf7k3s7f1JJ?= =?us-ascii?Q?2RVCav9CCe3zh3SXzDPaDjjnGLwKWg914DCNeWCKk6WJ/edaGG9wt2EGMVpi?= =?us-ascii?Q?98cxLISWbBCXNEUanslB5tJyWr9Hy1QZTuXDoQC4NZIIcT+CwbNnJ/5TVcC7?= =?us-ascii?Q?oF7fYo97eR9bBV/mkWKJsKZHRiQlHxS/YdID6bIlE63bXLzteu3aJ62XZoUE?= =?us-ascii?Q?571UzIeq10dQvgNxPeLarYL2nQiQvjL51S8jg6Ap7Zd1mtsGmuPdDPxgcMYV?= =?us-ascii?Q?HMllDmmJmTAbeTUaaybWrn9y16Q6xAIIox2zChf+PJueIYFjXIZIotigcIL6?= =?us-ascii?Q?2glpBePOyNFcCphTceEYMkKJQ8zvtdxu8pjpJORZLSYX0/GsW3YW7GGChqQK?= =?us-ascii?Q?lU+cEW+0IF2z6mF6UAnACuqcUwOJAsFOsgLL3iD6sckOswYTURmmMXE16P03?= =?us-ascii?Q?ZPNzDuJ09KLptvUuppDkzB267PcXPxoM73uINSQIL/d05mY1QzsHNzTWyHy/?= =?us-ascii?Q?gF62B9hHwSNmxCzYh8o/1ZlwHEGN/YhAtfsBT661utPjHTd75wvS8sbErbyo?= =?us-ascii?Q?nDxmfdSl0Zl6EdN21tCom4XVzvqpLdA7FLN+kGrCQ3qB3SDNAWUKl+wEdA7x?= =?us-ascii?Q?fW+nX0yJmqO6xf6YlU1Uhe+Ki0lqpL1kADVA96LjXkFohs+2hWyHOoeX/o55?= =?us-ascii?Q?Q2mL2g96lAlTCBYEg7v9t2Ii84ij2jKZYwFzKZ3/2/Sw23o3+/8MXvwH3ujo?= =?us-ascii?Q?G1qVDqblskEprK5WXDqqEzxSAuyshqX5dvwwg0Gc37dPYns8UYVZoSwXzqZj?= =?us-ascii?Q?n7JPudkxKmGqGahwKBFZixegborbL?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 6:JuQpZtvB6QH0JrlZHamSXVAO9psW5XgJrXUjTaPHZYffsvq4eybFBvoefV1tcIEEsO43K9yyhaaMWoX3GORnu8tpXQIFCn5iLLT7Lhfa6keaUowxKa6f26MuHussR3Kz2ZRURnsyqn1L4e269vMYP1amUEj/J/uh3JvjmJ0wUOa2PihkFWNKuitRQkdXxQdVmp+U45fs8Yfbss93+Y43/pj9ViMEX13H4GdDdL2X2P6oEeI1xgxmRT23HFoKGFK1idSmcSfZHtS1x1T5sh50yKuTdydhTYh7HLxqwnDToBfFfLLm98caFYmvgKywwlVhuXRHeq5zofdrU2KfTneQEYv0q82XX5N+a/4yRPzGZKjUGCbZ401veLEbAnxI92LAYTahk1l2wMHnPnjfg/lJiW8of9qu8GEC0sragb9cOiy7346a+mxsj8p/T1TW739vS5D99yw3LBe6SpgXJTsqgBqwhbWdoSVROKeMrJtMT+0XiaPO53dfudo/wzb9kZvUDjmH8c6zLZouo1m8rY3XKw==; 5:5Akv3+KhhD+U5dM8BIZlLiSIBqvshyrPBdJdmFFBL5gwqvVAszy3EXZMEg5nNZSnVOhMx/0K2Lb9JbVIBVye7WE/+1Gdc/qurF9wMGOcTwOXP+ckKC72cio9S4qw6TlfZ0HBiJH0fwJTuXwLZqBI0Q==; 24:AsMtmp5ZnBm8NLlytzIJ46FYuAbFfmqnXu2j9/qpNNNRS0obAzIzUTLqiaFFV03pBbb2JV8M2n7y6Nu5WyrR455xF3a2LCKA+ly+DnGJPk4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 7:CNAqiTAEggZGgZatPIbUKNwK0BFq51d5kLe++z3ZSbHDQl6Xb/jDU3ASV40Mzt9ei83W10IBoUh9Z/pllYq3GWE+mRJRDSTKrdUk0qNrZeByfbRPiE8r2l+mthKmYlfIIzl12xnA4Mg9e3bgXeGZ7Ih1Al5zlqRe9vXKA9P+FK8PAu0AiF2Fn7fOQoSKcd1SMMFNSahvtsyDhW/zOfKafTK+NWFdE0HzT7fs1zr9RMKEyh9qtnLo+QvIcGxYGr1Fvpm5qznEO0kb2I4FklhNp4yPIJC9vdz76aLG7eyl0izjQjsPRmm024CiDulo+Xh6yhOw5Q6MpCTe/nRVEkK1yA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 21:54:02.8546 (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: BLUPR0701MB1009 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 Retain loop test for fwdump length exceeding buffer length. Cc: Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 8 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index f6130e8b1ca1..eaaf73fd23d9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -6356,8 +6356,8 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, "-> template size %x bytes\n", dlen); if (dlen > risc_size * sizeof(*dcode)) { ql_log(ql_log_warn, vha, 0x0167, - "Failed fwdump template exceeds array by %x bytes\n", - (uint32_t)(dlen - risc_size * sizeof(*dcode))); + "Failed fwdump template exceeds array by %lx bytes\n", + dlen - risc_size * sizeof(*dcode)); goto default_template; } ha->fw_dump_template_len = dlen; @@ -6658,8 +6658,8 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) "-> template size %x bytes\n", dlen); if (dlen > risc_size * sizeof(*fwcode)) { ql_log(ql_log_warn, vha, 0x0177, - "Failed fwdump template exceeds array by %x bytes\n", - (uint32_t)(dlen - risc_size * sizeof(*fwcode))); + "Failed fwdump template exceeds array by %lx bytes\n", + dlen - risc_size * sizeof(*fwcode)); goto default_template; } ha->fw_dump_template_len = dlen; diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c index 8a58ef3adab4..2f2633a8c4ad 100644 --- a/drivers/scsi/qla2xxx/qla_tmpl.c +++ b/drivers/scsi/qla2xxx/qla_tmpl.c @@ -219,8 +219,6 @@ qla27xx_skip_entry(struct qla27xx_fwdt_entry *ent, void *buf) { if (buf) ent->hdr.driver_flags |= DRIVER_FLAG_SKIP_ENTRY; - ql_dbg(ql_dbg_misc + ql_dbg_verbose, NULL, 0xd011, - "Skipping entry %d\n", ent->hdr.entry_type); } static int @@ -818,6 +816,8 @@ qla27xx_walk_template(struct scsi_qla_host *vha, ql_dbg(ql_dbg_misc, vha, 0xd01a, "%s: entry count %lx\n", __func__, count); while (count--) { + if (buf && *len >= vha->hw->fw_dump_len) + break; if (qla27xx_find_entry(ent->hdr.entry_type)(vha, ent, buf, len)) break; ent = qla27xx_next_entry(ent); @@ -825,18 +825,20 @@ qla27xx_walk_template(struct scsi_qla_host *vha, if (count) ql_dbg(ql_dbg_misc, vha, 0xd018, - "%s: residual count (%lx)\n", __func__, count); + "%s: entry residual count (%lx)\n", __func__, count); if (ent->hdr.entry_type != ENTRY_TYPE_TMP_END) ql_dbg(ql_dbg_misc, vha, 0xd019, - "%s: missing end (%lx)\n", __func__, count); + "%s: missing end entry (%lx)\n", __func__, count); - ql_dbg(ql_dbg_misc, vha, 0xd01b, - "%s: len=%lx\n", __func__, *len); + if (buf && *len != vha->hw->fw_dump_len) + ql_dbg(ql_dbg_misc, vha, 0xd01b, + "%s: length=%#lx residual=%+ld\n", + __func__, *len, vha->hw->fw_dump_len - *len); if (buf) { ql_log(ql_log_warn, vha, 0xd015, - "Firmware dump saved to temp buffer (%ld/%p)\n", + "Firmware dump saved to temp buffer (%lu/%p)\n", vha->host_no, vha->hw->fw_dump); qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP); }