Module Name: src
Committed By: jdolecek
Date: Wed Jul 1 15:10:01 UTC 2020
Modified Files:
src/sys/dev/pci: cmdide.c
Log Message:
ignore interrupt when not expecting one, particularly don't invoke
the irqack in this case
seems cmdide doesn't honour WDCTL_IDS when executing polled commands,
and there is a race where the irqack call interferes with polled
command and causes a lockup
reported by Martin Husemann
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.44
--- src/sys/dev/pci/cmdide.c:1.43 Sun Oct 22 13:13:55 2017
+++ src/sys/dev/pci/cmdide.c Wed Jul 1 15:10:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdide.c,v 1.43 2017/10/22 13:13:55 jdolecek Exp $ */
+/* $NetBSD: cmdide.c,v 1.44 2020/07/01 15:10:01 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.43 2017/10/22 13:13:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.44 2020/07/01 15:10:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,9 +238,15 @@ cmd_pci_intr(void *arg)
for (i = 0; i < sc->sc_wdcdev.sc_atac.atac_nchannels; i++) {
cp = &sc->pciide_channels[i];
wdc_cp = &cp->ata_channel;
+
/* If a compat channel skip. */
if (cp->compat)
continue;
+
+ /* if this channel not waiting for intr, skip */
+ if ((wdc_cp->ch_flags & ATACH_IRQ_WAIT) == 0)
+ continue;
+
if ((i == 0 && (priirq & CMD_CONF_DRV0_INTR)) ||
(i == 1 && (secirq & CMD_ARTTIM23_IRQ))) {
crv = wdcintr(wdc_cp);
