Skip to contentSkip to conversation

net: stmmac: Frame Preemption fixes

PATCH In review Jose Abreu 2 participants 4 messages Jan 10, 2020

Subsystems (4)
lore
Share & tools
lore

Jose Abreu

author
#0 lore raw

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
author
#1 lore raw

PATCH 1/2 net: stmmac: xgmac: Fix missing return

If FPE is supposed to be disabled we need to return after disabling it.

Fixes f0e56c8d8f7d ("net: stmmac: xgmac3+: Add support for Frame Preemption")

---
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
index 307105e8dea0..2af3ac5409b7 100644
@@ -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
author
#2 lore raw

PATCH 2/2 net: stmmac: gmac5+: Fix missing return

In reply to Jose Abreu

If FPE is supposed to be disabled we need to return after disabling it.

Fixes 7c7282746883 ("net: stmmac: gmac5+: Add support for Frame Preemption")

---
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
index 5d4a3c2458ea..494c859b4ade 100644
@@ -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
maintainer
#3 lore raw
In reply to Jose Abreu

From: 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.