via-velocity: fix the WOL bug on 1000M full duplex forced mode.

The VIA velocity card can't be waken up by WOL tool on 1000M full
duplex forced mode. This patch fixes the bug.

Signed-off-by: David Lv <DavidLv@viatech.com.cn>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 09cac704fdd..0d6fec6b7d9 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2923,6 +2923,7 @@ static u16 wol_calc_crc(int size, u8 *pattern, u8 *mask_pattern)
 static int velocity_set_wol(struct velocity_info *vptr)
 {
         struct mac_regs __iomem *regs = vptr->mac_regs;
+        enum speed_opt spd_dpx = vptr->options.spd_dpx;
         static u8 buf[256];
         int i;
 
@@ -2968,6 +2969,12 @@ static int velocity_set_wol(struct velocity_info *vptr)
 
         writew(0x0FFF, &regs->WOLSRClr);
 
+        if (spd_dpx == SPD_DPX_1000_FULL)
+                goto mac_done;
+
+        if (spd_dpx != SPD_DPX_AUTO)
+                goto advertise_done;
+
         if (vptr->mii_status & VELOCITY_AUTONEG_ENABLE) {
                 if (PHYID_GET_PHY_ID(vptr->phy_id) == PHYID_CICADA_CS8201)
                         MII_REG_BITS_ON(AUXCR_MDPPS, MII_NCONFIG, vptr->mac_regs);
@@ -2978,6 +2985,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
         if (vptr->mii_status & VELOCITY_SPEED_1000)
                 MII_REG_BITS_ON(BMCR_ANRESTART, MII_BMCR, vptr->mac_regs);
 
+advertise_done:
         BYTE_REG_BITS_ON(CHIPGCR_FCMODE, &regs->CHIPGCR);
 
         {
@@ -2987,6 +2995,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
                 writeb(GCR, &regs->CHIPGCR);
         }
 
+mac_done:
         BYTE_REG_BITS_OFF(ISR_PWEI, &regs->ISR);
         /* Turn on SWPTAG just before entering power mode */
         BYTE_REG_BITS_ON(STICKHW_SWPTAG, &regs->STICKHW);