[src/trunk]: src/sys/dev/pci Fix KASSERT to prevent panic on CNP(Intel 300 se...

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

details:   https://anonhg.NetBSD.org/src/rev/78b3d11dba40
branches:  trunk
changeset: 836233:78b3d11dba40
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 05 08:23:58 2018 +0000

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

XXX pullup-[78]

diffstat:

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

diffs (28 lines):

diff -r 2a4333a63a3d -r 78b3d11dba40 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 05 05:37:49 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Oct 05 08:23:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.588 2018/09/12 05:03:05 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.589 2018/10/05 08:23:58 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.588 2018/09/12 05:03:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.589 2018/10/05 08:23:58 msaitoh 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;