From patchwork Mon Jan 22 14:13:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadim Lomovtsev X-Patchwork-Id: 10178583 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 24031600F5 for ; Mon, 22 Jan 2018 14:14:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1739728210 for ; Mon, 22 Jan 2018 14:14:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BD0A28358; Mon, 22 Jan 2018 14:14:19 +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=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 86D2628210 for ; Mon, 22 Jan 2018 14:14:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t/Oq118mKoxwdTWcJA1JpkX6hISFgkWV/jrC8B3EvXY=; b=ZG1HuPH3vtiEhZ SE/y39PKKN4WNj8Zu7r11UZOU6XBysFc+BxBCsIkG5Ewm7Vf8xaSmhijCI2hfmQqRVksUVjDwG/B7 gP08DXG8DHuk1Crg5P0BK261o6Lfepw2djYxXBJ7RcBjf/opg1LeXgsBnVX9iROgmF+2jr2TvvogS BoCNlekX0bqwCWDKZqK2RQsByuQxfZQ5NHq+0dtAzNTI3wmVO2eUIBBKCC9gL6nD0bahBhhoSmA0e v6aSLqwgGec1slExXDqRAQQaHbFgCdjLEkucXHHjXXSGogGGTerfYQq2TZZJuu5EBUa+9mwC/Zrkp SO4MeRrjDf1pEfPiT2TQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1edcrV-0001Bg-Au; Mon, 22 Jan 2018 14:14:13 +0000 Received: from mail-by2nam01on0040.outbound.protection.outlook.com ([104.47.34.40] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1edcrQ-0001Ar-Hp for linux-arm-kernel@lists.infradead.org; Mon, 22 Jan 2018 14:14:10 +0000 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=3LEfJeCxVuEDrQIwk1yeK9IWAncVGz8uJCrY8is+ZY4=; b=neGME53cef1BiOI/abe+xgY/kclQNgMsXufbgWdkC8ySa6ARn0N5IXaEy98anTEYYezzEm+f3mt1wb/aA3/eYDEJWp6fgVnZDgyf5mAnaKD/kAXpvrHMbAbx/XobOX45tO8KO1wShT/LKz1pCfyS8AgmDUBbDZvvMGHKx8vhleo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Vadim.Lomovtsev@cavium.com; Received: from localhost.localdomain.com (50.233.148.156) by DM5PR07MB3002.namprd07.prod.outlook.com (10.172.87.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Mon, 22 Jan 2018 14:13:54 +0000 From: Vadim Lomovtsev To: sgoutham@cavium.com, rric@kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] net: ethernet: cavium: Correct Cavium Thunderx NIC module and driver names Date: Mon, 22 Jan 2018 06:13:27 -0800 Message-Id: <1516630407-23161-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1516290789-3585-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> References: <1516290789-3585-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: DM5PR12CA0064.namprd12.prod.outlook.com (10.175.83.154) To DM5PR07MB3002.namprd07.prod.outlook.com (10.172.87.140) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 589b29df-f637-4a0b-1998-08d561a25f0f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR07MB3002; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3002; 3:EUae6Emasd3m8mWWz5riQK3t4BPiTAunaSpVkAXDrqJi5PJqYbPS2spB+xRfYz4HA6GEh1TPX/2ApJOhv7eMao4nLBvRuhmTOnLsENCjqMRgDx2WYwazOZ3Ax9+flk++EMTegS3YWNY3AETOCdA4J5RJC1s6iogMdHNfsCjQRxQr+mdt7KScCKHzWR6/a6f6XZLDOBWL6OPA7HXxIVy2Lz5L5UjC3EyqAH7mjmlkACFX+B6/OPAtWN8KJjm/ZB2M; 25:9wbsQb1SDxEysJAL+C23FKgngESog1R+eTP2IEgQSqUw+wBLZDn6NJYwA2wB/LjXgBlWWcW/wbaDQEB+bevJQLYQzjgX8cAgjsGI+LxiNAOZJTcXH+s0fYtp3PE3Yfth5TM/IxmduQHVR7US0b50NTTRPM6O8IcSpmSyKhphpEeKCfENSUnx70WcuZ2UCGb5ObRmI8LGn1xnoWfALQ/6MZg7Aj7cCjNncpS3WcWYc7tVtPUWeHXtwi4Dr9SD85mt6Rvzcguc+YCs0MsnjIJ8WDfyDBIx+dalmXCiyIZ+3oGX/jwiq3Fa5YxifqSz2g6Zj0Garq7kCXwBlVcdCijL1w==; 31:5nz0E7yJ/wBX/z6oYIfixWsT+qG2jD0UTKP9nrcXqGtuOB6vop0Xe9bR1WLfO5lHZK7NdrUYK7v+aAw4PUP7jh3kviW/gU0g/hdv1P/UM+LBjgIpjnIl9P7MgO8HqT6GSgWEDbr/ShLpSc37cEvj4HzRaMt1ZPAbzs7m/hUOfw8b8wqwX+J5iFzrajJdyhtWYXyq2K/TBfwdNXAUozGsNbNHYdoG8spkzJJ4Lcp7958= X-MS-TrafficTypeDiagnostic: DM5PR07MB3002: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3002; 20:cE0Ivp7Yw4uFD2uRZPhrTQlqEau57zkyYpILj4M/FDwF2MN/bJVpLyYQCdM3ClRrkO9ICQxQWn1lyhfWSMZRTZFZ4/9WNrV4YjA09s4I9LYW5zdNsQV6SsZHdVz+oEDhCoSDLvwIjP0/dMhQwdBh/6YveVs4oKbCkGPjHuHETQ7Jok0qycXIBD2Gqb8StML8w46vNDECNlu/CckDKrkXpZQGJQa6hUvX15T1jToBA2VeT6GnnrqJ+49jUh+bVjXAcqqqP4aRi0KKbdEGirY4J32CPrRBSUIfvm7P8iMEZcg+BQfwjUUXrR0O/okbrpde9azVKGB9FZynGOesDqiYxQkBKtsMO7ZoOMc+EPfbSP6Ovdob0xUZeHsTYzv7ip7rWEkM1ESF00l0dcwHgwyTrYiZRjYv9m0xa3PbSEZzfvgJdtEPGWO5x66Rho3RU/XS4wW8RWxy0crKrCT3GTG5dTx43lRUPUI8DIY44qXscZ25bnT3YfBF3H21ivpH6VNJR+28uIKOUapHFdupGCp5kInzPEUNU8MktEuTuduEP2lhlmGuwilw5uw5V2dNN54OXBeN3zpHi5IPosl9ZfKE5RjPnJb201lcCD9tToYzkFk=; 4:mzzLsDEbAcmeMPdwq1KTTE9JuggbJk8O2HaSa0+c/AuZV/qSLAz1U9Sajx5NA0Jo4Le3mTzLCd/wsRsRHRQ167K0pcA3YbYD1/BCE6DObDL0NvKX1s8MwnQyHONTfO+zEw/skHonCL10KWXL03W9UvH2niAXyKSSxCgjnuEgKtmjM9ymtfEdOn+YdtaQXF3tLKW0Rs54/srQCoBS5eZ69xIs0roT/kYgO/XfsAsfMCIn50cnDdBvO+k8N/pSXCugUoBX0YKh2YmO5138qoxAYA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231023)(2400081)(944501161)(93006095)(10201501046)(3002001)(6041288)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR07MB3002; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR07MB3002; X-Forefront-PRVS: 0560A2214D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39850400004)(346002)(376002)(366004)(396003)(39380400002)(199004)(189003)(54906003)(69596002)(53936002)(52116002)(6116002)(72206003)(3846002)(97736004)(6666003)(51416003)(66066001)(47776003)(4326008)(2950100002)(42882006)(25786009)(106356001)(6486002)(48376002)(50226002)(105586002)(6512007)(5660300001)(8676002)(76176011)(53416004)(26005)(2906002)(81156014)(386003)(16526018)(50466002)(8936002)(6506007)(81166006)(575784001)(16586007)(7736002)(305945005)(478600001)(316002)(36756003)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3002; H:localhost.localdomain.com; 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: =?us-ascii?Q?1; DM5PR07MB3002; 23:hOak6y0nWDDdmgN/tjeVO0TvZ6i5Q+SPaj+oUHXyT?= =?us-ascii?Q?nrbYI5mF00Vu0xEanR5yJB0nZgSaCQ4HJzZNhEDW0Qw9wTP5V/oPH5bLC1JJ?= =?us-ascii?Q?uk5deC5aloLWWluHfByRdii8r3uImzqqyjekAHiudeQhVVyRpswaBQDsIkR+?= =?us-ascii?Q?CuvE8KYNtlkh4gFbjUZjzDs4uA4B5e+cQE44XUrbu7890Y2gLGWxolcYOjHH?= =?us-ascii?Q?XCsGVYxiu1Ow/fD8qpSDc2YlAvLh65v+Ev+/YZEV4QZ9zepbKvLsM+PI0BI+?= =?us-ascii?Q?OFHy1FXO5qZ+H/jpewIC5s4Qvol6U2X2/vYV8nnZo8ouQD45GFZPr8/YMyo7?= =?us-ascii?Q?t0vWXYynn+uIHYds1S7E58MagvtmwlnQ0w0B8PvUYIqpMgZ18tHlZkah/zhK?= =?us-ascii?Q?Ypo38SRr68sQLhjWyIZwiaX5U5GruLBS2A6L0qdtX2U4bObGHAVGc3PKWCEp?= =?us-ascii?Q?1fRF1KCnlronnnmLg1VRbUi4r5xfR7b2AXqTDaNjxDmEj+r0kYC3cX+vwbRf?= =?us-ascii?Q?qGKfJuJkmivjd0h3T9wjzHHSUtvekyqcTJTbfD4m3e3VwdAMRMuhIsynnve9?= =?us-ascii?Q?n+Da5iyW4Biedm7aZy86AHdx9uIdPQM5o/z3FxDwRXMi+tSvDxfenjgi8Lj0?= =?us-ascii?Q?5rhUMwyhiauRo/6H1xPq/onhrp+aRgvyNq1gus+sVMhCoro4Icdkql0XorB3?= =?us-ascii?Q?fVA53cm+tl/x4tsBvV/CV4bw9r+iFocMRn0/eAh7j74EvA6jFNJtfBiDEEqS?= =?us-ascii?Q?HQoef30fe9Fn0LJkgjkx8VEcWzV5ezumVcmdinnQr8GKqlWQ2hB2kr6SCqQ4?= =?us-ascii?Q?TboFBA4mYlLMrfeVo6VKNWsvqTFoRGOJmHHz5EBJCzc+h54su8IEWSpZTQ33?= =?us-ascii?Q?RT+aAKZ8/Tsxq4zTF40x5HG+D/kNBP/FEaQr0Eu3T51mMfBdlqPf0kOHyWks?= =?us-ascii?Q?ecn5jC/R6FhSjpuE8iqczvUkG+NTR+spqWHPcK5da5rFgeanNt3ekuDb39il?= =?us-ascii?Q?ErnE1gKnbDbsagPiefehy2IqeUW2WIYSZzGOUsL6bUTAMrCJYQCt/wS+44gy?= =?us-ascii?Q?tMnr09dtCnllqUUEwpDYNTVDGPkN4d3Gi0AE78GsIYV4g76DBrCQcTymydk/?= =?us-ascii?Q?LQFlNJknPrVmIk10h+nD87jXZsjRkVd3pIr8/enVDNZDd00vwQZ7Nlfdyq4W?= =?us-ascii?Q?G7fCxVex4cT7zI=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3002; 6:gHzYCZcVB+fqN7Jz1VMecL4WsVKE/e/8FfogaAg9jW/cWNm7nK2SCRLRC1GUEV/j9RzX6YtPHEJJZyl8y1g7W3gK1u/eOaPsDkErbCoaZ1602wNCgnaJnoMHYxAEjxAqOg5Y9Pjg1G39o+D7k25t7Po6IIgoUNRbgRVIMLpVuec4UtU5I1eEOOds2Ou+NLB5WmYF+wkYG+DKuXmjksKE4E2trZsgEsKOZjcohQKzqv3uGFKizG1VQuKwXuoZVGG+c4ONaS4hPRfvMfCB3admIOOKAM0fh/epdawxEnVJlI7JT0A7SjHERa0PB/Uk68tXo6Ss/B0RZbcHzUU0tWcV2TK9wUZ4bKCcd7vHtgb4bgs=; 5:BzhpnKlGEw+J2IShU+jSIYPAlN27vcaIrPfUrEY08fZW4w2PsBoJEvisS6Wnyitp+AC7LwfaFEaxFEaKjsrI3/FJXJ48RGl66GKQ+0AYoGSLaOsucNQk7Fri3qcyhi4NRbzKmL6Ydu+gpX4aYTdn8BTYmY1qk+LYXkVsEXP1NoA=; 24:0wXaL0RSCuR9DqsvqI6E+wxiqPorK2gWtQ+gFBiLwE5EJKDcygZfE178R/kMkuww77xeY76mnzRClfwuRlUls8+OKhYA510aEYePagECzXU=; 7:t4eLppfqlD9yicAWL6uBkfxV6AwQAq2jv+QqFBJ7b/KnhsNnYEnvthrbGiEJ07yocg+DFTKiFaFOT5ONj8maWqJ4s1u5oODAr9DdaincPrk103cJYq8HLPOAnwicbD3vBrkPMIJtWGgFsKhy9vx0MAIoDKlsP9V969sH13kyq0spa9+Puj8/pYhKCAjEoJCJug3btx2KUrST/Uk4yeeXi+koqwOy1O1b47jSj+Qd+hfYe7z/Aahxk4H/r45qcOR+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2018 14:13:54.5839 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 589b29df-f637-4a0b-1998-08d561a25f0f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3002 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Lomovtsev , Dean Nelson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Vadim Lomovtsev It was found that ethtool provides unexisting module name while it queries the specified network device for associated driver information. Then user tries to unload that module by provided module name and fails. This happens because ethtool reads value of DRV_NAME macro, while module name is defined at the driver's Makefile. This patch is to correct Cavium CN88xx Thunder NIC driver modules names 'nicvf' to 'thunder_nicvf' and 'nicpf' to 'thunder_nicpf' along with updating DRV_NAME macro values accordingly. Signed-off-by: Dean Nelson Signed-off-by: Vadim Lomovtsev --- drivers/net/ethernet/cavium/thunder/Makefile | 10 +++++----- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/Makefile b/drivers/net/ethernet/cavium/thunder/Makefile index 6b4d4add7353..f5642337d0fe 100644 --- a/drivers/net/ethernet/cavium/thunder/Makefile +++ b/drivers/net/ethernet/cavium/thunder/Makefile @@ -4,9 +4,9 @@ obj-$(CONFIG_THUNDER_NIC_RGX) += thunder_xcv.o obj-$(CONFIG_THUNDER_NIC_BGX) += thunder_bgx.o -obj-$(CONFIG_THUNDER_NIC_PF) += nicpf.o -obj-$(CONFIG_THUNDER_NIC_VF) += nicvf.o +obj-$(CONFIG_THUNDER_NIC_PF) += thunder_nicpf.o +obj-$(CONFIG_THUNDER_NIC_VF) += thunder_nicvf.o -nicpf-y := nic_main.o -nicvf-y := nicvf_main.o nicvf_queues.o -nicvf-y += nicvf_ethtool.o +thunder_nicpf-y := nic_main.o +thunder_nicvf-y := nicvf_main.o nicvf_queues.o +thunder_nicvf-y += nicvf_ethtool.o diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 8f1dd55b3e08..a8c0d2bde9c8 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -18,7 +18,7 @@ #include "q_struct.h" #include "thunder_bgx.h" -#define DRV_NAME "thunder-nic" +#define DRV_NAME "thunder_nicpf" #define DRV_VERSION "1.0" struct hw_info { diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c index b9ece9cbf98b..8a3e3b70afda 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c @@ -16,7 +16,7 @@ #include "q_struct.h" #include "thunder_bgx.h" -#define DRV_NAME "thunder-nicvf" +#define DRV_NAME "thunder_nicvf" #define DRV_VERSION "1.0" struct nicvf_stat { diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index 7cb7571f9ad9..de38105fc649 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -26,7 +26,7 @@ #include "nicvf_queues.h" #include "thunder_bgx.h" -#define DRV_NAME "thunder-nicvf" +#define DRV_NAME "thunder_nicvf" #define DRV_VERSION "1.0" /* Supported devices */ diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 5e5c4d7796b8..79fae7de3404 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -21,7 +21,7 @@ #include "nic.h" #include "thunder_bgx.h" -#define DRV_NAME "thunder-BGX" +#define DRV_NAME "thunder_bgx" #define DRV_VERSION "1.0" struct lmac { diff --git a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c index 578c7f8f11bf..2d5e8dab1f70 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c @@ -20,7 +20,7 @@ #include "nic.h" #include "thunder_bgx.h" -#define DRV_NAME "thunder-xcv" +#define DRV_NAME "thunder_xcv" #define DRV_VERSION "1.0" /* Register offsets */