Commit e226eade authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-stmmac-fix-mac-capabilities-procedure' 

Serge Semin says:

====================
net: stmmac: Fix MAC-capabilities procedure

The series got born as a result of the discussions around the recent
Yanteng' series adding the Loongson LS7A1000, LS2K1000, LS7A2000, LS2K2000
MACs support:
Link: https://lore.kernel.org/netdev/fu3f6uoakylnb6eijllakeu5i4okcyqq7sfafhp5efaocbsrwe@w74xe7gb6x7p

In particular the Yanteng' patchset needed to implement the Loongson
MAC-specific constraints applied to the link speed and link duplex mode.
As a result of the discussion with Russel the next preliminary patch was
born:
Link: https://lore.kernel.org/netdev/df31e8bcf74b3b4ddb7ddf5a1c371390f16a2ad5.1712917541.git.siyanteng@loongson.cn



The patch above was a temporal solution utilized by Yanteng for further
developments and to move on with the on-going review. This patchset is a
refactored version of that single patch with formatting required for the
fixes patches.

In particular the series starts with fixing the half-duplex-less
constraint currently applied for all IP-cores. In fact it's specific for
the DW QoS Eth only (DW GMAC v4.x/v5.x).

The next patch fixes the MAC-capabilities setting up during the active
Tx/Rx queues re-initialization procedure. Particularly the procedure
missed the max-speed limit thus possibly activating speeds prohibited on
the respective platforms.

Third patch fixes the incorrect MAC-capabilities initialization for DW
MAC100, DW XGMAC and DW XLGMAC devices by moving the correct
initialization to the IP-core specific setup() methods.

That's it for now. Thanks for review and testing in advance.

Signed-off-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Simon Horman <horms@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Samuel Holland <samuel@sholland.org>
Cc: netdev@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-sunxi@lists.linux.dev
Cc: linux-kernel@vger.kernel.org
====================

Link: https://lore.kernel.org/r/20240412180340.7965-1-fancer.lancer@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 24f4c99e 9cb54af2

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

+6 −1
Original line number Diff line number Diff line
@@ -70,7 +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->hw->link.caps &= ~(MAC_10HD | MAC_100HD | MAC_1000HD);

	else

		priv->hw->link.caps |= (MAC_10HD | MAC_100HD | MAC_1000HD);

}



static void dwmac4_rx_queue_enable(struct mac_device_info *hw,
@@ -1378,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;