Module Name: src
Committed By: msaitoh
Date: Fri Oct 5 08:23:58 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix KASSERT to prevent panic on CNP(Intel 300 series + I219) with INTx
interrupt (Xen dom0 or pre netbsd-8).
XXX pullup-[78]
To generate a diff of this commit:
cvs rdiff -u -r1.588 -r1.589 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.588 src/sys/dev/pci/if_wm.c:1.589
--- src/sys/dev/pci/if_wm.c:1.588 Wed Sep 12 05:03:05 2018
+++ src/sys/dev/pci/if_wm.c Fri Oct 5 08:23:58 2018
@@ -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 @@ 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;
