From patchwork Sat Sep 23 00:12:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 817743 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="DSkanzBX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xzW5r4RYhz9t16 for ; Sat, 23 Sep 2017 10:13:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752254AbdIWANA (ORCPT ); Fri, 22 Sep 2017 20:13:00 -0400 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:46912 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752179AbdIWAM4 (ORCPT ); Fri, 22 Sep 2017 20:12:56 -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=q4LL5POzZARy3ddXRAI5s3ALFCqXLs2lgldN0D33V4A=; b=DSkanzBXsp6i2J+v+XxRHjG6b5Drm4rFsa8lGnFr0q/FWeg9PQ8fGjrOyV4ni2OfqcNqusSJ3P5jbvo6YoCsV327CklQFq/msuOK0Ja7MBvQ+myRsU5TNd2eNUEGYf+aine0XLGN6QZBzd1GXOhbwiD9611TbInSW/W98+5sUpE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by CY4PR07MB3175.namprd07.prod.outlook.com (10.172.115.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sat, 23 Sep 2017 00:12:53 +0000 Date: Fri, 22 Sep 2017 17:12:51 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, ricardo.farrington@cavium.com Subject: [PATCH net-next 3/3] liquidio: update module parameter fw_type to reflect firmware type loaded Message-ID: <20170923001251.GA1507@felix-thinkpad.cavium.com> References: <20170923001206.GA1458@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170923001206.GA1458@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR1001CA0022.namprd10.prod.outlook.com (10.174.165.35) To CY4PR07MB3175.namprd07.prod.outlook.com (10.172.115.141) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f72a526-4fa9-443a-adc7-08d50217d5e9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3175; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 3:Z4E8jABG7WVx3VdwCt+Trw4U5C8xwZS/UiocKAbGqSPZ/OBAWjcrkw2GNsRDqeGXkw9LN+sAfFlRmvDC01XJfH1NlkravPPyiGhyrMZdpDusYETm0K2GOjxX0GYlDIpnRSVXRq3iJV9QgoSkg1xvPulpqRHSN93JHqkslUBRUSjPcvkQd3YFT6T5qDtvQrqF44hv5+P+GpMfmG2JasPZuGKY+p6cqR0FgZ1l4MEwEV2uuPc7HCPAJCI/FoCU2Hls; 25:z7zLpoKA5hlBfwA+sRVV8WMxgh6LQeD7kx/DiFb5jJtifCk5jIa6/LKdOT4FAp6XE6zlAOKMgIW5vVyjkAi24YVlb+Fz9FFLd6CF58D+J4YhcL99sGjIeqCd3+nc/Pa1dzssOhFxYbOIUgSRm4OgSQYMR/Njj0y51ebLFcbHA/UrFSYb8VxmL4YCM86JOsQmx1YYVuda5kYU0SlYP8U0bRHX27zs2zDWWVCD7iQkNBJfOuyair6YaIltTJVluvUjMcjp0EyROjl1Z9FNMfjrOC2pcxiRTVHa1Au67JvWbvk3CWrjnTlUXI4iS1oUz9qU3RELx2iewpq4ccfeVtUMIA==; 31:zSexBVfyB6EiBbbtbI7L+8OI8sU3JzRTu4Y9/ipTRWyVG2HdnEt4CebsVN0a5CwJ99T5MsHa+/58SPpKTN+2V8VNCBQZKvr6BsRYm597M85WCU0Y3bmkoTN0StKD8b7HmKsvkJmDrHDU8tcqPI6oD34UByZbINgp8wo47bSjciEF50UE203h6fLFlSExMxK+mytHdYYiuPMgEqX+huuWW2QCoBdzf7/fY6kamAZhhPo= X-MS-TrafficTypeDiagnostic: CY4PR07MB3175: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 20:4lG7qR/E6WL+m51bG9twgZv8ARsQV3hYIZ4e9SDTTtXTq4oZ7+dYLU657YmjtrDIZLfvSemYBApgxbYB0gxgXejixu0m2B949Bidce2yVppobBRb/DvuGKpSMKsZUgD4zslqy295imDVBw4/T/1A/fWXzUqfOF4BHBjo9BpiDSRaLVfg+NE1OGSWUwGOoK0940teaPlDCv6t8SbKeEnbZQUTE+F6FEYmHpTxmNbHZv0E2mcRqUelHsPkNU6BChQRea/iim/ndE+CdKF/nn+EH837sW/h3fsbce+5o/lw0f0sAutLwhQso4u4yYQq7FZghIrA3G+fSMHg9BuSgjezrqe03KGt3ZlIaayCY2lNVYl4TtjqAanllxZN1yHqvVyCgSCHF5DW1bBwjQiKAvIjJFy4nV2rtQBH0N2Gj1hOCD/52+z+mGmVHC+De8U0VyAat8VAIIwj/eJJqrTq1KNcoHVZZL8nBXtbfcW43taPxEl9ig5514MBtdkD8leBR4Ci; 4:k8pVJMpq029r1tkZzFhFpWyMQUDfAynpCxLMh9Sd0HEYlo3ZeCP8cOF+P+TPpYeSOASvlV7afU3MsMduv2u8DO3w7gWRG8NgVfyDrFgiDX8BwuI+AGJSVUq6gIpylgdWq8PYx4zX5X3P3bs2u9VPUwzxrUKu+b+YKCUbvQEIlBgxIEv51q/1cdKosWvDD7uvJ6jxhw87/tHTXh6s2nPqvLMNmGL7XT3s0nQIIlUrxI+9gtLYDdYUhwuIZpWH0UNU 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)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123562025)(20161123558100)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3175; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3175; X-Forefront-PRVS: 0439571D1D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(346002)(376002)(199003)(189002)(16586007)(72206003)(47776003)(66066001)(50986999)(81156014)(8936002)(25786009)(478600001)(33656002)(81166006)(101416001)(7736002)(97736004)(8676002)(76176999)(2906002)(4326008)(54356999)(53936002)(83506001)(50466002)(76506005)(58126008)(305945005)(107886003)(6916009)(16526017)(2950100002)(68736007)(316002)(86362001)(105586002)(106356001)(5660300001)(6496005)(6486002)(23726003)(1076002)(3846002)(2361001)(6116002)(2351001)(189998001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3175; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 23:7wUi/vlecnmLVlHgNHLjHOHHZdBSvZ8emV1awseT1qmV6hgI6YVFtZ55MyPSebMwIBX6/0OTiA/8bm4WfAZBUgUKKOhe6IYk57ZaYSsHfg0hKCPkORaJgKODIhznUx4JCbkITnZcGmd/0grSaQqm0tlNdjqYJbSTkhrCC0cXf+LRwAc/wQmol8yJNckuUjXqLR8DPmavmneL6hoLOlksffzk5IN5bSqLanvL5+obqeX2/tsq+NP+O4s+4pxFSC2tf8di4Cqy4jMM+BhpC7HO28FBsoV/aSmr4l16aL8Hmlzg918QSXK+a/oSE/JN5nFlJotei3dfZvViYTyRQPTICM9/AnmwqhI3qexW3UFV3ZyRKfQx2yClLS6nry7gAxJyXnK55Dex+f8pjN3HAq12t8VOgNjrull8d0UeIVUWwTZUhl9ILhcXa7A/oE8gylvuG1twNQ7jGS225xpm6xPfHK4zs5lfqPU+7JZuVaBcG9djcdHIw4ChhCXvfsiayzHUXOBBw+6WKOJST9MnH4S01ocbgvRcp2mrofKx1oGJ5H1lJfZQtYsuXul/yGbei4Hm6JXZPDIzGzC6XCYsdqopwmaCL2ozx7NQkOKQzZ4NkAmNDL/+mCvHP/+vIfXhMxJE/i/bl3Y9SxpKkOgsf6rnTQRzlqxr1tTAA+iVv6sP52R1mMfaWVUnxuqt6b1lfq1pFQoJvWL+cU0ejPVP+0LDpmWl/W5cSxLd2OhhHDgh4yYIow7oQVck63rsGbs/ZyL6jrQ8AS3Kh97av5jslLm5ErbHEBOmDy5GXB3yZ8wTuKbbvukPSEfctQEgZqrBwcI67oPlFsrz2VDQ+2sgC4JMWf5jSD//KFUMDgwlan8Cvo6V7ffyLCq0rnngBQp2pRvkFUJC2ALCipEFNxGTU3KRyDz/QxUCTHOkiVONysZi95riAd2q9Fu3tY67R8PdrQGoJhoTZ4B1ONqj0JOCoUwHpy0vzNUypq7+iq4yocPHjuxty0+DSl/UkJuIs+D+l8Kfbh6cdk882YLoug/DAby4YZaKvaDd5Qm2jrkTUqwb0y0LLvzaOU0x1TJ3SQsv9seJOBudbHwpJl/6E7bn7mlDVq7xNnBOeBuZL/rEXE8RxZC4OEdaLPmgYRLFtUT5htzlWcl0ArjEWqXOTp98TQKV7KFK0TDsogthlTIb7CR2NRU= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 6:l/Wq6PMCWhvMf2fk/rWjIQ8ENZ7WFj2J8eNJitDTI1YYgeYLQjt57+E4AUe/2eP3ivWVczf0sScx18Kfm7wsh9Z/ZsseR27e1pEa0qGWryPmS3wBp2S6Xw2Gx9W2uL/mtDBIs55S79uL+yO2PCUk64CwG7cDT5NMJRuI7NOeFtN83qBxhK+cVJ+LFyNKy7ojLJpPZl9yuVFqjsUudDotYysw7oIaJIotg8KJmOfyn5Gw4Q3JTNEgva8agubQltVdx/LuwoGhjAdvWUp43cogeMHfxTHhVPN9ujfskhcijkSFBBEafmHt6qc/DI6ZO/OlzgddR9pgWjden1DHURfUJA==; 5:NyjybdeVS9FWU25wxazPUA6OP3F3OVeWq+wwLCHy/Qgz6pGmHwl1aNofknNQBehKy9wnvDBjHVMKuPJ1SOxN9wgS0I8C28GDH+Oicl8orQX+QD0Q1oJhJh30FAVQW4AdKHIU0I2reU/frNMWxYC+qA==; 24:vGBq9H7ovi2XfWAJ4Y+vyAEBunw3jBt1WYb5NbALUuKfgqFamIKZM/Sd7A+RaXgKZHqcO5zCYpQ5oOjcsLVKsDvQmLc2fjlpC7kkVat6Tyc=; 7:acYWRsSMdrpb/LLFxScuXxQZxX+lkvhRqkh6lwQqZiBL2li00mrcBUgG3F9PYJoUJ9NMvp01Yc5wlQrZ4hKQv9S5ZpITWBbpbH7nptjG0vs1lfv2TUQ5vzxd/JIq0CtMv5R/v6rGqI9To/R+D/XkQoax8cKTTYRqEjqcy0oAV8ThQiWwOTcwlnb+oKeV/2VxKurPdBE+dw8TdGt7TKpPY+6kzz8BOaTtuGbQYWZr4j0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2017 00:12:53.7595 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3175 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rick Farrington Signed-off-by: Rick Farrington Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index a3c9867..963803b 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1934,10 +1934,12 @@ static int load_firmware(struct octeon_device *oct) char fw_name[LIO_MAX_FW_FILENAME_LEN]; char *tmp_fw_type; - if (fw_type_is_auto()) + if (fw_type_is_auto()) { tmp_fw_type = LIO_FW_NAME_TYPE_NIC; - else + strncpy(fw_type, tmp_fw_type, sizeof(fw_type)); + } else { tmp_fw_type = fw_type; + } sprintf(fw_name, "%s%s%s_%s%s", LIO_FW_DIR, LIO_FW_BASE_NAME, octeon_get_conf(oct)->card_name, tmp_fw_type,