Module Name: src
Committed By: martin
Date: Mon Aug 17 11:29:31 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: cmdide.c
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #1054):
sys/dev/pci/cmdide.c: revision 1.46
remove explicit irqack() call for unexpected interrupt; this happens
normally during boot when running identify for the drive as polled
command, and fixes hard hang caused by the irqack() on a sun machine
the unexpected interrupt happens because cmdide doesn't respect
WDCTL_IDS bit and triggers interrupt also for polled commands
also reclassify the "bogus intr" as aprint_verbose() to avoid noise
on boot
discussed and tested by Martin Husemann
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.10.1 src/sys/dev/pci/cmdide.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/cmdide.c
diff -u src/sys/dev/pci/cmdide.c:1.43 src/sys/dev/pci/cmdide.c:1.43.10.1
--- src/sys/dev/pci/cmdide.c:1.43 Sun Oct 22 13:13:55 2017
+++ src/sys/dev/pci/cmdide.c Mon Aug 17 11:29:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdide.c,v 1.43 2017/10/22 13:13:55 jdolecek Exp $ */
+/* $NetBSD: cmdide.c,v 1.43.10.1 2020/08/17 11:29:31 martin Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.43 2017/10/22 13:13:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.43.10.1 2020/08/17 11:29:31 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,10 +245,9 @@ cmd_pci_intr(void *arg)
(i == 1 && (secirq & CMD_ARTTIM23_IRQ))) {
crv = wdcintr(wdc_cp);
if (crv == 0) {
- aprint_error("%s:%d: bogus intr\n",
+ aprint_verbose("%s:%d: bogus intr\n",
device_xname(
sc->sc_wdcdev.sc_atac.atac_dev), i);
- sc->sc_wdcdev.irqack(wdc_cp);
} else
rv = 1;
}
