Commit bedf9b81 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: move xgmac specific phylink caps to dwxgmac2 core 



Move the xgmac specific phylink capabilities to the dwxgmac2 support
core.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qZAXd-005pUP-JL@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f1dae3d2

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

+10 −0
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ 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);
@@ -1490,6 +1498,7 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, u32 num_txq, 


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,
@@ -1551,6 +1560,7 @@ 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,

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

+0 −10
Original line number Diff line number Diff line
@@ -1227,16 +1227,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) 
	/* Get the MAC specific capabilities */

	stmmac_mac_phylink_get_caps(priv);



	if (priv->plat->has_xgmac) {

		priv->phylink_config.mac_capabilities |= MAC_2500FD;

		priv->phylink_config.mac_capabilities |= MAC_5000FD;

		priv->phylink_config.mac_capabilities |= MAC_10000FD;

		priv->phylink_config.mac_capabilities |= MAC_25000FD;

		priv->phylink_config.mac_capabilities |= MAC_40000FD;

		priv->phylink_config.mac_capabilities |= MAC_50000FD;

		priv->phylink_config.mac_capabilities |= MAC_100000FD;

	}



	/* Half-Duplex can only work with single queue */

	if (priv->plat->tx_queues_to_use > 1)

		priv->phylink_config.mac_capabilities &=