From: Serge Semin <Sergey.Semin@baikalelectronics.ru> To: Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Joao Pinto <Joao.Pinto@synopsys.com>, Jose Abreu <Jose.Abreu@synopsys.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>, Serge Semin <fancer.lancer@gmail.com>, Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>, Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>, Vyacheslav Mitrofanov <Vyacheslav.Mitrofanov@baikalelectronics.ru>, Russell King <linux@armlinux.org.uk>, Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>, <netdev@vger.kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Subject: [PATCH 03/20] net: stmmac: Fix false MTL RX overflow handling for higher queues Date: Mon, 8 Feb 2021 17:03:24 +0300 [thread overview] Message-ID: <20210208140341.9271-4-Sergey.Semin@baikalelectronics.ru> (raw) In-Reply-To: <20210208140341.9271-1-Sergey.Semin@baikalelectronics.ru> Judging by the MAC/MTL-related part of the ISR implementation if MTL IRQs status handler returns MTL Rx overflow bit set, the stmmac_set_rx_tail_ptr() method will be called for all subsequent queues. That most likely isn't what we want. Fix it by just overriding the status variable on each loop iteration. Note we can freely break the loop at the very beginning if the stmmac_host_mtl_irq_status() method returns -EINVAL, because that error means the MTL IRQ status handler isn't available for the detected hardware. Fixes: 7bac4e1ec3ca ("net: stmmac: stmmac interrupt treatment prepared for multiple queues") Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- Folks, I haven't seen an effect of that bug. The patch has been created purely based on the code visual perception. If you think the handler is supposed to work like that and I am missing something (though I have much doubt about that), just drop this patch. --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 5ee840525824..d45af1ea2565 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4149,7 +4149,6 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) /* To handle GMAC own interrupts */ if ((priv->plat->has_gmac) || xmac) { int status = stmmac_host_irq_status(priv, priv->hw, &priv->xstats); - int mtl_status; if (unlikely(status)) { /* For LPI we need to save the tx status */ @@ -4162,10 +4161,10 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) for (queue = 0; queue < queues_count; queue++) { struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; - mtl_status = stmmac_host_mtl_irq_status(priv, priv->hw, - queue); - if (mtl_status != -EINVAL) - status |= mtl_status; + status = stmmac_host_mtl_irq_status(priv, priv->hw, + queue); + if (status == -EINVAL) + break; if (status & CORE_IRQ_MTL_RX_OVERFLOW) stmmac_set_rx_tail_ptr(priv, priv->ioaddr, -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Serge Semin <Sergey.Semin@baikalelectronics.ru> To: Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Joao Pinto <Joao.Pinto@synopsys.com>, Jose Abreu <Jose.Abreu@synopsys.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Andrew Lunn <andrew@lunn.ch>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Russell King <linux@armlinux.org.uk>, Serge Semin <fancer.lancer@gmail.com>, Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>, Serge Semin <Sergey.Semin@baikalelectronics.ru>, Vyacheslav Mitrofanov <Vyacheslav.Mitrofanov@baikalelectronics.ru>, Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Heiner Kallweit <hkallweit1@gmail.com> Subject: [PATCH 03/20] net: stmmac: Fix false MTL RX overflow handling for higher queues Date: Mon, 8 Feb 2021 17:03:24 +0300 [thread overview] Message-ID: <20210208140341.9271-4-Sergey.Semin@baikalelectronics.ru> (raw) In-Reply-To: <20210208140341.9271-1-Sergey.Semin@baikalelectronics.ru> Judging by the MAC/MTL-related part of the ISR implementation if MTL IRQs status handler returns MTL Rx overflow bit set, the stmmac_set_rx_tail_ptr() method will be called for all subsequent queues. That most likely isn't what we want. Fix it by just overriding the status variable on each loop iteration. Note we can freely break the loop at the very beginning if the stmmac_host_mtl_irq_status() method returns -EINVAL, because that error means the MTL IRQ status handler isn't available for the detected hardware. Fixes: 7bac4e1ec3ca ("net: stmmac: stmmac interrupt treatment prepared for multiple queues") Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- Folks, I haven't seen an effect of that bug. The patch has been created purely based on the code visual perception. If you think the handler is supposed to work like that and I am missing something (though I have much doubt about that), just drop this patch. --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 5ee840525824..d45af1ea2565 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4149,7 +4149,6 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) /* To handle GMAC own interrupts */ if ((priv->plat->has_gmac) || xmac) { int status = stmmac_host_irq_status(priv, priv->hw, &priv->xstats); - int mtl_status; if (unlikely(status)) { /* For LPI we need to save the tx status */ @@ -4162,10 +4161,10 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) for (queue = 0; queue < queues_count; queue++) { struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; - mtl_status = stmmac_host_mtl_irq_status(priv, priv->hw, - queue); - if (mtl_status != -EINVAL) - status |= mtl_status; + status = stmmac_host_mtl_irq_status(priv, priv->hw, + queue); + if (status == -EINVAL) + break; if (status & CORE_IRQ_MTL_RX_OVERFLOW) stmmac_set_rx_tail_ptr(priv, priv->ioaddr, -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-08 14:23 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-08 14:03 [PATCH 00/20] net: stmmac: Obvious cleanups and several fixes Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 01/20] net: phy: realtek: Fix events detection failure in LPI mode Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 15:27 ` Andrew Lunn 2021-02-08 15:27 ` Andrew Lunn 2021-02-08 17:44 ` Serge Semin 2021-02-08 17:44 ` Serge Semin 2021-02-08 19:03 ` Andrew Lunn 2021-02-08 19:03 ` Andrew Lunn 2021-02-08 20:14 ` Heiner Kallweit 2021-02-08 20:14 ` Heiner Kallweit 2021-02-09 10:15 ` Serge Semin 2021-02-09 10:15 ` Serge Semin 2021-02-09 10:37 ` Heiner Kallweit 2021-02-09 10:37 ` Heiner Kallweit 2021-02-09 10:56 ` Russell King - ARM Linux admin 2021-02-09 10:56 ` Russell King - ARM Linux admin 2021-02-10 16:47 ` Serge Semin 2021-02-10 16:47 ` Serge Semin 2021-02-11 10:39 ` Russell King - ARM Linux admin 2021-02-11 10:39 ` Russell King - ARM Linux admin 2021-02-11 10:52 ` Serge Semin 2021-02-11 10:52 ` Serge Semin 2021-02-20 9:02 ` Serge Semin 2021-02-20 9:02 ` Serge Semin 2021-02-20 12:51 ` Heiner Kallweit 2021-02-20 12:51 ` Heiner Kallweit 2021-02-20 15:49 ` Andrew Lunn 2021-02-20 15:49 ` Andrew Lunn 2021-02-21 13:51 ` Serge Semin 2021-02-21 13:51 ` Serge Semin 2021-02-09 10:54 ` Russell King - ARM Linux admin 2021-02-09 10:54 ` Russell King - ARM Linux admin 2021-02-08 14:03 ` [PATCH 02/20] net: stmmac: Free Rx descs on Tx allocation failure Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` Serge Semin [this message] 2021-02-08 14:03 ` [PATCH 03/20] net: stmmac: Fix false MTL RX overflow handling for higher queues Serge Semin 2021-02-08 14:03 ` [PATCH 04/20] net: stmmac: Assert reset control after MDIO de-registration Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 05/20] net: stmmac: Use dwmac410_disable_dma_irq for DW MAC v4.10 DMA Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 06/20] net: stmmac: Use LPI IRQ status-related macro in DW MAC1000 isr Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 07/20] net: stmmac: Clear descriptors before initializing them Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 08/20] net: stmmac: Fix typo in the XGMAC_L3_ADDR3 macro name Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 09/20] net: stmmac: Discard mii_irq array from private data Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 19:13 ` Andrew Lunn 2021-02-08 19:13 ` Andrew Lunn 2021-02-08 14:03 ` [PATCH 10/20] net: stmmac: Discard Rx copybreak ethtool setting Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 11/20] net: stmmac: Discard index usage in the dirty_rx init Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 12/20] net: stmmac: Discard dwmac1000_dma_ops declaration from dwmac100.h Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 13/20] net: stmmac: Move DMA Tx/Rx init methods to DW MAC lib Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 14/20] net: stmmac: Add DW GMAC disable LPI IRQ mask macro Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 15/20] net: stmmac: Discard STMMAC_RESETING flag Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 16/20] net: stmmac: Discard conditional service task execution Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 17/20] net: stmmac: Add 'cause' arg to the service task executioner Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 18/20] net: stmmac: Move PTP clock enabling to PTP-init method Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 19/20] net: stmmac: Move DMA stop procedure to HW-setup antagonist Serge Semin 2021-02-08 14:03 ` Serge Semin 2021-02-08 14:03 ` [PATCH 20/20] net: stmmac: Move MAC Tx/Rx disabling " Serge Semin 2021-02-08 14:03 ` Serge Semin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210208140341.9271-4-Sergey.Semin@baikalelectronics.ru \ --to=sergey.semin@baikalelectronics.ru \ --cc=Alexey.Malahov@baikalelectronics.ru \ --cc=Joao.Pinto@synopsys.com \ --cc=Jose.Abreu@synopsys.com \ --cc=Pavel.Parkhomenko@baikalelectronics.ru \ --cc=Vyacheslav.Mitrofanov@baikalelectronics.ru \ --cc=alexandre.torgue@st.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=fancer.lancer@gmail.com \ --cc=hkallweit1@gmail.com \ --cc=joabreu@synopsys.com \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=linux@armlinux.org.uk \ --cc=mcoquelin.stm32@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=peppe.cavallaro@st.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.