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

net: stmmac: dwc-qos-eth: move MDIO bus locking into stmmac_mdio 



Rather than dwc-qos-eth manipulating the MDIO bus lock directly, add
helpers to the stmmac MDIO layer and use them in dwc-qos-eth. This
improves my commit 87f43e6f ("net: stmmac: dwc-qos: calibrate tegra
with mdio bus idle").

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1v945J-0000000AmeJ-1GOb@rmk-PC.armlinux.org.uk


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

drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void tegra_eqos_fix_speed(void *bsp_priv, int speed, unsigned int mode) 
		priv = netdev_priv(dev_get_drvdata(eqos->dev));



		/* Calibration should be done with the MDIO bus idle */

		mutex_lock(&priv->mii->mdio_lock);

		stmmac_mdio_lock(priv);



		/* calibrate */

		value = readl(eqos->regs + SDMEMCOMPPADCTRL);
@@ -198,7 +198,7 @@ static void tegra_eqos_fix_speed(void *bsp_priv, int speed, unsigned int mode) 
		value &= ~SDMEMCOMPPADCTRL_PAD_E_INPUT_OR_E_PWRD;

		writel(value, eqos->regs + SDMEMCOMPPADCTRL);



		mutex_unlock(&priv->mii->mdio_lock);

		stmmac_mdio_unlock(priv);

	} else {

		value = readl(eqos->regs + AUTO_CAL_CONFIG);

		value &= ~AUTO_CAL_CONFIG_ENABLE;

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

+2 −0
Original line number Diff line number Diff line
@@ -388,6 +388,8 @@ static inline bool stmmac_wol_enabled_phy(struct stmmac_priv *priv) 
int stmmac_mdio_unregister(struct net_device *ndev);

int stmmac_mdio_register(struct net_device *ndev);

int stmmac_mdio_reset(struct mii_bus *mii);

void stmmac_mdio_lock(struct stmmac_priv *priv);

void stmmac_mdio_unlock(struct stmmac_priv *priv);

int stmmac_pcs_setup(struct net_device *ndev);

void stmmac_pcs_clean(struct net_device *ndev);

void stmmac_set_ethtool_ops(struct net_device *netdev);

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

+14 −0
Original line number Diff line number Diff line
@@ -734,3 +734,17 @@ int stmmac_mdio_unregister(struct net_device *ndev) 


	return 0;

}



void stmmac_mdio_lock(struct stmmac_priv *priv)

{

	if (priv->mii)

		mutex_lock(&priv->mii->mdio_lock);

}

EXPORT_SYMBOL_GPL(stmmac_mdio_lock);



void stmmac_mdio_unlock(struct stmmac_priv *priv)

{

	if (priv->mii)

		mutex_unlock(&priv->mii->mdio_lock);

}

EXPORT_SYMBOL_GPL(stmmac_mdio_unlock);