[src/trunk]: src/sys/dev/pci Fix a bug that the first access to NVM is failed...

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

details:   https://anonhg.NetBSD.org/src/rev/d6173c12427b
branches:  trunk
changeset: 336180:d6173c12427b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Feb 16 00:25:52 2015 +0000

description:
Fix a bug that the first access to NVM is failed on 8254[17] which use
SPI EEPROM. Observed on Dell PowerEdge [12]850. Thanks Tom Ivar Helbekkmo
for debugging.

diffstat:

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

diffs (34 lines):

diff -r 377728d59211 -r d6173c12427b sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Sun Feb 15 21:46:49 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Feb 16 00:25:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.312 2015/02/15 21:32:33 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.313 2015/02/16 00:25:52 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.312 2015/02/15 21:32:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.313 2015/02/16 00:25:52 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1757,6 +1757,7 @@
        case WM_T_82541_2:
        case WM_T_82547:
        case WM_T_82547_2:
+               sc->sc_flags |= WM_F_LOCK_EECD;
                reg = CSR_READ(sc, WMREG_EECD);
                if (reg & EECD_EE_TYPE) {
                        /* SPI */
@@ -1772,7 +1773,6 @@
                                sc->sc_nvm_addrbits = 6;
                        }
                }
-               sc->sc_flags |= WM_F_LOCK_EECD;
                break;
        case WM_T_82571:
        case WM_T_82572: