Module Name: src
Committed By: sborrill
Date: Tue Oct 30 08:35:56 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.15 -r1.289.2.16 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.289.2.15 src/sys/dev/pci/if_wm.c:1.289.2.16
--- src/sys/dev/pci/if_wm.c:1.289.2.15 Sat Aug 11 13:34:20 2018
+++ src/sys/dev/pci/if_wm.c Tue Oct 30 08:35:56 2018
@@ -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 @@ wm_legacy_irq_quirk_spt(struct wm_softc
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;
