tg3: Manage gphy power for CPMU-less devs only

This patch changes the code to only manage the PCIe gphy power for
CPMU-less devices only.  The CPMU takes over management for newer
chips.

Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 5d155c50e6e..38979f24e54 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -6948,8 +6948,11 @@ static int tg3_chip_reset(struct tg3 *tp)
                      tr32(GRC_VCPU_EXT_CTRL) & ~GRC_VCPU_EXT_CTRL_HALT_CPU);
         }
 
-        if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
+        /* Manage gphy power for all CPMU absent PCIe devices. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
+            !(tp->tg3_flags & TG3_FLAG_CPMU_PRESENT))
                 val |= GRC_MISC_CFG_KEEP_GPHY_POWER;
+
         tw32(GRC_MISC_CFG, val);
 
         /* restore 5701 hardware bug workaround write method */