tg3: Allow GPHY powerdown on 5761
authorMatt Carlson <mcarlson@broadcom.com>
Sat, 22 Nov 2008 01:21:13 +0000 (17:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Nov 2008 01:21:13 +0000 (17:21 -0800)
The ENABLE_APE flag tells the driver whether or not the device has an
Application Processing Engine (APE).  The APE does not need the PHY to
be powered unless it is running management firmware.  For backwards
compatibility, management firmware will still set the ENABLE_ASF bit.
Consequently, there is no reason to consider the ENABLE_APE flag when
deciding whether or not to power down the phy.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tg3.c

index 89d897d679e818246709b1d383a321128ea7aa42..07bf05673da73b6d84637c062e9f13335e1a59e4 100644 (file)
@@ -2400,8 +2400,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
        }
 
        if (!(device_should_wake) &&
-           !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
-           !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
+           !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
                tg3_power_down_phy(tp, do_low_power);
 
        tg3_frob_aux_power(tp);