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

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

details:   https://anonhg.NetBSD.org/src/rev/db4dd71f20b7
branches:  netbsd-7
changeset: 445457:db4dd71f20b7
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Oct 30 08:35:56 2018 +0000

description:
Pull up the following revisions(s) (requested by msaitoh in ticket #1647):
        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 4ce9f34985c3 -r db4dd71f20b7 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Oct 15 08:05:43 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Oct 30 08:35:56 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.289.2.15 2018/08/11 13:34:20 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $        */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.15 2018/08/11 13:34:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.16 2018/10/30 08:35:56 sborrill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -12523,7 +12523,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;