Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for some hypervisor environments. 

The environments cannot stop e1000 interrupt immediately.
This commit is contained in:
knakahara 2022-12-08 08:14:28 +00:00
parent fea168e16c
commit c44a43edd7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.766 2022/10/26 06:36:39 msaitoh Exp $ */
/* $NetBSD: if_wm.c,v 1.767 2022/12/08 08:14:28 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.766 2022/10/26 06:36:39 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.767 2022/12/08 08:14:28 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@ -478,6 +478,7 @@ struct wm_queue {
char sysctlname[32]; /* Name for sysctl */
bool wmq_txrx_use_workqueue;
bool wmq_wq_enqueued;
struct work wmq_cookie;
void *wmq_si;
};
@ -10308,9 +10309,13 @@ static inline void
wm_sched_handle_queue(struct wm_softc *sc, struct wm_queue *wmq)
{
if (wmq->wmq_txrx_use_workqueue)
workqueue_enqueue(sc->sc_queue_wq, &wmq->wmq_cookie, curcpu());
else
if (wmq->wmq_txrx_use_workqueue) {
if (!wmq->wmq_wq_enqueued) {
wmq->wmq_wq_enqueued = true;
workqueue_enqueue(sc->sc_queue_wq, &wmq->wmq_cookie,
curcpu());
}
} else
softint_schedule(wmq->wmq_si);
}
@ -10593,8 +10598,10 @@ wm_handle_queue_work(struct work *wk, void *context)
struct wm_queue *wmq = container_of(wk, struct wm_queue, wmq_cookie);
/*
* "enqueued flag" is not required here.
* Some qemu environment workaround. They don't stop interrupt
* immediately.
*/
wmq->wmq_wq_enqueued = false;
wm_handle_queue(wmq);
}