net: ethernet: mediatek: support setting MTU
Subsystems (4)
RFC PATCH 1/1 net: ethernet: mediatek: support setting MTU
MT762x HW supports frame length up to 2048 (maximum length on GDM), so allow setting MTU up to 2030.
---
I only tested this on MT7621, no sure if it is applicable for other SoCs especially MT7628, which has an old IP.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 31 ++++++++++++++++++++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 ++++++-- 2 files changed, 38 insertions(+), 4 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +30 -1
@@ -353,7 +353,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,/* Setup gmac */ mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); mcr_new = mcr_cur; - mcr_new |=MAC_MCR_MAX_RX_1536 |MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE | + mcr_new |=MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE |MAC_MCR_BACKOFF_EN |MAC_MCR_BACKPR_EN |MAC_MCR_FORCE_LINK ;/* Only update control register when needed! */
@@ -2499,6 +2499,34 @@ static void mtk_uninit(struct net_device *dev)mtk_rx_irq_disable (eth, ~0 ); } +static int mtk_change_mtu (struct net_device *dev,int new_mtu) +{ +struct mtk_mac *mac =netdev_priv (dev); +u32 mcr_cur, mcr_new; +int length; + + mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); + mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_LEN_MASK ; + length = new_mtu +MTK_RX_ETH_HLEN ; + +if (length <=1518 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1518 ); +else if (length <=1536 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1536 ); +else if (length <=1552 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1552 ); +else + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_2048 ); + +/* Only update control register when needed! */ +if (mcr_new != mcr_cur) +mtk_w32 (mac->hw, mcr_new,MTK_MAC_MCR (mac->id)); + + dev->mtu = new_mtu; + +return 0 ; +} +static int mtk_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {struct mtk_mac *mac =netdev_priv (dev);
@@ -2795,6 +2823,7 @@ static const struct net_device_ops mtk_netdev_ops = { .ndo_set_mac_address = mtk_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_do_ioctl = mtk_do_ioctl, + .ndo_change_mtu = mtk_change_mtu, .ndo_tx_timeout = mtk_tx_timeout, .ndo_get_stats64 = mtk_get_stats64, .ndo_fix_features = mtk_fix_features,
drivers/net/ethernet/mediatek/mtk_eth_soc.h +8 -3
@@ -17,12 +17,12 @@#include <linux/phylink.h> #define MTK_QDMA_PAGE_SIZE 2048 -#define MTK_MAX_RX_LENGTH 1536 +#define MTK_MAX_RX_LENGTH 2048#define MTK_TX_DMA_BUF_LEN 0x3fff#define MTK_DMA_SIZE 256#define MTK_NAPI_WEIGHT 64#define MTK_MAC_COUNT 2 -#define MTK_RX_ETH_HLEN (VLAN_ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN) +#define MTK_RX_ETH_HLEN (ETH_HLEN + ETH_FCS_LEN)#define MTK_RX_HLEN (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)#define MTK_DMA_DUMMY_DESC 0xffffffff#define MTK_DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | \
@@ -320,7 +320,12 @@/* Mac control registers */ #define MTK_MAC_MCR (x) (0x10100 + (x * 0x100)) -#define MAC_MCR_MAX_RX_1536 BIT(24) +#define MAC_MCR_MAX_RX_LEN_MASK GENMASK(25, 24) +#define MAC_MCR_MAX_RX_LEN (_x) (MAC_MCR_MAX_RX_LEN_MASK & ((_x) << 24)) +#define MAC_MCR_MAX_RX_LEN_1518 0x0 +#define MAC_MCR_MAX_RX_LEN_1536 0x1 +#define MAC_MCR_MAX_RX_LEN_1552 0x2 +#define MAC_MCR_MAX_RX_LEN_2048 0x3#define MAC_MCR_IPG_CFG (BIT(18) | BIT(16))#define MAC_MCR_FORCE_MODE BIT(15)#define MAC_MCR_TX_EN BIT(14)
Signature · 1 line
2.25.1
Quoted 19 lines · DENG Qingfang
MT762x HW supports frame length up to 2048 (maximum length on GDM), so allow setting MTU up to 2030.
Signed-off-by DENG Qingfang <[email protected]>---
I only tested this on MT7621, no sure if it is applicable for other SoCs especially MT7628, which has an old IP.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 31 ++++++++++++++++++++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 ++++++-- 2 files changed, 38 insertions(+), 4 deletions(-)drivers/net/ethernet/mediatek/mtk_eth_soc.c +0
-0
drivers/net/ethernet/mediatek/mtk_eth_soc.c static void mtk_mac_config(struct phylink_config *config, unsigned int mode, · line 357
Quoted 6 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1
-1@@ -353,7 +353,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,/* Setup gmac */ mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); mcr_new = mcr_cur; - mcr_new |=MAC_MCR_MAX_RX_1536 |MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE | + mcr_new |=MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE |MAC_MCR_BACKOFF_EN |MAC_MCR_BACKPR_EN |MAC_MCR_FORCE_LINK ;
Since you no longer set MAC_MCR_MAX_RX_1536, what does the hardware default to?
Quoted 13 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +8
-0/* Only update control register when needed! */ @@ -2499,6 +2499,34 @@ static void mtk_uninit(struct net_device *dev)mtk_rx_irq_disable (eth, ~0 ); } +static int mtk_change_mtu (struct net_device *dev,int new_mtu) +{ +struct mtk_mac *mac =netdev_priv (dev); +u32 mcr_cur, mcr_new; +int length; + + mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); + mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_LEN_MASK ;
drivers/net/ethernet/mediatek/mtk_eth_soc.c static void mtk_uninit(struct net_device *dev) · line 2519
Quoted 10 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +10
-0+ length = new_mtu +MTK_RX_ETH_HLEN ; + +if (length <=1518 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1518 ); +else if (length <=1536 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1536 ); +else if (length <=1552 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1552 ); +else + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_2048 );
You should have another if here, and return -EIVAL is the user asked for an MTU of 2049 of greater.
Andrew
Quoted 16 lines · Andrew Lunn
Quoted 14 lines · DENG Qingfang
MT762x HW supports frame length up to 2048 (maximum length on GDM), so allow setting MTU up to 2030.
Signed-off-by DENG Qingfang <[email protected]>---
I only tested this on MT7621, no sure if it is applicable for other SoCs especially MT7628, which has an old IP.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 31 ++++++++++++++++++++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 ++++++-- 2 files changed, 38 insertions(+), 4 deletions(-)
Quoted 14 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c static void mtk_mac_config(struct phylink_config *config, unsigned int mode, · line 357
Quoted 11 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1
-1@@ -353,7 +353,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,/* Setup gmac */ mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); mcr_new = mcr_cur; - mcr_new |=MAC_MCR_MAX_RX_1536 |MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE | + mcr_new |=MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE |MAC_MCR_BACKOFF_EN |MAC_MCR_BACKPR_EN |MAC_MCR_FORCE_LINK ;Since you no longer set
MAC_MCR_MAX_RX_1536, what does the hardware default to?
2'b00, i.e. 1518 bytes.
Quoted 19 lines
Quoted 19 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +13
-0/* Only update control register when needed! */ @@ -2499,6 +2499,34 @@ static void mtk_uninit(struct net_device *dev)mtk_rx_irq_disable (eth, ~0 ); } +static int mtk_change_mtu (struct net_device *dev,int new_mtu) +{ +struct mtk_mac *mac =netdev_priv (dev); +u32 mcr_cur, mcr_new; +int length; + + mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); + mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_LEN_MASK ; + length = new_mtu +MTK_RX_ETH_HLEN ; + +if (length <=1518 ) + mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1518 ); +else if (length <=1536 )
Quoted 8 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c static void mtk_uninit(struct net_device *dev) · line 2519
Quoted 5 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +5
-0+ mcr_new |=MAC_MCR_MAX_RX_LEN (MAC_MCR_MAX_RX_LEN_1536 ); + else if (length <= 1552) + mcr_new |= MAC_MCR_MAX_RX_LEN(MAC_MCR_MAX_RX_LEN_1552); + else + mcr_new |= MAC_MCR_MAX_RX_LEN(MAC_MCR_MAX_RX_LEN_2048);You should have another if here, and return
-EIVALis the user asked for an MTU of 2049 of greater.
It is handled in net_device->max_mtu:
Quoted 1 line
eth->netdev[id]->max_mtu =
MTK_MAX_RX_LENGTH-MTK_RX_ETH_HLEN;
As I tested:
Quoted 5 lines
# ip link set eth0 mtu 2031 RTNETLINK answers: Invalid argumentAndrew
Andrew Lunn
Reviewed-byQuoted 32 lines · DENG Qingfang
Quoted 16 lines · Andrew Lunn
Quoted 14 lines · DENG Qingfang
MT762x HW supports frame length up to 2048 (maximum length on GDM), so allow setting MTU up to 2030.
Signed-off-by DENG Qingfang <[email protected]>---
I only tested this on MT7621, no sure if it is applicable for other SoCs especially MT7628, which has an old IP.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 31 ++++++++++++++++++++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 ++++++-- 2 files changed, 38 insertions(+), 4 deletions(-)Quoted 14 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c static void mtk_mac_config(struct phylink_config *config, unsigned int mode, · line 357
Quoted 11 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1
-1@@ -353,7 +353,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,/* Setup gmac */ mcr_cur =mtk_r32 (mac->hw,MTK_MAC_MCR (mac->id)); mcr_new = mcr_cur; - mcr_new |=MAC_MCR_MAX_RX_1536 |MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE | + mcr_new |=MAC_MCR_IPG_CFG |MAC_MCR_FORCE_MODE |MAC_MCR_BACKOFF_EN |MAC_MCR_BACKPR_EN |MAC_MCR_FORCE_LINK ;Since you no longer set
MAC_MCR_MAX_RX_1536, what does the hardware default to?
Quoted 1 line
2'b00, i.e. 1518 bytes.
O.K, that fits the default for a netdev.
Quoted 2 lines
It is handled in
net_device->max_mtu:Quoted 1 line
eth->netdev[id]->max_mtu =
MTK_MAX_RX_LENGTH-MTK_RX_ETH_HLEN;
Cool.
Andrew