Commit 9cb54af2 authored Apr 12, 2024 by Serge Semin Committed by Paolo Abeni Apr 16, 2024

net: stmmac: Fix IP-cores specific MAC capabilities



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 5b0d7d7d ("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 df7699c7
("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
8a880936 ("net: stmmac: Add XLGMII support") incorrectly permitted the
10-100 link speeds and 1G half-duplex mode for DW XLGMAC IP-core.

Fixes: 5b0d7d7d ("net: stmmac: Add the missing speeds that XGMAC supports")
Fixes: df7699c7 ("net: stmmac: Do not cut down 1G modes")
Fixes: 8a880936 ("net: stmmac: Add XLGMII support")
Suggested-by: Russell King (Oracle) <linux@armlinux.org.uk>
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Romain Gantois <romain.gantois@bootlin.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parent 59c3d6ca

drivers/net/ethernet/stmicro/stmmac/common.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -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;