[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/2b05437487ce
branches:  netbsd-8
changeset: 851063:2b05437487ce
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Oct 15 20:18:17 2017 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #306):
        sys/dev/pci/if_wm.c: revision 1.539
- Correct NVM word size check in wm_nvm_version() to prevent
   "EERD polling failed" error on attach. if_wm.c rev. 1.534 was not perfect.
   Reported by ozaki-r@.
- Print NVM offset and word count when EERD polling failed.

diffstat:

 sys/dev/pci/if_wm.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 6e3f88f27d7e -r 2b05437487ce sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 13 08:17:26 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Sun Oct 15 20:18:17 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.2 2017/08/01 23:33:18 snj Exp $      */
+/*     $NetBSD: if_wm.c,v 1.508.4.3 2017/10/15 20:18:17 snj Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.2 2017/08/01 23:33:18 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.3 2017/10/15 20:18:17 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -11773,7 +11773,8 @@
                CSR_WRITE(sc, WMREG_EERD, eerd);
                rv = wm_poll_eerd_eewr_done(sc, WMREG_EERD);
                if (rv != 0) {
-                       aprint_error_dev(sc->sc_dev, "EERD polling failed\n");
+                       aprint_error_dev(sc->sc_dev, "EERD polling failed: "
+                           "offset=%d. wordcnt=%d\n", offset, wordcnt);
                        break;
                }
                data[i] = (CSR_READ(sc, WMREG_EERD) >> EERD_DATA_SHIFT);
@@ -12554,7 +12555,7 @@
        }
 
        /* Assume the Option ROM area is at avove NVM_SIZE */
-       if ((sc->sc_nvm_wordsize >= NVM_SIZE) && check_optionrom
+       if ((sc->sc_nvm_wordsize > NVM_SIZE) && check_optionrom
            && (wm_nvm_read(sc, NVM_OFF_COMB_VER_PTR, 1, &off) == 0)) {
                /* Option ROM Version */
                if ((off != 0x0000) && (off != 0xffff)) {