summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2020-04-20 12:11:18 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2020-04-20 12:11:18 +0000
commit89190032d1b22f1db22764daa4ffc704e06b65df (patch)
tree61e5a5a3c32b52bf81e5a866c8d0cffe4a9f23a8 /sys
parent4930170d32e3e005c28d775a28d63212b09084ec (diff)
Don't call mcx_intr() from mcx_cmdq_poll(); this was a leftover from early
development that I forgot about, but turns out to be a potential race with the actual interrupt handler. ok dlg@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_mcx.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c
index adbf625adfe..6e7ace6aae1 100644
--- a/sys/dev/pci/if_mcx.c
+++ b/sys/dev/pci/if_mcx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mcx.c,v 1.39 2020/04/06 11:27:23 jmatthew Exp $ */
+/* $OpenBSD: if_mcx.c,v 1.40 2020/04/20 12:11:17 jmatthew Exp $ */
/*
* Copyright (c) 2017 David Gwynne <dlg@openbsd.org>
@@ -2450,11 +2450,8 @@ mcx_cmdq_poll(struct mcx_softc *sc, struct mcx_cmdq_entry *cqe,
0, MCX_DMA_LEN(&sc->sc_cmdq_mem), BUS_DMASYNC_POSTRW);
if ((cqe->cq_status & MCX_CQ_STATUS_OWN_MASK) ==
- MCX_CQ_STATUS_OWN_SW) {
- if (sc->sc_eqn != 0)
- mcx_intr(sc);
+ MCX_CQ_STATUS_OWN_SW)
return (0);
- }
delay(1000);
}