[src/trunk]: src/sys/dev/pci Fix WOL related setting of the WUC register for ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4011f493e773
branches:  trunk
changeset: 348963:4011f493e773
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Nov 18 06:55:00 2016 +0000

description:
Fix WOL related setting of the WUC register for other than PCH*
in wm_enable_wakeup(). Tested with 82567V(ICH8) and 82583V.

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b5a4386a9f04 -r 4011f493e773 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Nov 18 06:50:04 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Nov 18 06:55:00 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.450 2016/11/17 03:40:08 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.451 2016/11/18 06:55:00 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.450 2016/11/17 03:40:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.451 2016/11/18 06:55:00 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -12353,7 +12353,7 @@
        if (sc->sc_type >= WM_T_PCH)
                wm_enable_phy_wakeup(sc);
        else {
-               CSR_WRITE(sc, WMREG_WUC, WUC_PME_EN);
+               CSR_WRITE(sc, WMREG_WUC, CSR_READ(sc, WMREG_WUC) | WUC_PME_EN);
                CSR_WRITE(sc, WMREG_WUFC, reg);
        }