[src/trunk]: src/sys/dev/pci Our PCH_SPT part of wm_nvm_valid_bank_detect_ich...

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

details:   https://anonhg.NetBSD.org/src/rev/59c85dce41b9
branches:  trunk
changeset: 321968:59c85dce41b9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Apr 12 03:09:24 2018 +0000

description:
Our PCH_SPT part of wm_nvm_valid_bank_detect_ich8lan() was based on
FreeBSD r287467. After that, they reverted it and committed the different
code in r287762. r287762's bank detect code didn't work for us because our wm
dirver had a problem in flash access. The problem was fixed in if_wm.c rev.
1.567, so we can use the new way now.

diffstat:

 sys/dev/pci/if_wm.c |  43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diffs (69 lines):

diff -r 0e6f36be70ab -r 59c85dce41b9 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Apr 12 02:48:59 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Apr 12 03:09:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.567 2018/04/12 02:48:59 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.568 2018/04/12 03:09:24 msaitoh 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.567 2018/04/12 02:48:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.568 2018/04/12 03:09:24 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -11934,23 +11934,38 @@
        uint32_t act_offset = ICH_NVM_SIG_WORD * 2 + 1;
        uint32_t bank1_offset = sc->sc_ich8_flash_bank_size * sizeof(uint16_t);
        uint8_t sig_byte = 0;
+       uint32_t nvm_dword = 0;
+       int rv;
 
        switch (sc->sc_type) {
        case WM_T_PCH_SPT:
-               /*
-                * In SPT, read from the CTRL_EXT reg instead of accessing the
-                * sector valid bits from the NVM.
-                */
-               *bank = CSR_READ(sc, WMREG_CTRL_EXT) & CTRL_EXT_NVMVS;
-               if ((*bank == 0) || (*bank == 1)) {
-                       aprint_error_dev(sc->sc_dev,
-                           "%s: no valid NVM bank present (%u)\n", __func__,
-                               *bank);
-                       return -1;
-               } else {
-                       *bank = *bank - 2;
+               bank1_offset = sc->sc_ich8_flash_bank_size * 2;
+               act_offset = ICH_NVM_SIG_WORD * 2;
+
+               /* set bank to 0 in case flash read fails. */
+               *bank = 0;
+
+               /* Check bank 0 */
+               rv = wm_read_ich8_dword(sc, act_offset, &nvm_dword);
+               if (rv != 0)
+                       return rv;
+               sig_byte = (uint8_t)((nvm_dword & 0xFF00) >> 8);
+               if ((sig_byte & ICH_NVM_VALID_SIG_MASK) == ICH_NVM_SIG_VALUE) {
+                       *bank = 0;
                        return 0;
                }
+
+               /* Check bank 1 */
+               rv = wm_read_ich8_dword(sc, act_offset + bank1_offset,
+                   &nvm_dword);
+               sig_byte = (uint8_t)((nvm_dword & 0xFF00) >> 8);
+               if ((sig_byte & ICH_NVM_VALID_SIG_MASK) == ICH_NVM_SIG_VALUE) {
+                       *bank = 1;
+                       return 0;
+               }
+               aprint_error_dev(sc->sc_dev,
+                   "%s: no valid NVM bank present (%u)\n", __func__, *bank);
+               return -1;
        case WM_T_ICH8:
        case WM_T_ICH9:
                eecd = CSR_READ(sc, WMREG_EECD);