net: stmmac: Fixes for -net
Subsystems (4)
v2 cover net: stmmac: Fixes for -net
Fixes for stmmac respinned with Fixes tag.
1) Fixes the filtering selftests (again) for cases when the number of multicast filters are not enough.
2) Fixes SPH feature for MTU > default.
3) Fixes the behavior of accepting invalid MTU values.
4) Fixes FCS stripping for multi-descriptor packets.
5) Fixes the change of RX buffer size in XGMAC.
6) Fixes RX buffer size alignment.
7) Fixes the 16KB buffer alignment.
8) Fixes the enabling of 16KB buffer size feature.
---
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 (8):
net: stmmac: selftests: Needs to check the number of Multicast regs
net: stmmac: Determine earlier the size of RX buffer
net: stmmac: Do not accept invalid MTU values
net: stmmac: Only the last buffer has the FCS field
net: stmmac: xgmac: Clear previous RX buffer size
net: stmmac: RX buffer size must be 16 byte aligned
net: stmmac: 16KB buffer must be 16 byte aligned
net: stmmac: Enable 16KB buffer size
drivers/net/ethernet/stmicro/stmmac/common.h | 5 +-- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 3 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 45 ++++++++++++++-------- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 ++ 5 files changed, 38 insertions(+), 21 deletions(-)
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/8 net: stmmac: selftests: Needs to check the number of Multicast regs
When running the MC and UC filter tests we setup a multicast address that its expected to be blocked. If the number of available multicast registers is zero, driver will always pass the multicast packets which will fail the test.
Check if available multicast addresses is enough before running the tests.
---
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/stmmac_selftests.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +4 -0
@@ -624,6 +624,8 @@ static int stmmac_test_mcfilt(struct stmmac_priv *priv)return -EOPNOTSUPP ;if (netdev_uc_count (priv->dev) >= priv->hw->unicast_filter_entries)return -EOPNOTSUPP ; +if (netdev_mc_count (priv->dev) >= priv->hw->multicast_filter_bins) +return -EOPNOTSUPP ;while (--tries) {/* We only need to check the mc_addr for collisions */
@@ -666,6 +668,8 @@ static int stmmac_test_ucfilt(struct stmmac_priv *priv)if (stmmac_filter_check (priv))return -EOPNOTSUPP ; +if (netdev_uc_count (priv->dev) >= priv->hw->unicast_filter_entries) +return -EOPNOTSUPP ;if (netdev_mc_count (priv->dev) >= priv->hw->multicast_filter_bins)return -EOPNOTSUPP ;
Signature · 1 line
2.7.4
PATCH v2 2/8 net: stmmac: Determine earlier the size of RX buffer
In reply to Jose AbreuSplit Header feature needs to know the size of RX buffer but current code is determining it too late. Fix this by moving the RX buffer computation to earlier stage
---
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/stmmac_main.c | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +11 -13
@@ -1293,19 +1293,9 @@ static int init_dma_rx_desc_rings(struct net_device *dev, gfp_t flags)struct stmmac_priv *priv =netdev_priv (dev);u32 rx_count = priv->plat->rx_queues_to_use;int ret = -ENOMEM ; -int bfsize =0 ;int queue;int i; - bfsize =stmmac_set_16kib_bfsize (priv, dev->mtu); -if (bfsize <0 ) - bfsize =0 ; - -if (bfsize < BUF_SIZE_16KiB) - bfsize =stmmac_set_bfsize (dev->mtu, priv->dma_buf_sz); - - priv->dma_buf_sz = bfsize; -/* RX INITIALIZATION */ netif_dbg (priv, probe, priv->dev,"SKB addresses:\nskb\t\tskb data\tdma data\n" );
@@ -1347,8 +1337,6 @@ static int init_dma_rx_desc_rings(struct net_device *dev, gfp_t flags) } } - buf_sz = bfsize; -return 0 ; err_init_rx_buffers:
@@ -2658,6 +2646,7 @@ static void stmmac_hw_teardown(struct net_device *dev)static int stmmac_open (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev); +int bfsize =0 ;u32 chan;int ret;
@@ -2677,7 +2666,16 @@ static int stmmac_open(struct net_device *dev)memset (&priv->xstats,0 ,sizeof (struct stmmac_extra_stats )); priv->xstats.threshold = tc; - priv->dma_buf_sz =STMMAC_ALIGN (buf_sz); + bfsize =stmmac_set_16kib_bfsize (priv, dev->mtu); +if (bfsize <0 ) + bfsize =0 ; + +if (bfsize < BUF_SIZE_16KiB) + bfsize =stmmac_set_bfsize (dev->mtu, priv->dma_buf_sz); + + priv->dma_buf_sz =STMMAC_ALIGN (bfsize); + buf_sz = bfsize; + priv->rx_copybreak =STMMAC_RX_COPYBREAK ; ret =alloc_dma_desc_resources (priv);
Signature · 1 line
2.7.4
PATCH v2 3/8 net: stmmac: Do not accept invalid MTU values
In reply to Jose AbreuThe maximum MTU value is determined by the maximum size of TX FIFO so that a full packet can fit in the FIFO. Add a check for this in the MTU change callback.
Also check if provided and rounded MTU does not passes the maximum limit of 16K.
---
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/stmmac_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +10 -0
@@ -3827,12 +3827,22 @@ static void stmmac_set_rx_mode(struct net_device *dev)static int stmmac_change_mtu (struct net_device *dev,int new_mtu) {struct stmmac_priv *priv =netdev_priv (dev); +int txfifosz = priv->plat->tx_fifo_size; + +if (txfifosz ==0 ) + txfifosz = priv->dma_cap.tx_fifo_size; + + txfifosz /= priv->plat->tx_queues_to_use;if (netif_running (dev)) {netdev_err (priv->dev,"must be stopped to change its MTU\n" );return -EBUSY ; } +/* If condition true, FIFO is too small or MTU too large */ +if ((txfifosz < new_mtu) || (new_mtu >STMMAC_ALIGN (BUF_SIZE_16KiB))) +return -EINVAL ; + dev->mtu = new_mtu;netdev_update_features (dev);
Signature · 1 line
2.7.4
PATCH v2 4/8 net: stmmac: Only the last buffer has the FCS field
In reply to Jose AbreuOnly the last received buffer contains the FCS field. Check for end of packet before trying to strip the FCS field.
---
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/stmmac_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -2
@@ -3644,8 +3644,9 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)* feature is always disabled and packets need to be * stripped manually. */ -if (unlikely (priv->synopsys_id >=DWMAC_CORE_4_00 ) || -unlikely (status != llc_snap)) { +if (likely (!(status & rx_not_ls)) && + (likely (priv->synopsys_id >=DWMAC_CORE_4_00 ) || +unlikely (status != llc_snap))) {if (buf2_len) buf2_len -=ETH_FCS_LEN ;else
Signature · 1 line
2.7.4
PATCH v2 5/8 net: stmmac: xgmac: Clear previous RX buffer size
In reply to Jose AbreuWhen switching between buffer sizes we need to clear the previous value.
---
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.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +2 -0
@@ -343,6 +343,8 @@#define XGMAC_DMA_CH_RX_CONTROL (x) (0x00003108 + (0x80 * (x)))#define XGMAC_RxPBL GENMASK(21, 16)#define XGMAC_RxPBL_SHIFT 16 +#define XGMAC_RBSZ GENMASK(14, 1) +#define XGMAC_RBSZ_SHIFT 1#define XGMAC_RXST BIT(0)#define XGMAC_DMA_CH_TxDESC_HADDR (x) (0x00003110 + (0x80 * (x)))#define XGMAC_DMA_CH_TxDESC_LADDR (x) (0x00003114 + (0x80 * (x)))
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +2 -1
@@ -482,7 +482,8 @@ static void dwxgmac2_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan)u32 value; value =readl (ioaddr +XGMAC_DMA_CH_RX_CONTROL (chan)); - value |= bfsize <<1 ; + value &= ~XGMAC_RBSZ ; + value |= bfsize <<XGMAC_RBSZ_SHIFT ;writel (value, ioaddr +XGMAC_DMA_CH_RX_CONTROL (chan)); }
Signature · 1 line
2.7.4
PATCH v2 6/8 net: stmmac: RX buffer size must be 16 byte aligned
In reply to Jose AbreuWe need to align the RX buffer size to at least 16 byte so that IP doesn't mis-behave. This is required by HW.
---
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/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -46,7 +46,7 @@#include "dwxgmac2.h" #include "hwif.h" -#define STMMAC_ALIGN (x) __ALIGN_KERNEL(x, SMP_CACHE_BYTES) +#define STMMAC_ALIGN (x) ALIGN_DOWN(ALIGN_DOWN(x, SMP_CACHE_BYTES), 16)#define TSO_MAX_BUFF_SIZE (SZ_16K - 1)/* Module parameters */
Signature · 1 line
2.7.4
David Miller
maintainerRe: [PATCH net v2 6/8] net: stmmac: RX buffer size must be 16 byte aligned
From: Jose Abreu <[email protected]>
Date: Tue, 17 Dec 2019 12:42:36 +0100
Quoted 2 lines
We need to align the RX buffer size to at least 16 byte so that IP doesn't mis-behave. This is required by HW.
...
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c line 49
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1-#define STMMAC_ALIGN (x) __ALIGN_KERNEL(x, SMP_CACHE_BYTES) +#define STMMAC_ALIGN (x) ALIGN_DOWN(ALIGN_DOWN(x, SMP_CACHE_BYTES), 16)
You need to align up, not down.
PATCH v2 7/8 net: stmmac: 16KB buffer must be 16 byte aligned
In reply to Jose AbreuThe 16KB RX Buffer must also be 16 byte aligned. Fix 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/common.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +2 -3
@@ -365,9 +365,8 @@ struct dma_features {unsigned int arpoffsel; }; -/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ -#define BUF_SIZE_16KiB 16384 -/* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */ +/* RX Buffer size must be multiple of 4/8/16 bytes */ +#define BUF_SIZE_16KiB 16368#define BUF_SIZE_8KiB 8188#define BUF_SIZE_4KiB 4096#define BUF_SIZE_2KiB 2048
Signature · 1 line
2.7.4
PATCH v2 8/8 net: stmmac: Enable 16KB buffer size
In reply to Jose AbreuXGMAC supports maximum MTU that can go to 16KB. Lets add this check in the calculation of RX buffer size.
---
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/stmmac_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -1
@@ -1109,7 +1109,9 @@ static int stmmac_set_bfsize(int mtu, int bufsize) {int ret = bufsize; -if (mtu >= BUF_SIZE_4KiB) +if (mtu >= BUF_SIZE_8KiB) + ret = BUF_SIZE_16KiB; +else if (mtu >= BUF_SIZE_4KiB) ret = BUF_SIZE_8KiB;else if (mtu >= BUF_SIZE_2KiB) ret = BUF_SIZE_4KiB;
Signature · 1 line
2.7.4