Message ID | 20170818140240.14804.84822.stgit@tlendack-t1.amdoffice.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="qG25WUmb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYlCb6TZwz9t3C for <patchwork-incoming@ozlabs.org>; Sat, 19 Aug 2017 00:02:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753670AbdHROCt (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 18 Aug 2017 10:02:49 -0400 Received: from mail-by2nam01on0063.outbound.protection.outlook.com ([104.47.34.63]:16387 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753667AbdHROCp (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 18 Aug 2017 10:02:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WW0OLNhTDugmu3SF6uFPF3nxS/9NWF/VonzxE7eQXeY=; b=qG25WUmbscVR04aXhZmGEUCl1GP7Zjo6ObOpEu3EmEMxWeqT+fMn3xxhjiCI3zrKDNPV+/47T+kHaxOkVnhDXLZM0aLuv5YgXcdTUV/JNv6hCy44AeHCvMndQGGkYHLUKToLLvjXm2gq2RDNejkCLJkicvr1F746D01xTre0jgE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by CY4PR12MB1143.namprd12.prod.outlook.com (10.168.164.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Fri, 18 Aug 2017 14:02:43 +0000 From: Tom Lendacky <thomas.lendacky@amd.com> Subject: [PATCH net-next v2 03/13] amd-xgbe: Be sure driver shuts down cleanly on module removal To: netdev@vger.kernel.org Cc: David Miller <davem@davemloft.net> Date: Fri, 18 Aug 2017 09:02:40 -0500 Message-ID: <20170818140240.14804.84822.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170818140209.14804.94997.stgit@tlendack-t1.amdoffice.net> References: <20170818140209.14804.94997.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR12CA0037.namprd12.prod.outlook.com (10.172.49.23) To CY4PR12MB1143.namprd12.prod.outlook.com (10.168.164.135) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de8641ae-76b1-492b-9cfe-08d4e641cc19 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR12MB1143; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 3:hBdaXnL6tE4QvTTt6VHh4HK+Sn3R2GrfpGNZ/IasnvR7bBcwSpR76s64kEXzF+gx1wEyGueQugpv2Sab75PG5gcEqs3leqVQ85naPiFF2VoP3C/QGyGu3OQNRMo54qbIIPw0YpEwNWr5p4GQ1Z+Zb0q/68AqZFuGzDj28eZjtpm+2sY5Nt3MyYsWWSJqCITF6o4xj+tza3A4fBV7zfPwPyq8qv1AgWBHtyJA9eYIGi7Rtpbv0nVSSd6I3tWYk6Oj; 25:mUs5x1CdFr7U9PsbPHIpXx9FqSCy0EoQHLlThdvRip/zihp3rDn9gMUbA13uXwm4us+IQxI7Sd/4zxAHKXZcNJ3NiDJIwjkBuy1YOKOZdY63cwt4RbQyUfigCDi3Qq98l/ceSIEVl5Uf5slDOGn1phZBKq9iz1755sOuZaoGR3mGAbp3pFkRCuInl51IRC+m3+Dno5oAGOmDKlmak1sUtnih926o94J9ZPaREz54F14tm3I0oCENzoqyDYwm5ggiWpD18GQPSDWREdRfDTQZkSluYfbdABt1pRPMFdeAO4Vz85hewyX+vfay3mWIega1A3tG2tkV3qYWlRxRuccWUQ==; 31:cnG8okWk1tnfGfl0FFKg3cPuHLjLaiziVikkyX87tbvZoLoqSzhCUrqMRJLU/uC7HQBjZh5ij+1qA2pkuJ/xfxQ+CCDbQn/qH4Ph12wsNk3fJz0M6Woa0kv3+ICVweimzmp4qLWG3ZJk7aNMHONWYhuHNLIk8hZhZlvwhzin+6fjnwanP39GXvDUf1Cu/KxwWuXD1ybG5lkxEvuVRzGIdjQpZeWwh3wI0s83HzGsMuk= X-MS-TrafficTypeDiagnostic: CY4PR12MB1143: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 20:fQgSNQHHkcSAGcFaPumo9gp3hMa6WWXgYfDOCrLeHKHb1r9Mj9esj9BmqWQ0gKXatvZBr2cEuqwwAt3goTqMSXaALmoy0iDcG0M8sfKUeLihcbN9mY/JfyYb3vj27YOwvRmE7w8Eo4k3uOnv1Ts24wYh8+mCFIKQ3N4VbibtX983X1c3UE/Pep4LU68hK2L/Jw41GlR5GFfJ4GauNHqBx/SUVaAa/R5kapZn9PgAbKpgws4iv/B/0YkZ/GCviIEFoh4GFvOSPKnwZTtD0nBE314w0omIpEZn6Fw4KIFtmQ13ze+dK8mhPtS/1uk45dWEUOmifGB4RVJT/eVhfWhHSPUyospfZOZZij1aJCU2M/TPqt4gmR8swqzZ8P23cqYg5mThoL2lmDzojI2Ghi7LuPCq4Y1u8Ang/OdLByO4exzB33Mqu9ayHZamU3Kyk7Awo20/KSZ9OCdcEfunLj+4NzVB2H+EahrAjhphqYqWpSdKSYYXtTK3CQGnYR+otam+; 4:RvL7NkBOzznxN3tXPTYzYlkErsaDuhquqPJPTyAK5Kn5rdq3JlMzZIqaUfu3+NTrmxrw5o2hZZUxo0cSooj6ji2dZ9jLjaEZAnb3X4kyW7UzJ66/d2NTy7x+wTo2bG87HgjV2L8INI/m+f1Ogt7+VcTYhIaWbf1rBmv+MIAG86YXiWFyJ/UzllYto4puUoW17cK/70UoosQ7s6HfPlTW6K9v8hxmE/xOXLHuLzK/PHzZp/JzSRH9vFR4a/0vIqecSRti0tvT6GO2D+s1drVoliHfuXDJURPO8+chHmHVOME= X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Microsoft-Antispam-PRVS: <CY4PR12MB1143ABF437F62EC1AEDDE45AEC800@CY4PR12MB1143.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR12MB1143; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR12MB1143; X-Forefront-PRVS: 040359335D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(199003)(305945005)(86362001)(5660300001)(6916009)(2351001)(1076002)(25786009)(2361001)(189998001)(33646002)(4001350100001)(81156014)(97746001)(97736004)(2906002)(83506001)(2950100002)(9686003)(55016002)(6506006)(23676002)(81166006)(103116003)(68736007)(53936002)(101416001)(230700001)(53416004)(6116002)(106356001)(3846002)(110136004)(50986999)(72206003)(54356999)(76176999)(50466002)(69596002)(66066001)(42186005)(7736002)(105586002)(478600001)(4326008)(47776003)(7350300001)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1143; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQzOzIzOnBpQVR3WlF2MUZONVVncWEyb0RoOWl6Wmgw?= =?utf-8?B?VGxYVzhBVjBVYTl3Q1VjT0p2U2lIUUk5d05sbUdBaGNMdDlYemV1VzN5YnFY?= =?utf-8?B?NlVoZDFoMXc2K0FxTjBRbTNqdjJidHZsVUkweUdhS3VMN2RWNVdmNzV3R2hm?= =?utf-8?B?M1JZeTNHNGJNY244RTJzc2VCendwY2l2WWltam5VbitGejFiS0tUa2VkLzRy?= =?utf-8?B?cC9xdVJ0akN6VTBtVUs4bERvTDRGRjdRZGdLOTdNTWJHaElEVW9wS2w3Zi91?= =?utf-8?B?Q0s1NHJuS0lJcGZRQTZEdE55ZGhrZkE2NC9SM3Vrck85ZHFqL0xWeGpMclAz?= =?utf-8?B?SnlNTElYN2hIUlAzTWFLRm96U2Y1aFZFZTFONkk2Z21vM2ovcUFSS0RuenJ3?= =?utf-8?B?Mk9wYVJhdElCQVlDdVJVZzE1dytrc2hZalRWdUkvQjZpT2tlRmxrajI3MXd3?= =?utf-8?B?UkJxNFZ1Y29qeGN4ell5ejVYaHB6Y2RxL3JBWXNHVTB0WkppWVdueSs4ZUlJ?= =?utf-8?B?ZGVGMVNSWHRjQXp4a25RMldzQ2tUZ1JwWFpMOUhGampWYjBvNFJ4Tk9jTFB1?= =?utf-8?B?cVZWS2lsU1lLbVhqOHhIaGlEK1hhTkdka3c1ZGI5VmtKQllSNkkwMnY1Smlv?= =?utf-8?B?cnIwMHNXMnc3ZFBWcHpVUDhJM0V2VGFrdW8ya0VEODl5OXlJbmdHWGpmUXpR?= =?utf-8?B?OFNXSEJaYWpWU2NhTFdvVHpLVzBnVGJteG81cFowa3Z6RHFFVitVb0t2MzFG?= =?utf-8?B?bTVmL25lMVdGTC9hSVoyaC96ZS9LVXMyd1NCV2FFVkxLb0x2RmJBa2NVcGZU?= =?utf-8?B?WTZaL1lmVHk3ZnVkTDZBcEZETFRQNzZwUU5nb0xxVytSd1dhVXdaQTk3NW9I?= =?utf-8?B?NFpFVUJQZzRhWkhDeDYwWUovYStoL3N4TnB4c3c1U2dteVE4OVVYV1I4WXBJ?= =?utf-8?B?VHRRdzNlWEJpMVdHNjF1QnJydmlnRjVSTi81ekVXaEhpRE1XTG9halU5THRD?= =?utf-8?B?M2g1WVZ5ZVZvWEtiUDNSYUJrU0NqUm5vcXk5dXBSdXA1SktBN282Rm1WbDYv?= =?utf-8?B?T2wwZzdEdG9YclQ0YXBnUWg0aThjOS9NL0lDdG5qcjI0SG1ZSUcvcUVaR2Q4?= =?utf-8?B?ak96cGNhcEZaWm1pN3V5ZVFaWU4vVGgwTEJMYmJrdDdJR3M1V1J4RWFCbEht?= =?utf-8?B?ZXNJZG1rM1VZeDB6S3RPMVVId3RZZVVwajRONFdtVjM2V1ZzSGlFVWI3R2hQ?= =?utf-8?B?TGF5MVk2R2RKWG4xdG40RXZxTUxtMWJkaHZNaVpDQVo4K2prMFlxN2dmVWpD?= =?utf-8?B?SWxhMkh2Z21GdUxUc1JBcTY3ZWNXdENpMkovVFlneW1LeG0yRmdSY3ZRZHRW?= =?utf-8?B?Unk1NmNPQUUwbXlPTnN0M2U2Mk44ZExVVlpqUmlHTmZzdWROTmJ6UzVhYnY2?= =?utf-8?B?bkptdXN1QzJyL0pHbzNxVld2blZhUWNHUm1VSytVZXNMLzBndWpEZFY4Zmpp?= =?utf-8?B?WFBJUzJGU0ZrOVVrcU96K3RHTm9YYW44T1BCWlE0ZG15VG1zK2M3WmRhbU5X?= =?utf-8?B?VG5tdnY3N3RMaC9xbWcvK05HUTRJYVZKQVg2emR0VmZjckJHM01ZYkRTNnkx?= =?utf-8?B?eVJ2b1RJcWFwdlAvMHBESXk3aGFibTM1c294ZkN1VTUzMkx6UFZJUk5YUVZF?= =?utf-8?Q?CR25EwQU0lZo/cLayg3pcznEFyTffCz3aQj5mOm?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 6:ax7g7VebZ4QiccdlQBcLEv0G8yKs+TpCZpQqIPJbcx/uxFUjjs01eAa/z4NTgI3Lz0HyvaWnFSZRa6rorLK5A5R2ZJdBNQ1GxRvG7PfnxZ2NrQNMtQX8vcUiGHSlVhZ/QHWbzq2LU7Jg8CZ3GVY1LpHXd12KH+0c32cUpUC0w+KBwioDXqwaV5JyKm7WkZK6szP0kLXhbmDRv9jGvrD9QIu2uoB4zMaF8CiipFGGguSgpqzngfzIFlNIR21ugprS+I0cULBFl031jfYcQq4YBlUZdoRsAzLyHJIYidGoUZHN6wcBc2Qh5XcElOA+LJbydoDHbEeU/lKjCHDL0D+Ozw==; 5:aB/W/o3A0tGOmVyKcTX1hWanGr3ofH5NwDPcKCQf5M+Z1VLeLsEW4js9DPu5V6VXyiFwuq6Tnfa9H49J3TyNE1M3hkfrRtEtBTfRgS3V73pLmBNrBnUcvtEiylf3jFK5/4VXeAcwe9B1cmvjmbSgCg==; 24:1x4x/RljnucAu9mR08wg/sPgxX1+BqHLj9IYMim6btMzEf9SoousAT+A0jLSmwi4RrQM3AGRhvrfGpMa+DR754x+4ZgUJGXBnE9jNzph9H0=; 7:ZlZCY3KEY1o7DOXoZtYyJhyyO+ZH2v+JE6i/yhtyDNF5MVmuVnixSAxNSL69xCQ8dGc58TP76+EBb9+bqemskPv5homSTPv8X5td8jfHFcaDRQOkmGuxcOL809T0prKX1ZjNfjNeIiDm2yxyEm2JF4NSmdtX0O12uhYYKP8ECY6auLUZnglrrwuVpW4p7zvfglKYAwzH3aN3ECQUVEcRuOAayg9zZ8X/KOahnEIzzoo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 20:OELIniKyzrvQboDHrVqa8i7ZDduXSjOQGteXa2yJ3UEiPaPsyTj0HifhJDsxBBsFjm/OFzFc+LOmLVY7PUHhSLdoQc0SWRFormRKXQBmSUcKU7e3Dsf+vn0p8HywxoHwYNAsM9RPkhg71mXHvoHH1+pkzX8uTAOU3/ur8SGfvt2TC+Tj16U3YKqkoDIBzKikrhVo/7Hb5iwPwhntlSRFp3QRanOkUCiISDqnuUNA8BkmmdqTFSnkOX2oNd18+IcR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 14:02:43.3200 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index 500147d..53a425c 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -458,6 +458,8 @@ void xgbe_deconfig_netdev(struct xgbe_prv_data *pdata) if (IS_REACHABLE(CONFIG_PTP_1588_CLOCK)) xgbe_ptp_unregister(pdata); + unregister_netdev(netdev); + pdata->phy_if.phy_exit(pdata); flush_workqueue(pdata->an_workqueue); @@ -465,8 +467,6 @@ void xgbe_deconfig_netdev(struct xgbe_prv_data *pdata) flush_workqueue(pdata->dev_workqueue); destroy_workqueue(pdata->dev_workqueue); - - unregister_netdev(netdev); } static int __init xgbe_mod_init(void) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 2222bbf8..2409202 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c @@ -1533,8 +1533,6 @@ static int xgbe_phy_best_advertised_speed(struct xgbe_prv_data *pdata) static void xgbe_phy_exit(struct xgbe_prv_data *pdata) { - xgbe_phy_stop(pdata); - pdata->phy_if.phy_impl.exit(pdata); }
Sometimes when the driver is being unloaded while the devices are still up the driver can issue errors. This is based on timing and the double invocation of some routines. The phy_exit() call needs to be run after the network device has been closed and unregistered from the system. Also, the phy_exit() does not need to invoke phy_stop() since that will be called as part of the device closing, so remove that call. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> --- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 4 ++-- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)