Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org
Cc:     Madalin Bucur <madalin.bucur@nxp.com>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH] net: fman: Unregister ethernet device on removal
Date:   Thu,  3 Nov 2022 14:28:30 -0400
Message-Id: <20221103182831.2248833-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c3J8RkD5zbB+nbr0T+BGFIY49T32peskSA28Edg7YhY+naw0FghXj5rmRWks?=
 =?us-ascii?Q?KobxrO7EVCrL32Krjgb/EIbGnCrwvcJ2ywKmZZthG8nov9YcI+jQMINinmLg?=
 =?us-ascii?Q?ObcR0O8pRBiUJqNvfUB/9r8gbUks6DmNog5dXv5DggWmYL/oX21IRHwFiw9C?=
 =?us-ascii?Q?YGs5dHgSXeOzhKrJwDHx4LByr4VXj10wWDhwpscVKGpFfdiPRmKWdv+q62oV?=
 =?us-ascii?Q?SKMNOrXAUSW+vSuJaZUCmVS/otWeeZ91t8VaADHchEI/ujAdf8s48rOWWbpX?=
 =?us-ascii?Q?lZZ2DuITbTcuFxv6YOjbzErgS+m5qRazTh4DcETjf76LnlRlrT7+vDr5W57C?=
 =?us-ascii?Q?0Uy9bcED/MI5u+OsEX5CtunZyjCGAFnaSCGWcS6qGwk4Ax5QbdnJc1VdP51z?=
 =?us-ascii?Q?Z2EO81JtPFPQ2aqbcJafnISWJIyAnka8kedlHEDIbGSDaIHezysdoqPw3JIB?=
 =?us-ascii?Q?1kgw1jZ+NwqnbE1jQipXsoA7VlY87eBi+9p7TLOdQbdP9WVzFohSqBvTYY+Q?=
 =?us-ascii?Q?ytmeBneCpU01Re2JEeieccWhG/9oRINMRFyi5h8sx42pHiyEy4bZ+GVxvqDl?=
 =?us-ascii?Q?8Eu+Brs1/1MM77AbLvd+tM2BkEQKD/P633iYmpfMcxkpqMSZwBo7NbMAXVtG?=
 =?us-ascii?Q?cNhN5CYVdxzrXPGjWh965m9TCAyuljh6qSyxUpk7jEuJHk1UZEwq5WleUslt?=
 =?us-ascii?Q?NZNZBcVoIlBYLPoUJFgGa6ZUK9EU+E0atWKDg29UYYUr5MUdHSIZa9VKvWGI?=
 =?us-ascii?Q?sAKLCQgjxjYqmy66cfqBRg+8o3U5y6/6N543Dx/VLWPOSoeQCE48ErrXdhwJ?=
 =?us-ascii?Q?Zv7YK2lu8ze6I+OziMIYfe9elyS4HZYDFssOhW8flhCbmCxDFTnWiLGSBJ2t?=
 =?us-ascii?Q?OM+3ZZhpkaiq9H/qwxNmtHyhNOg1ThjFpyLrF1LtGy4PWljb+WXbUako43uq?=
 =?us-ascii?Q?bDZOPxnOhNgyE/7N4J6yBgkP+ZIsRhqcNOnH9jKUrluiJbBKKlgM2bFDJzzs?=
 =?us-ascii?Q?YsmLbek0NUiNg0y/pICNyDxN4i7KLw8W6hvni9WXPM9fi5XZeENWOzOfIBCu?=
 =?us-ascii?Q?cZDBo8uN58Xdpn/pBiulwhd9YnR9XVS7L3wy/F3be/ytJmPN3rovWdnmihIi?=
 =?us-ascii?Q?Qv0TIJG80Zzao7fdzWcevyJpd0EhUTdt04AFV27JjKiq2A4N1fkVF+S89iNq?=
 =?us-ascii?Q?E3hmX7rMPFpjy+vd1llolWDCU+ICpSMmHn4WYbcsyyye+NVv0KwLEbjS4qRd?=
 =?us-ascii?Q?PYr/kwpQgd3NoBDkyVIlRQAiLIyOmtmfEOhso/tl4N8dVvosvQzHGjuf9eM3?=
 =?us-ascii?Q?esqsqS7Kk4OtlH3ZsVhL4/wvmHBUcapeCmmBVHoxiDeqMcq+ty0dpmYbIZhM?=
 =?us-ascii?Q?VEqLOVOHRo0gY3jhmiqoZPo4T84nkj+bzwwNooEw6R1BYtae8IGIYNG3JbEJ?=
 =?us-ascii?Q?82liv5oKhlE43W3V1bgig6bxiJHz3JeqGsSW9duHiwid02iIa9opWN0xBWcR?=
 =?us-ascii?Q?4s06X+nEb5nMAOx33WN41CWC+P68XUINCBqpunWK/d9Q/hSLHeslOK/tmADJ?=
 =?us-ascii?Q?NoYmzQGsoE0Q9g6BUItpd+0NJ2F0j6heHsdFgFkua9LwiFyHRSmD/5Z5Pj0Q?=
 =?us-ascii?Q?VA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c570bbd4-06e4-43da-04ad-08dabdc93b98
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 18:28:41.3022
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hR/2DKNpE0cg08PpoheuA/mLLm469pQm4/BJd9DPUQpei6AV1rDyw3DXQrpbzJoRPNoG7m17FguRF9lKwQfbCA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6369
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When the mac device gets removed, it leaves behind the ethernet device.
This will result in a segfault next time the ethernet device accesses
mac_dev. Remove the ethernet device when we get removed to prevent
this. This is not completely reversible, since some resources aren't
cleaned up properly, but that can be addressed later.

Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
So... why *do* we have a separate device for the ethernet interface?
Can't the mac device just register the netdev itself?

 drivers/net/ethernet/freescale/fman/mac.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 65df308bad97..13e67f2864be 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -487,12 +487,21 @@ static int mac_probe(struct platform_device *_of_dev)
 	return err;
 }
 
+static int mac_remove(struct platform_device *pdev)
+{
+	struct mac_device *mac_dev = platform_get_drvdata(pdev);
+
+	platform_device_unregister(mac_dev->priv->eth_dev);
+	return 0;
+}
+
 static struct platform_driver mac_driver = {
 	.driver = {
 		.name		= KBUILD_MODNAME,
 		.of_match_table	= mac_match,
 	},
 	.probe		= mac_probe,
+	.remove		= mac_remove,
 };
 
 builtin_platform_driver(mac_driver);
-- 
2.35.1.1320.gc452695387.dirty