net: stmmac: Frame Preemption fixes
Subsystems (4)
cover net: stmmac: Frame Preemption fixes
Two single fixes for the -next tree for recently introduced Frame Preemption feature.
1) and 2) fixes the disabling of Frame Preemption that was not being correctly handled because of a missing return.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
Jose Abreu (2):
net: stmmac: xgmac: Fix missing return
net: stmmac: gmac5+: Fix missing return
drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 1 + 2 files changed, 2 insertions(+)
Signature · 1 line
2.7.4
PATCH 1/2 net: stmmac: xgmac: Fix missing return
If FPE is supposed to be disabled we need to return after disabling it.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +1 -0
@@ -1421,6 +1421,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq, value &= ~XGMAC_EFPE ;writel (value, ioaddr +XGMAC_FPE_CTRL_STS ); +return ; } value =readl (ioaddr +XGMAC_RXQ_CTRL1 );
Signature · 1 line
2.7.4
PATCH 2/2 net: stmmac: gmac5+: Fix missing return
In reply to Jose AbreuIf FPE is supposed to be disabled we need to return after disabling it.
---
Cc: Giuseppe Cavallaro <[email protected]>
Cc: Alexandre Torgue <[email protected]>
Cc: Jose Abreu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac5.c +1 -0
@@ -657,6 +657,7 @@ void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq, value &= ~EFPE ;writel (value, ioaddr +MAC_FPE_CTRL_STS ); +return ; } value =readl (ioaddr +GMAC_RXQ_CTRL1 );
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
David Miller
maintainerFrom: Jose Abreu <[email protected]>
Date: Fri, 10 Jan 2020 16:13:33 +0100
Quoted 5 lines
Two single fixes for the -next tree for recently introduced Frame Preemption feature.
1) and 2) fixes the disabling of Frame Preemption that was not being correctly handled because of a missing return.
Series applied, thanks.