[src/trunk]: src/sys/dev/pci Fix a bug that flags related to semaphore were i...

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

details:   https://anonhg.NetBSD.org/src/rev/d228981e1d7f
branches:  trunk
changeset: 808770:d228981e1d7f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jun 02 03:49:10 2015 +0000

description:
Fix a bug that flags related to semaphore were incorrectly checked in
wm_kmrn_{readreg,writereg}. i80003, ICH* and PCH* had this problem.

diffstat:

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

diffs (74 lines):

diff -r a8322cd55a46 -r d228981e1d7f sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Jun 02 02:11:22 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Jun 02 03:49:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.322 2015/05/22 03:15:43 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.323 2015/06/02 03:49:10 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.322 2015/05/22 03:15:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.323 2015/06/02 03:49:10 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -7297,13 +7297,13 @@
 {
        int rv;
 
-       if (sc->sc_flags == WM_F_LOCK_SWFW) {
+       if (sc->sc_flags & WM_F_LOCK_SWFW) {
                if (wm_get_swfw_semaphore(sc, SWFW_MAC_CSR_SM)) {
                        aprint_error_dev(sc->sc_dev,
                            "%s: failed to get semaphore\n", __func__);
                        return 0;
                }
-       } else if (sc->sc_flags == WM_F_LOCK_EXTCNF) {
+       } else if (sc->sc_flags & WM_F_LOCK_EXTCNF) {
                if (wm_get_swfwhw_semaphore(sc)) {
                        aprint_error_dev(sc->sc_dev,
                            "%s: failed to get semaphore\n", __func__);
@@ -7319,9 +7319,9 @@
 
        rv = CSR_READ(sc, WMREG_KUMCTRLSTA) & KUMCTRLSTA_MASK;
 
-       if (sc->sc_flags == WM_F_LOCK_SWFW)
+       if (sc->sc_flags & WM_F_LOCK_SWFW)
                wm_put_swfw_semaphore(sc, SWFW_MAC_CSR_SM);
-       else if (sc->sc_flags == WM_F_LOCK_EXTCNF)
+       else if (sc->sc_flags & WM_F_LOCK_EXTCNF)
                wm_put_swfwhw_semaphore(sc);
 
        return rv;
@@ -7336,13 +7336,13 @@
 wm_kmrn_writereg(struct wm_softc *sc, int reg, int val)
 {
 
-       if (sc->sc_flags == WM_F_LOCK_SWFW) {
+       if (sc->sc_flags & WM_F_LOCK_SWFW) {
                if (wm_get_swfw_semaphore(sc, SWFW_MAC_CSR_SM)) {
                        aprint_error_dev(sc->sc_dev,
                            "%s: failed to get semaphore\n", __func__);
                        return;
                }
-       } else if (sc->sc_flags == WM_F_LOCK_EXTCNF) {
+       } else if (sc->sc_flags & WM_F_LOCK_EXTCNF) {
                if (wm_get_swfwhw_semaphore(sc)) {
                        aprint_error_dev(sc->sc_dev,
                            "%s: failed to get semaphore\n", __func__);
@@ -7354,9 +7354,9 @@
            ((reg << KUMCTRLSTA_OFFSET_SHIFT) & KUMCTRLSTA_OFFSET) |
            (val & KUMCTRLSTA_MASK));
 
-       if (sc->sc_flags == WM_F_LOCK_SWFW)
+       if (sc->sc_flags & WM_F_LOCK_SWFW)
                wm_put_swfw_semaphore(sc, SWFW_MAC_CSR_SM);
-       else if (sc->sc_flags == WM_F_LOCK_EXTCNF)
+       else if (sc->sc_flags & WM_F_LOCK_EXTCNF)
                wm_put_swfwhw_semaphore(sc);
 }