Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci remove explicit irqack() call for unexpected int...



details:   https://anonhg.NetBSD.org/src/rev/a5e86e572b49
branches:  trunk
changeset: 936072:a5e86e572b49
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Jul 17 21:04:14 2020 +0000

description:
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

diffstat:

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

diffs (30 lines):

diff -r c2e80555e7be -r a5e86e572b49 sys/dev/pci/cmdide.c
--- a/sys/dev/pci/cmdide.c      Fri Jul 17 19:40:47 2020 +0000
+++ b/sys/dev/pci/cmdide.c      Fri Jul 17 21:04:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmdide.c,v 1.45 2020/07/01 17:57:14 jdolecek Exp $     */
+/*     $NetBSD: cmdide.c,v 1.46 2020/07/17 21:04:14 jdolecek Exp $     */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.45 2020/07/01 17:57:14 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.46 2020/07/17 21:04:14 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -245,10 +245,9 @@
                    (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;
                }



Home | Main Index | Thread Index | Old Index