The software free queue is shared by both Ethernet ports, but teardown is not ordered around that ownership. On parent unbind or module unload, the parent remove callback runs before devres depopulates the child devices. It therefore destroys the queue while both child netdevs are still registered and can be doing DMA. Devres then removes each child, and both child remove callbacks destroy the same queue again, resulting in up to three cleanup attempts. Removal before the first interface has been opened is broken as well. The shared block initialization assigns a nonzero queue order, but allocation is deferred until open. Cleanup consequently derives a nonzero page count and dereferences the NULL queue ring. Depopulate both port devices before cleaning up the queue, and perform that cleanup only from the parent. Disable the free-queue interrupt after the managed handlers have drained, since its threaded handler can re-enable it. Guard cleanup for paths where no queue was allocated. Hold parent-managed enables on the port clocks across child removal, IRQ draining and shared queue cleanup, so teardown never relies on clocks already released by the children. Port 1 owns the shared refill interrupt, so prevent the children from being unbound independently. Unregister each netdev before detaching its PHY so ndo_stop can still access netdev->phydev. Reported-by: Myeonghun Pak Closes: https://lore.kernel.org/netdev/20260917192835.58126-1-mhun512@gmail.com/ Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Signed-off-by: Linus Walleij --- drivers/net/ethernet/cortina/gemini.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 2fe7fd0202d2..0b05a1552983 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1004,6 +1004,9 @@ static void geth_cleanup_freeq(struct gemini_ethernet *geth) unsigned int pages = len >> fpp_order; unsigned int pn; + if (!geth->freeq_ring) + return; + writew(readw(geth->base + GLOBAL_SWFQ_RWPTR_REG), geth->base + GLOBAL_SWFQ_RWPTR_REG + 2); writel(0, geth->base + GLOBAL_SW_FREEQ_BASE_SIZE_REG); @@ -2387,11 +2390,10 @@ static irqreturn_t gemini_port_irq(int irq, void *data) static void gemini_port_remove(struct gemini_ethernet_port *port) { if (port->netdev) { - phy_disconnect(port->netdev->phydev); unregister_netdev(port->netdev); + phy_disconnect(port->netdev->phydev); } clk_disable_unprepare(port->pclk); - geth_cleanup_freeq(port->geth); } static void gemini_ethernet_init(struct gemini_ethernet *geth) @@ -2635,17 +2637,25 @@ static struct platform_driver gemini_ethernet_port_driver = { .driver = { .name = "gemini-ethernet-port", .of_match_table = gemini_ethernet_port_of_match, + .suppress_bind_attrs = true, }, .probe = gemini_ethernet_port_probe, .remove = gemini_ethernet_port_remove, }; +static void gemini_ethernet_disable_clk(void *data) +{ + clk_disable_unprepare(data); +} + static int gemini_ethernet_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct gemini_ethernet *geth; unsigned int retry = 5; + unsigned int clocks = 0; u32 val; + int ret; /* Global registers */ geth = devm_kzalloc(dev, sizeof(*geth), GFP_KERNEL); @@ -2656,6 +2666,30 @@ static int gemini_ethernet_probe(struct platform_device *pdev) return PTR_ERR(geth->base); geth->dev = dev; + /* Keep both port clocks enabled until the shared queue is torn down. */ + for_each_available_child_of_node_scoped(dev->of_node, child) { + struct clk *clk; + + if (!of_device_is_compatible(child, "cortina,gemini-ethernet-port")) + continue; + + clk = devm_get_clk_from_child(dev, child, "PCLK"); + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), + "failed to get port clock\n"); + + ret = clk_prepare_enable(clk); + if (ret) + return ret; + ret = devm_add_action_or_reset(dev, gemini_ethernet_disable_clk, + clk); + if (ret) + return ret; + clocks++; + } + if (!clocks) + return -ENODEV; + /* Wait for ports to stabilize */ do { udelay(2); @@ -2683,6 +2717,8 @@ static void gemini_ethernet_remove(struct platform_device *pdev) { struct gemini_ethernet *geth = platform_get_drvdata(pdev); + devm_of_platform_depopulate(&pdev->dev); + writel(0, geth->base + GLOBAL_INTERRUPT_ENABLE_4_REG); geth_cleanup_freeq(geth); geth->initialized = false; } -- 2.56.0