Re: [PATCH net 3/4] net: stmmac: Fix IP-cores specific MAC capabilities

From: Romain Gantois
Date: Tue Apr 16 2024 - 04:00:38 EST

Next message: zhaoyang.huang: "[PATCH 1/1] mm: protect xa split stuff under lruvec->lru_lock during migration"
Previous message: Julia Lawall: "Re: [PATCH 00/35] media: Fix coccinelle warning/errors"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Fri, 12 Apr 2024, Serge Semin wrote:

> Here is the list of the MAC capabilities specific to the particular DW MAC
> IP-cores currently supported by the driver:
>
> DW MAC100: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_10 | MAC_100
>
> DW GMAC: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_10 | MAC_100 | MAC_1000
>
> Allwinner sun8i MAC: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_10 | MAC_100 | MAC_1000
>
> DW QoS Eth: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD
> if there is more than 1 active Tx/Rx queues:
> MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_10FD | MAC_100FD | MAC_1000FD | MAC_2500FD
>
> DW XGMAC: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_1000FD | MAC_2500FD | MAC_5000FD | MAC_10000FD
>
> DW XLGMAC: MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> MAC_1000FD | MAC_2500FD | MAC_5000FD | MAC_10000FD |
> MAC_25000FD | MAC_40000FD | MAC_50000FD | MAC_100000FD
>
> As you can see there are only two common capabilities:
> MAC_ASYM_PAUSE | MAC_SYM_PAUSE.
> Meanwhile what is currently implemented defines 10/100/1000 link speeds
> for all IP-cores, which is definitely incorrect for DW MAC100, DW XGMAC
> and DW XLGMAC devices.
>
> Seeing the flow-control is implemented as a callback for each MAC IP-core
> (see dwmac100_flow_ctrl(), dwmac1000_flow_ctrl(), sun8i_dwmac_flow_ctrl(),
> etc) and since the MAC-specific setup() method is supposed to be called
> for each available DW MAC-based device, the capabilities initialization
> can be freely moved to these setup() functions, thus correctly setting up
> the MAC-capabilities for each IP-core (including the Allwinner Sun8i). A
> new stmmac_link::caps field was specifically introduced for that so to
> have all link-specific info preserved in a single structure.
>
> Note the suggested change fixes three earlier commits at a time. The
> commit 5b0d7d7da64b ("net: stmmac: Add the missing speeds that XGMAC
> supports") permitted the 10-100 link speeds and 1G half-duplex mode for DW
> XGMAC IP-core even though it doesn't support them. The commit df7699c70c1b
> ("net: stmmac: Do not cut down 1G modes") incorrectly added the MAC1000
> capability to the DW MAC100 IP-core. Similarly to the DW XGMAC the commit
> 8a880936e902 ("net: stmmac: Add XLGMII support") incorrectly permitted the
> 10-100 link speeds and 1G half-duplex mode for DW XLGMAC IP-core.
>
> Fixes: 5b0d7d7da64b ("net: stmmac: Add the missing speeds that XGMAC supports")
> Fixes: df7699c70c1b ("net: stmmac: Do not cut down 1G modes")
> Fixes: 8a880936e902 ("net: stmmac: Add XLGMII support")
> Suggested-by: Russell King (Oracle) <linux@xxxxxxxxxxxxxxx>
> Signed-off-by: Serge Semin <fancer.lancer@xxxxxxxxx>
> ---
> drivers/net/ethernet/stmicro/stmmac/common.h | 1 +
> .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 ++
> .../ethernet/stmicro/stmmac/dwmac1000_core.c | 2 ++
> .../ethernet/stmicro/stmmac/dwmac100_core.c | 2 ++
> .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 10 ++++------
> .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 ++++++++----------
> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++---
> 7 files changed, 23 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
> index a6fefe675ef1..3b7d4ac1e7be 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/common.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/common.h
> @@ -553,6 +553,7 @@ extern const struct stmmac_hwtimestamp stmmac_ptp;
> extern const struct stmmac_mode_ops dwmac4_ring_mode_ops;
>
> struct mac_link {
> + u32 caps;
> u32 speed_mask;
> u32 speed10;
> u32 speed100;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> index b21d99faa2d0..e1b761dcfa1d 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> @@ -1096,6 +1096,8 @@ static struct mac_device_info *sun8i_dwmac_setup(void *ppriv)
>
> priv->dev->priv_flags |= IFF_UNICAST_FLT;
>
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_10 | MAC_100 | MAC_1000;
> /* The loopback bit seems to be re-set when link change
> * Simply mask it each time
> * Speed 10/100/1000 are set in BIT(2)/BIT(3)
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
> index 3927609abc44..8555299443f4 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
> @@ -539,6 +539,8 @@ int dwmac1000_setup(struct stmmac_priv *priv)
> if (mac->multicast_filter_bins)
> mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);
>
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_10 | MAC_100 | MAC_1000;
> mac->link.duplex = GMAC_CONTROL_DM;
> mac->link.speed10 = GMAC_CONTROL_PS;
> mac->link.speed100 = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
> index a6e8d7bd9588..7667d103cd0e 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
> @@ -175,6 +175,8 @@ int dwmac100_setup(struct stmmac_priv *priv)
> dev_info(priv->device, "\tDWMAC100\n");
>
> mac->pcsr = priv->ioaddr;
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_10 | MAC_100;
> mac->link.duplex = MAC_CONTROL_F;
> mac->link.speed10 = 0;
> mac->link.speed100 = 0;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> index ec6a13e644b3..a38226d7cc6a 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> @@ -70,14 +70,10 @@ static void dwmac4_core_init(struct mac_device_info *hw,
>
> static void dwmac4_phylink_get_caps(struct stmmac_priv *priv)
> {
> - priv->phylink_config.mac_capabilities |= MAC_2500FD;
> -
> if (priv->plat->tx_queues_to_use > 1)
> - priv->phylink_config.mac_capabilities &=
> - ~(MAC_10HD | MAC_100HD | MAC_1000HD);
> + priv->hw->link.caps &= ~(MAC_10HD | MAC_100HD | MAC_1000HD);
> else
> - priv->phylink_config.mac_capabilities |=
> - (MAC_10HD | MAC_100HD | MAC_1000HD);
> + priv->hw->link.caps |= (MAC_10HD | MAC_100HD | MAC_1000HD);
> }
>
> static void dwmac4_rx_queue_enable(struct mac_device_info *hw,
> @@ -1385,6 +1381,8 @@ int dwmac4_setup(struct stmmac_priv *priv)
> if (mac->multicast_filter_bins)
> mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);
>
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
> mac->link.duplex = GMAC_CONFIG_DM;
> mac->link.speed10 = GMAC_CONFIG_PS;
> mac->link.speed100 = GMAC_CONFIG_FES | GMAC_CONFIG_PS;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
> index e841e312077e..f8e7775bb633 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
> @@ -47,14 +47,6 @@ static void dwxgmac2_core_init(struct mac_device_info *hw,
> writel(XGMAC_INT_DEFAULT_EN, ioaddr + XGMAC_INT_EN);
> }
>
> -static void xgmac_phylink_get_caps(struct stmmac_priv *priv)
> -{
> - priv->phylink_config.mac_capabilities |= MAC_2500FD | MAC_5000FD |
> - MAC_10000FD | MAC_25000FD |
> - MAC_40000FD | MAC_50000FD |
> - MAC_100000FD;
> -}
> -
> static void dwxgmac2_set_mac(void __iomem *ioaddr, bool enable)
> {
> u32 tx = readl(ioaddr + XGMAC_TX_CONFIG);
> @@ -1540,7 +1532,6 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, struct stmmac_fpe_cfg *
>
> const struct stmmac_ops dwxgmac210_ops = {
> .core_init = dwxgmac2_core_init,
> - .phylink_get_caps = xgmac_phylink_get_caps,
> .set_mac = dwxgmac2_set_mac,
> .rx_ipc = dwxgmac2_rx_ipc,
> .rx_queue_enable = dwxgmac2_rx_queue_enable,
> @@ -1601,7 +1592,6 @@ static void dwxlgmac2_rx_queue_enable(struct mac_device_info *hw, u8 mode,
>
> const struct stmmac_ops dwxlgmac2_ops = {
> .core_init = dwxgmac2_core_init,
> - .phylink_get_caps = xgmac_phylink_get_caps,
> .set_mac = dwxgmac2_set_mac,
> .rx_ipc = dwxgmac2_rx_ipc,
> .rx_queue_enable = dwxlgmac2_rx_queue_enable,
> @@ -1661,6 +1651,9 @@ int dwxgmac2_setup(struct stmmac_priv *priv)
> if (mac->multicast_filter_bins)
> mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);
>
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_1000FD | MAC_2500FD | MAC_5000FD |
> + MAC_10000FD;
> mac->link.duplex = 0;
> mac->link.speed10 = XGMAC_CONFIG_SS_10_MII;
> mac->link.speed100 = XGMAC_CONFIG_SS_100_MII;
> @@ -1698,6 +1691,11 @@ int dwxlgmac2_setup(struct stmmac_priv *priv)
> if (mac->multicast_filter_bins)
> mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);
>
> + mac->link.caps = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> + MAC_1000FD | MAC_2500FD | MAC_5000FD |
> + MAC_10000FD | MAC_25000FD |
> + MAC_40000FD | MAC_50000FD |
> + MAC_100000FD;
> mac->link.duplex = 0;
> mac->link.speed1000 = XLGMAC_CONFIG_SS_1000;
> mac->link.speed2500 = XLGMAC_CONFIG_SS_2500;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index b8a1f02398ee..7c6fb14b5555 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1225,12 +1225,11 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
> xpcs_get_interfaces(priv->hw->xpcs,
> priv->phylink_config.supported_interfaces);
>
> - priv->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
> - MAC_10 | MAC_100 | MAC_1000;
> -
> /* Get the MAC specific capabilities */
> stmmac_mac_phylink_get_caps(priv);
>
> + priv->phylink_config.mac_capabilities = priv->hw->link.caps;
> +
> max_speed = priv->plat->max_speed;
> if (max_speed)
> phylink_limit_mac_speed(&priv->phylink_config, max_speed);
> @@ -7344,6 +7343,8 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt)
>
> stmmac_mac_phylink_get_caps(priv);
>
> + priv->phylink_config.mac_capabilities = priv->hw->link.caps;
> +
> max_speed = priv->plat->max_speed;
> if (max_speed)
> phylink_limit_mac_speed(&priv->phylink_config, max_speed);
> --
> 2.43.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Reviewed-by: Romain Gantois <romain.gantois@xxxxxxxxxxx>

Thanks,

--
Romain Gantois, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Next message: zhaoyang.huang: "[PATCH 1/1] mm: protect xa split stuff under lruvec->lru_lock during migration"
Previous message: Julia Lawall: "Re: [PATCH 00/35] media: Fix coccinelle warning/errors"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]