net: stmmac: qcom-ethqos: remove phy_set_mode_ext() after phy_power_on()

The call to phy_set_mode_ext() after phy_power_on() was a work-around
for the qcom-sgmii-eth SerDes driver that only re-enabled its clocks on
phy_power_on() but did not configure the PHY. Now that the SerDes driver
fully configures the SerDes at phy_power_on(), there is no need to call
phy_set_mode_ext() immediately afterwards.

This also means we no longer need to record the previous operating mode
of the driver - this is up to the SerDes driver. In any case, the only
thing that we care about is the SerDes provides the necessary clocks to
the stmmac core to allow it to reset at this point. The actual mode is
irrelevant at this point as the correct mode will be configured in
ethqos_mac_finish_serdes() just before the network device is brought
online.

Reviewed-by: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Tested-by: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vxS4U-0000000BQXy-1Q1v@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 8913f6f02b9e8da3cb6c627eac533dee90466a6e..cb1c074c205307bca556192584fb0a4a10eecd47 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -105,7 +105,6 @@ struct qcom_ethqos {
 
        struct clk *link_clk;
        struct phy *serdes_phy;
-       phy_interface_t serdes_mode;
        phy_interface_t phy_mode;
 
        const struct ethqos_emac_por *rgmii_por;
@@ -648,17 +647,8 @@ static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv)
                return ret;
 
        ret = phy_power_on(ethqos->serdes_phy);
-       if (ret) {
-               phy_exit(ethqos->serdes_phy);
-               return ret;
-       }
-
-       ret = phy_set_mode_ext(ethqos->serdes_phy, PHY_MODE_ETHERNET,
-                              ethqos->serdes_mode);
-       if (ret) {
-               phy_power_off(ethqos->serdes_phy);
+       if (ret)
                phy_exit(ethqos->serdes_phy);
-       }
 
        return ret;
 }
@@ -681,12 +671,9 @@ static int ethqos_mac_finish_serdes(struct net_device *ndev, void *priv,
        qcom_ethqos_set_sgmii_loopback(ethqos, false);
 
        if (interface == PHY_INTERFACE_MODE_SGMII ||
-           interface == PHY_INTERFACE_MODE_2500BASEX) {
+           interface == PHY_INTERFACE_MODE_2500BASEX)
                ret = phy_set_mode_ext(ethqos->serdes_phy, PHY_MODE_ETHERNET,
                                       interface);
-               if (ret == 0)
-                       ethqos->serdes_mode = interface;
-       }
 
        return ret;
 }
@@ -839,7 +826,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
                plat_dat->host_dma_width = data->dma_addr_width;
 
        if (ethqos->serdes_phy) {
-               ethqos->serdes_mode = PHY_INTERFACE_MODE_SGMII;
                plat_dat->serdes_powerup = qcom_ethqos_serdes_powerup;
                plat_dat->serdes_powerdown  = qcom_ethqos_serdes_powerdown;
        }