2020-01-10 15:15:03

by Jose Abreu

Subject: [PATCH net-next 0/2] 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(+)

--
2.7.4

2020-01-10 15:15:53

by Jose Abreu

Subject: [PATCH net-next 2/2] net: stmmac: gmac5+: Fix missing return

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

Fixes: 7c7282746883 ("net: stmmac: gmac5+: Add support for Frame Preemption")
Signed-off-by: Jose Abreu <[email protected]>

---
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(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c
index 5d4a3c2458ea..494c859b4ade 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c
@@ -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);
--
2.7.4

2020-01-10 19:32:57

by David Miller

Subject: Re: [PATCH net-next 0/2] net: stmmac: Frame Preemption fixes

From: Jose Abreu <[email protected]>
Date: Fri, 10 Jan 2020 16:13:33 +0100

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