Module Name: src Committed By: snj Date: Wed Feb 4 06:48:13 UTC 2015
Modified Files: src/sys/dev/pci [netbsd-7]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #490): sys/dev/pci/if_wm.c: revision 1.310 Fix a bug that a workaround for SWSM.SMBI bit doesn't work correctly. This problem was only occured with old boot ROM on 8257[12]. To generate a diff of this commit: cvs rdiff -u -r1.289.2.2 -r1.289.2.3 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.289.2.2 src/sys/dev/pci/if_wm.c:1.289.2.3 --- src/sys/dev/pci/if_wm.c:1.289.2.2 Fri Nov 7 21:34:56 2014 +++ src/sys/dev/pci/if_wm.c Wed Feb 4 06:48:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.289.2.2 2014/11/07 21:34:56 snj Exp $ */ +/* $NetBSD: if_wm.c,v 1.289.2.3 2015/02/04 06:48:13 snj 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.289.2.2 2014/11/07 21:34:56 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.3 2015/02/04 06:48:13 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1831,7 +1831,7 @@ wm_attach(device_t parent, device_t self case WM_T_82571: case WM_T_82572: reg = CSR_READ(sc, WMREG_SWSM2); - if ((reg & SWSM2_LOCK) != 0) { + if ((reg & SWSM2_LOCK) == 0) { CSR_WRITE(sc, WMREG_SWSM2, reg | SWSM2_LOCK); force_clear_smbi = true; } else