net: stmmac: enable HW-accelerated VLAN stripping for gmac4 only
Subsystems (4)
PATCH 1/1 net: stmmac: enable HW-accelerated VLAN stripping for gmac4 only
Commit 750011e239a5 ("net: stmmac: Add support for HW-accelerated VLAN stripping") enables MAC level VLAN tag stripping for all MAC cores, but leaves set_hw_vlan_mode() and rx_hw_vlan() un-implemented for both gmac and xgmac.
On gmac and xgmac, ethtool reports rx-vlan-offload is on, both MAC and driver do nothing about VLAN packets actually, although VLAN works well.
Driver level stripping should be used on gmac and xgmac for now.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -3
@@ -7662,9 +7662,10 @@ int stmmac_dvr_probe(struct device *device,#ifdef STMMAC_VLAN_TAG_USED /* Both mac100 and gmac support receive VLAN tag detection */ ndev->features |=NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_STAG_RX ; - ndev->hw_features |=NETIF_F_HW_VLAN_CTAG_RX ; - priv->hw->hw_vlan_en = true; - +if (priv->plat->has_gmac4) { + ndev->hw_features |=NETIF_F_HW_VLAN_CTAG_RX ; + priv->hw->hw_vlan_en = true; + }if (priv->dma_cap.vlhash) { ndev->features |=NETIF_F_HW_VLAN_CTAG_FILTER ; ndev->features |=NETIF_F_HW_VLAN_STAG_FILTER ;
Signature · 1 line
2.34.1
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Mon, 1 Jul 2024 16:19:36 +0800 you wrote:
Commit
750011e239a5("net: stmmac: Add support for HW-accelerated VLAN stripping") enables MAC level VLAN tag stripping for all MAC cores, but leavesset_hw_vlan_mode()andrx_hw_vlan()un-implemented for both gmac and xgmac.On gmac and xgmac, ethtool reports rx-vlan-offload is on, both MAC and driver do nothing about VLAN packets actually, although VLAN works well.
[...]
Here is the summary with links:
- [net,v1] net: stmmac: enable HW-accelerated VLAN stripping for gmac4 only
https://git.kernel.org/netdev/net/c/8eb301bd7b0f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html