[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by j...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c8128b488d73
branches:  netbsd-9
changeset: 964075:c8128b488d73
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 17 11:29:31 2020 +0000

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

diffstat:

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

diffs (30 lines):

diff -r 471c6852c619 -r c8128b488d73 sys/dev/pci/cmdide.c
--- a/sys/dev/pci/cmdide.c      Mon Aug 17 11:27:33 2020 +0000
+++ b/sys/dev/pci/cmdide.c      Mon Aug 17 11:29:31 2020 +0000
@@ -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 @@
                    (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;
                }