Module Name: src
Committed By: msaitoh
Date: Tue Jul 16 10:30:27 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix yet another NVM bank detect problem in wm(4). Use bank 0 if the detect
function failed. It's the same as FreeBSD. Observed and tested with Asus P8P67
Deluxe motherboard and tested by jnemeth.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 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.261 src/sys/dev/pci/if_wm.c:1.262
--- src/sys/dev/pci/if_wm.c:1.261 Thu Jun 27 09:57:49 2013
+++ src/sys/dev/pci/if_wm.c Tue Jul 16 10:30:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.261 2013/06/27 09:57:49 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.261 2013/06/27 09:57:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -7596,7 +7596,8 @@ wm_valid_nvm_bank_detect_ich8lan(struct
}
}
- aprint_error_dev(sc->sc_dev, "EEPROM not present\n");
+ DPRINTF(WM_DEBUG_NVM, ("%s: No valid NVM bank present\n",
+ device_xname(sc->sc_dev)));
return -1;
}
@@ -7628,7 +7629,7 @@ wm_read_eeprom_ich8(struct wm_softc *sc,
if (error) {
aprint_error_dev(sc->sc_dev, "%s: failed to detect NVM bank\n",
__func__);
- return error;
+ flash_bank = 0;
}
/*
