amd-xgbe: let the MAC manage PHY PM

Use the MAC managed PM flag to indicate that MAC driver takes care of
suspending/resuming the PHY, and reset it when the device is brought up.

Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
Link: https://patch.msgid.link/20251123163721.442162-1-Raju.Rangoju@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index f3adf29b222bf3fe0b0d07ba5a86b0bfe1bf755f..0653e69f0ef7a63d3038ddb3c3d858c918e62b42 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1259,6 +1259,11 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
 
        udp_tunnel_nic_reset_ntf(netdev);
 
+       /* Reset the phy settings */
+       ret = xgbe_phy_reset(pdata);
+       if (ret)
+               goto err_txrx;
+
        netif_tx_start_all_queues(netdev);
 
        xgbe_start_timers(pdata);
@@ -1268,6 +1273,10 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
 
        return 0;
 
+err_txrx:
+       hw_if->disable_rx(pdata);
+       hw_if->disable_tx(pdata);
+
 err_irqs:
        xgbe_free_irqs(pdata);
 
@@ -1574,11 +1583,6 @@ static int xgbe_open(struct net_device *netdev)
                goto err_dev_wq;
        }
 
-       /* Reset the phy settings */
-       ret = xgbe_phy_reset(pdata);
-       if (ret)
-               goto err_an_wq;
-
        /* Enable the clocks */
        ret = clk_prepare_enable(pdata->sysclk);
        if (ret) {

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index 35a381a83647d7390d6b65c65062bfdc30cced48..a68757e8fd22c4ab4011bf7c1e59ab12c7639365 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -989,6 +989,7 @@ static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata)
                return ret;
        }
        phy_data->phydev = phydev;
+       phy_data->phydev->mac_managed_pm = true;
 
        xgbe_phy_external_phy_quirks(pdata);