]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ethernet: mtk-star-emac: rearm interrupts in rx_poll only when advised
authorLouis-Alexis Eyraud <louisalexis.eyraud@collabora.com>
Thu, 24 Apr 2025 08:38:49 +0000 (10:38 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 26 Apr 2025 02:06:56 +0000 (19:06 -0700)
In mtk_star_rx_poll function, on event processing completion, the
mtk_star_emac driver calls napi_complete_done but ignores its return
code and enable RX DMA interrupts inconditionally. This return code
gives the info if a device should avoid rearming its interrupts or not,
so fix this behaviour by taking it into account.

Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver")
Signed-off-by: Louis-Alexis Eyraud <louisalexis.eyraud@collabora.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://patch.msgid.link/20250424-mtk_star_emac-fix-spinlock-recursion-issue-v2-2-f3fde2e529d8@collabora.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mediatek/mtk_star_emac.c

index 23115881d8e892a622b34b593cf38e2c8bed4082..b175119a6a7da517f20267fde7b2005d6c0bbadd 100644 (file)
@@ -1348,8 +1348,7 @@ static int mtk_star_rx_poll(struct napi_struct *napi, int budget)
        priv = container_of(napi, struct mtk_star_priv, rx_napi);
 
        work_done = mtk_star_rx(priv, budget);
-       if (work_done < budget) {
-               napi_complete_done(napi, work_done);
+       if (work_done < budget && napi_complete_done(napi, work_done)) {
                spin_lock_irqsave(&priv->lock, flags);
                mtk_star_enable_dma_irq(priv, true, false);
                spin_unlock_irqrestore(&priv->lock, flags);