[src/netbsd-8]: src/sys/dev/pci Pull up the following revisions(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/99105c310a32
branches:  netbsd-8
changeset: 445459:99105c310a32
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Oct 30 09:25:13 2018 +0000

description:
Pull up the following revisions(s) (requested by msaitoh in ticket #1075):
        sys/dev/pci/if_wm.c:    revision 1.589

Fix KASSERT to prevent panic on CNP (Intel 300 series + I219) with INTx
interrupt (Xen dom0 or pre netbsd-8)

diffstat:

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

diffs (28 lines):

diff -r 9763a38d782e -r 99105c310a32 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 26 15:14:46 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Oct 30 09:25:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.23 2018/09/23 17:39:02 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.24 2018/10/30 09:25:13 sborrill 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.23 2018/09/23 17:39:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.24 2018/10/30 09:25:13 sborrill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -14789,7 +14789,8 @@
 
        DPRINTF(WM_DEBUG_INIT, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
-       KASSERT(sc->sc_type == WM_T_PCH_SPT);
+       KASSERT((sc->sc_type == WM_T_PCH_SPT)
+           || (sc->sc_type == WM_T_PCH_CNP));
 
        reg = CSR_READ(sc, WMREG_FEXTNVM7);
        reg |= FEXTNVM7_SIDE_CLK_UNGATE;