From patchwork Thu Jan 25 11:38:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadim Lomovtsev X-Patchwork-Id: 10183941 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 7F7D560383 for ; Thu, 25 Jan 2018 11:38:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FB6328A44 for ; Thu, 25 Jan 2018 11:38:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63ED028A7E; Thu, 25 Jan 2018 11:38:50 +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 EF7BE28A44 for ; Thu, 25 Jan 2018 11:38:49 +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=T0C/6VWVlgZMXFroZHp8d/Df75IElR2jZ6atuLa+3Hc=; b=pmpMBIYO5whMTb C+P91QF7YFjIkkNwVnkQ0VoyxW+vUYpPAM/ssxMyW5MyD9sN1cVTjh9Ow7cedQ36mB88hwy9i7k3d 0aV4l3COOVYUOMxFNpgrQGNw8XkmpJOWTgYSykI2yHr3Ze11sXC0jyKl0Btk/pM1DD+vJXLLk0JRa CtZ2YMVsy3/3OwVyAlnN5Mx6cAAyR28IC6Z8JMLjuUcY0u9MZ7Jmrun8B5gOLMbkqTpBUGZ6D8+um eJqzaVyXUTb2D/USTHTjnlFdC5kN0McQ/bj+furQzfYCr/9I9IDbepjymwg+jSuOhSO2R0ZSnC0+I L31D9/iNcF3Ath7/Q2mQ==; 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 1eefrk-0006so-Fp; Thu, 25 Jan 2018 11:38:48 +0000 Received: from mail-sn1nam02on0628.outbound.protection.outlook.com ([2a01:111:f400:fe44::628] helo=NAM02-SN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eefrh-0006sJ-3s for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2018 11:38:46 +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=P2sObRksusPDFw1flNQl/kGsmSvJnCNZu9Q49S5FxFg=; b=Xku5Goox1HsBwOoqwjnpzeWeryI6Zp69sYUhoRmsE6q6OtZVqqyn2cG4//5PYjyGxz5ieA82l7Wy6CulAUElguiBztYriTOlxCFFj48vtZRBaI6H8Jm5JoOx77SpKLtXOg0QWKLi5ZoISiC1aiSr5/tUFN2GkcC1p3c5iYRg0fc= 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.444.14; Thu, 25 Jan 2018 11:38:31 +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, davem@davemloft.net Subject: [PATCH v4] net: ethernet: cavium: Correct Cavium Thunderx NIC driver names accordingly to module name Date: Thu, 25 Jan 2018 03:38:17 -0800 Message-Id: <1516880297-6636-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1516630407-23161-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> References: <1516630407-23161-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: YTOPR0101CA0043.CANPRD01.PROD.OUTLOOK.COM (52.132.42.20) To DM5PR07MB3002.namprd07.prod.outlook.com (10.172.87.140) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6a8ff46-3a21-41d5-2e2c-08d563e8299e 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:UQnL+vDXQlgXmq6kLxA9YNHNNJ6PmjxRNfMld+qBPYViaa54jrlEBnImgihlZcJ1eaGxUtLU1h+gygqMU+vwhcm6iOHrjMOGrjxUDSKFN4OMo//UQ3TgPhy02mdMYBX8P5E99LynBBhYyuhGsm5fWiUzthE6go9XCw6Wi62LqaiIdZAxJ7YZmryzQBMjwJCghzX94dDOeb/PXbYTAf01gJHyTLoN7eUnxAEb2QhuER1P3kfWNR06JcqinpSdp8Pl; 25:OjcXR91iGoSpxvxbb20EH1BLSTGiiy0UpFUrOAZlcXwTzzFUWejg48w2PrhVbIwMGFBt58x4/G1IVUflwPsFSSHiOIcVj2tvJmHlukfbRrmg0KNLXlFnSfWCdrU9rl1xalG+jY4H3qnqgp3vvINgXHQpYTrH0nky195SyozC0FvY21MooLU+5OYWlzmywFhH0SB0yQbo500mEDUI2F62jZZCu/p5Yjyz6vY4XMjXwHFuZdU6Pxy/PhWkwstoEOu5DYkKGBXs/CO/KK2bgOtYwA+wPnTTKZwMClQ7xfxGuLNXJudRXaIX8P1szeQf+2PSic1w4wGnvazcg60tQTWMJQ==; 31:F9zcuOe2PaKvTfLho8tbCYDgvbWsEc25gPKetU+M2ENM+WQNXzlNzkZ7BbR6Qtjr2zm33hJ0MVWb85j+5XuTUMQIMyXyQLc2qhAKpXIfNfjBaW0ov0Ua0z9q77aDatI6L0t3FaR2p9oM+OHObI1IaxBQ2Sy9aXpgt9SOauMwm3LvB/iyNDnmJKdjk9JR/q0pamZFNnuhV10POuZZhOi1xZW/2U25MQb2COCmiiYLu+U= X-MS-TrafficTypeDiagnostic: DM5PR07MB3002: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3002; 20:KJUlIO1v4deakA1eLp2LDC8FfAcjlv8L0knPOa0tORQq6q0sXsbIHhiBTneXKqSRAaeXg2n69odyoK6ra/o/me2Vdp4mcdJ3azzItMVMpuiBlKeVTCDro9WuGTK3ymp20HUbnHe+kf+Vi9hES0cGqiUsfeCQcUHmKZTsuwgRmcJILI38Wu3MknWlCHdZIlhQM45nkZLzRloGv+C3DnzUWD/d8hap9d+QC41G5k/Idt+ocuxb7kmnQ06cR2UuBbD/rmScxOdPC9YCgx+svmCpNsrZtFSioxR29Z4fAWlTbYsxpUaNTpzjn3b4OijhgOGjeIHDbQNZYzd1dajVJlR+lhxhNyvAmT9RGpkSZ9u4bSzOQJUNvsBofRU32mGbh+OQxyo9burRxvI+Ufp5HkleJ4LEjEobyItvGSPD+zupZN/OcwCABB0Gtt/mAhm2O8zuk2I7Sn281X+ELErhC2vRcjlkUDK3svABbPB8+HxlkSh/rsC1Q+6osuQVzgqcalK7kDqIp5GxtuJCrWjcZ7LMKbllIiHTfnL3PEssw8Yk72Y39j4wc3LGdgi63bYfaRCvBfRgvlAXieBWf2nklijwSi3Ryr2UTxF6gwGPhMGv7Lk=; 4:jNxQvTvotKGJfa1WlW2jvgOqLQBXbQEruoK5pOXEeIFPhKtdI7QBUpN0ol9/Axy7/v2eXEBkq1g26Xi2Hl33F/739Ex30a8+dcDaoUkG8ZrwJwdkkCsTXrcw5bv9yms7wE+Plw66qSByAs+d6UxMWPrSKXoFHOIHCyEp4PaN72XK8EWaXzBSXMH0JxS+wVAQ4WO+11yThjtRMNWis+z3RIrtVp4sq+Rg5KmT7D4ubRzWL1+FeFyECCR0eIu/cbTS1yHyNoQozPLRIoglQymOww== 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)(10201501046)(3002001)(93006095)(3231023)(2400081)(944501161)(6041288)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR07MB3002; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3002; X-Forefront-PRVS: 0563F2E8B7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(376002)(366004)(39380400002)(39860400002)(396003)(346002)(189003)(199004)(5660300001)(8936002)(106356001)(81156014)(81166006)(107886003)(6116002)(3846002)(8676002)(2950100002)(68736007)(42882006)(66066001)(50226002)(47776003)(6666003)(53416004)(105586002)(48376002)(50466002)(4326008)(25786009)(69596002)(36756003)(97736004)(478600001)(52116002)(51416003)(53936002)(72206003)(6512007)(7736002)(6486002)(16586007)(26005)(316002)(16526018)(76176011)(386003)(6506007)(2906002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3002; H:localhost.localdomain.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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:dkTSi5LjyacFpp9HBe7kydBv4LVkVE/psa9lLKToX?= =?us-ascii?Q?i4SR/6olCuZYR/S9dGGh+jbwstQyLIgTHDX5BOEo/Z2EaSyD+U8hw5QL1MPY?= =?us-ascii?Q?gNlSbKeCXiLOBkdIeBNKh//Nm85M1V3Q6FvSuMUppNPkaY0zi/YxBI0EIysu?= =?us-ascii?Q?Whnch/JHzEnE8ZdlCJhgQCZHGejZ9Mgr5dzJyRI0Q1KdQWKqd4NjdwazAYgG?= =?us-ascii?Q?dfVxFaynliLVq7JtDo2nO/YtwGtw9NCezvKh2X1Ru+kWqhpC1lYm2qtquH+e?= =?us-ascii?Q?wIHKaRqoQI4KOmdbGOr6RL5L/EniV3kHyP7xah9fIf5UZNlZImUoSX27swxh?= =?us-ascii?Q?UTqc8ezAZV6dmts26/D1hCFXG2XBrXUKeGJVDlxhU77IS+nUfbmEjw1Hgn06?= =?us-ascii?Q?i92/3hFy4OBzYoyQHSVY1ghTUWfDAd4IHbDBedgiAKHTFESdAicte+awkly9?= =?us-ascii?Q?Eumf3whNWfmbAziGLTloVRiraZSXZcqXEdDxidvGlc+1OvI+JjU4bFM1K74B?= =?us-ascii?Q?AJHIy1fjLLKt4V1nBD6zT7D3D+XDtzOMZDTUEbR4+VKO0F+2crFleFUef+v2?= =?us-ascii?Q?1m3AR5hXj2nH/hmYRHZr2dDybwtL06AxXy0SihBUUDLBeqrxyx5zYidY+85q?= =?us-ascii?Q?xvct2bl18WAQXFq84F+ub+UbDzXySZ14va1KJPOAzBklVkTb83qWFd2p7YPm?= =?us-ascii?Q?7r5FlU2Pz/GNS3CN0nYAuz82metVI3DkPaWou1OWeamrJ3D6i817bp+fSeG+?= =?us-ascii?Q?s0MVMO8nzjmVXfvgcBPLgqEBGBFy7pe1FUI37JR7VWwwkKsV64d5/WlWOLyI?= =?us-ascii?Q?Le822PCIPeQGRl00qNZvYSzp4uyM0p0R/SHPu8VLpcxzlPKOw3VLZxSkA8Ye?= =?us-ascii?Q?HGUwGmdnfr7XowYQ69WMyEEC5f29308qr0zHWo8wMaOW9LOWam7LdeVgiOzN?= =?us-ascii?Q?7W/mp8jakRPYpmInjY4QLhxNJcRqTsCRWjE97kEQBGTkoJZXyBmJEV+AJ4YT?= =?us-ascii?Q?Eo72GTi2GywWW6FGplAnTvdhvD0grlLOYZnDBrFNKG+VKyBWbsH7qK5b0Wvq?= =?us-ascii?Q?zcEIgG8InOFePb464glbcUKFinsfbbEvWLRWF10eHr7/Yjt6qTTtrUYZOf9T?= =?us-ascii?Q?t/Cbi5GZVtoLpI9BuiyCbjRgdDnvWgzMQnw/M+srSTro5y7q+l/rg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3002; 6:m4N7zGwnrQUWmFL5mK7pfqvXPg1PA31W5c5D8DVrynnQVUhQcTmp914D8TFdILxAFYxFLyyNqIaDWKJfPm2Rt3x6VkkWYUFUe/pbDoFv/8e6zuRh5ZrNgFHSi8DKaDxX1konG9s55//43ydq4+m0VGIidpocvLvHcV2hnFXMMi5HPJlZaVXBQcJQRWRGJt2L7EZvLk8oWvL4lIQLsUQpdcXxqws8p6Nm+8drU7/F6r4xWEx/RD2IbGooD7f9K5al2Oa2u19r6rowwWzlwdfCi4wGYWD7j0B2C6ClEBij1ZFx5dFTLAJbHR0PB0abLeeD0ph4oU8IkkisG5HmilSisYD7N9e0l7WWyQtCnRVBAY0=; 5:JspF0EMCZwFF8y/pFxJ2vvofoX2/YBLbJBaLVyHBXgIxd8U4Tf5iajmPWAbCC+gKNitfuKqkflNf+XVJmoKRbFxFBrcXnDjl2K6WiCFmOId9LO9iVJYjp+fWjymw66/ZSXzrvETuo+0yGyY+2v86Tpp0vwKFnrIq924G2MvfKEU=; 24:X1D0HO6DnRB6UPbzq4dcGhTwh84g0qs9rvE0gZ43dQZHPJs6kTYBZHpbb7hiUHSbkVaw84LZS41eo352JpPcEG7u3SKNgqSRaxPf4tRWEM8=; 7:2AVo0ISTW558G5yEJHdfKACjd6LDK/1MqbKaX3cNW9TrpfvDHcv4XLRxoagXwOcUUlPVlCTOIi0tiTBbO3wTsrz0IVEad/Et8q1p0mUkMFbuiwlfweNES0tltgRXbqRj5DADbOFvgMyDyia46o2xhRTTLbegktJyyTQTj5I0DhZxaictgrxWrMJPp2uc6ZQd7auJCpcUpjOhvXUwJ6mGvpffHUzU8oIvgLoppatv2iU+03HXgbBbpbyGtNdMLhhI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2018 11:38:31.6251 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6a8ff46-3a21-41d5-2e2c-08d563e8299e 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 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 names (DRV_NAME macro) 'thunder-nicvf' to 'nicvf' and 'thunder-nic' to 'nicpf', sync bgx and xcv driver names accordingly to their module names. Signed-off-by: Vadim Lomovtsev --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 8f1dd55b3e08..159b422da7fa 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 "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..07f00558af9c 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 "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..0a8f3e3ce637 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 "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 */