eqos: remove configuring of PHY gpio in suspend

Issue: Configuring BRCM PHY GPIO to 0 leads to
power increment in SC7 use case

Fix: Remove configuring BRCM PHY GPIO in SC7 use case
for 18x based platforms

Bug 2976079

Change-Id: Ie483f7c1ef053a1d2240b5f96103bf59b7362903
Signed-off-by: Sushil Singh <sushilkumars@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2358867
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Aaron Tian <atian@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Aaron Tian <atian@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/ethernet/nvidia/eqos/drv.c b/drivers/net/ethernet/nvidia/eqos/drv.c
index f2e396031..ff46b675e 100644
--- a/drivers/net/ethernet/nvidia/eqos/drv.c
+++ b/drivers/net/ethernet/nvidia/eqos/drv.c
@@ -1218,10 +1218,9 @@ static int eqos_close(struct net_device *dev)
         if (pdata->phydev) {
                 phy_stop(pdata->phydev);
                 phy_disconnect(pdata->phydev);
-
-                if (gpio_is_valid(pdata->phy_reset_gpio))
+                if (gpio_is_valid(pdata->phy_reset_gpio) &&
+                                 (pdata->mac_ver > EQOS_MAC_CORE_4_10))
                         gpio_set_value(pdata->phy_reset_gpio, 0);
-
                 pdata->phydev = NULL;
         }
 
diff --git a/drivers/net/ethernet/nvidia/eqos/init.c b/drivers/net/ethernet/nvidia/eqos/init.c
index 423d21be8..c35b38839 100644
--- a/drivers/net/ethernet/nvidia/eqos/init.c
+++ b/drivers/net/ethernet/nvidia/eqos/init.c
@@ -1655,10 +1655,11 @@ static int eqos_suspend_noirq(struct device *dev)
                         enable_irq_wake(pdata->phydev->irq);
                 } else {
                         phy_stop(pdata->phydev);
-                        if (gpio_is_valid(pdata->phy_reset_gpio)) {
+                        if ((gpio_is_valid(pdata->phy_reset_gpio) &&
+                            (pdata->mac_ver > EQOS_MAC_CORE_4_10))) {
                                 gpio_set_value(pdata->phy_reset_gpio, 0);
                                 usleep_range(pdata->phy_reset_duration,
-                                        pdata->phy_reset_duration + 1);
+                                             pdata->phy_reset_duration + 1);
                         }
                 }
         }
@@ -1718,9 +1719,10 @@ static int eqos_resume_noirq(struct device *dev)
                 }
                 eqos_start_dev(pdata);
         } else {
-                if (gpio_is_valid(pdata->phy_reset_gpio) &&
-                    !gpio_get_value(pdata->phy_reset_gpio)) {
-                        /* deassert phy reset */
+                if (gpio_is_valid(pdata->phy_reset_gpio)) {
+                        /* reset Broadcom PHY needs minimum of 2us delay */
+                        gpio_set_value(pdata->phy_reset_gpio, 0);
+                        usleep_range(10, 11);
                         gpio_set_value(pdata->phy_reset_gpio, 1);
                         msleep(pdata->phy_reset_post_delay);
                 }