| Message ID | cover.1537171752.git.joabreu@synopsys.com |
|---|---|
| Headers | show |
| Series | net: stmmac: Coalesce and tail addr fixes | expand |
From: Jose Abreu <Jose.Abreu@synopsys.com> Date: Mon, 17 Sep 2018 09:22:55 +0100 > The fix for coalesce timer and a fix in tail address setting that impacts > XGMAC2 operation. > > The series is: > Tested-by: Jerome Brunet <jbrunet@baylibre.com> > on a113 s400 board (single queue) Series applied and queued up for -stable.
On Tue, Sep 18, 2018 at 07:48:46PM -0700, David Miller wrote: > > From: Jose Abreu <Jose.Abreu@synopsys.com> > Date: Mon, 17 Sep 2018 09:22:55 +0100 > > > The fix for coalesce timer and a fix in tail address setting that impacts > > XGMAC2 operation. > > > > The series is: > > Tested-by: Jerome Brunet <jbrunet@baylibre.com> > > on a113 s400 board (single queue) > > Series applied and queued up for -stable. Hello David, Jose, While it says that the series was queued up for -stable, only patch 2/2: 0431100b3d82 ("net: stmmac: Fixup the tail addr setting in xmit path") was queued up for 4.14 stable. patch 1/2: 8fce33317023 ("net: stmmac: Rework coalesce timer and fix multi-queue races") is missing in 4.14 stable, even though the fixes tag refers to a commit that was first included in v4.12. Patch 1/2 does not apply without conflicts. However, since this fixes multi-queue races, and appears to fix the irq coalescing implementation that has been giving us problems in the past: https://lkml.org/lkml/2016/11/24/571 I suggest that we try to get this backported. If the conflicts are non-trivial, perhaps Jose can help with the backport to 4.14 stable? Kind regards, Niklas
The fix for coalesce timer and a fix in tail address setting that impacts XGMAC2 operation. The series is: Tested-by: Jerome Brunet <jbrunet@baylibre.com> on a113 s400 board (single queue) Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Jerome Brunet <jbrunet@baylibre.com> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Cc: David S. Miller <davem@davemloft.net> Cc: Joao Pinto <jpinto@synopsys.com> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Jose Abreu (2): net: stmmac: Rework coalesce timer and fix multi-queue races net: stmmac: Fixup the tail addr setting in xmit path drivers/net/ethernet/stmicro/stmmac/common.h | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 14 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 238 ++++++++++++---------- include/linux/stmmac.h | 1 + 4 files changed, 149 insertions(+), 108 deletions(-)