From 0c66a6d841221b81034bc8795357ec5ac1c5391b Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sat, 16 Sep 2006 01:20:27 +0000 Subject: Asking for HWERR interrupts and not acknowledging them leads to interrupt storms on several machines, so don't ask. Diff from kettenis@ who can't commit at the moment. ok deraadt@ --- sys/dev/pci/if_msk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/dev/pci') diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 1a05603681a..e30c959807f 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.16 2006/08/25 00:21:10 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.17 2006/09/16 01:20:26 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2032,11 +2032,9 @@ msk_init(void *xsc_if) sc->sk_intrmask |= SK_Y2_INTRS1; else sc->sk_intrmask |= SK_Y2_INTRS2; - sc->sk_intrmask |= SK_Y2_IMR_HWERR | SK_Y2_IMR_BMU; + sc->sk_intrmask |= SK_Y2_IMR_BMU; CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask); - CSR_WRITE_4(sc, SK_IEMR, 0x2e00003f); - ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; -- cgit v1.2.3