[src/trunk]: src/sys/dev/pci Calling wm_init_lcd_from_nvm() makes hang on som...

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

details:   https://anonhg.NetBSD.org/src/rev/4d5d148cc2e9
branches:  trunk
changeset: 825429:4d5d148cc2e9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Jul 14 04:34:29 2017 +0000

description:
Calling wm_init_lcd_from_nvm() makes hang on some machines reported by
Brad Harder. Until fix this problem correctly, Disable whole of
wm_init_lcd_from_nvm().

diffstat:

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

diffs (34 lines):

diff -r e1866015868a -r 4d5d148cc2e9 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Jul 14 01:30:08 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Jul 14 04:34:29 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.524 2017/07/13 13:27:08 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.525 2017/07/14 04:34:29 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.524 2017/07/13 13:27:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.525 2017/07/14 04:34:29 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -3702,6 +3702,7 @@
 void
 wm_init_lcd_from_nvm(struct wm_softc *sc)
 {
+#if 0
        uint32_t extcnfctr, sw_cfg_mask, cnf_size, word_addr, i, reg;
        uint16_t phy_page = 0;
 
@@ -3786,6 +3787,7 @@
 release:       
        sc->phy.release(sc);
        return;
+#endif
 }