summaryrefslogtreecommitdiff
path: root/sys/dev/hyperv
diff options
context:
space:
mode:
authornonaka <nonaka@NetBSD.org>2019-11-22 12:40:07 +0000
committernonaka <nonaka@NetBSD.org>2019-11-22 12:40:07 +0000
commita631e2079ed5eb5f91d2447541a58de8402b1cd3 (patch)
tree63fb11ec756649b613da86ba5ca08676796791f3 /sys/dev/hyperv
parentd8e951ae50f4d47e0130e04422b4e035ded2bbca (diff)
hvn(4), hvkbd(4): Only need to poll when cold.
Diffstat (limited to 'sys/dev/hyperv')
-rw-r--r--sys/dev/hyperv/hvkbd.c14
-rw-r--r--sys/dev/hyperv/if_hvn.c24
2 files changed, 19 insertions, 19 deletions
diff --git a/sys/dev/hyperv/hvkbd.c b/sys/dev/hyperv/hvkbd.c
index b27cedab9d8..ea70dbf3362 100644
--- a/sys/dev/hyperv/hvkbd.c
+++ b/sys/dev/hyperv/hvkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $ */
+/* $NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,13 +344,13 @@ hvkbd_connect(struct hvkbd_softc *sc)
}
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = spltty();
+ hvkbd_intr(sc);
+ splx(s);
+ } else
tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
- s = spltty();
- hvkbd_intr(sc);
- splx(s);
} while (--timo > 0 && sc->sc_connected == 0);
if (timo == 0 && sc->sc_connected == 0) {
diff --git a/sys/dev/hyperv/if_hvn.c b/sys/dev/hyperv/if_hvn.c
index 0e1c10a39cd..a8b8b2675ea 100644
--- a/sys/dev/hyperv/if_hvn.c
+++ b/sys/dev/hyperv/if_hvn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $ */
+/* $NetBSD: if_hvn.c,v 1.9 2019/11/22 12:40:07 nonaka Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.9 2019/11/22 12:40:07 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1081,13 +1081,13 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *cmd, size_t cmdsize, uint64_t tid,
return 0;
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1));
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
} while (--timo > 0 && sc->sc_nvsdone != 1);
if (timo == 0 && sc->sc_nvsdone != 1) {
@@ -1404,13 +1404,13 @@ hvn_rndis_cmd(struct hvn_softc *sc, struct rndis_cmd *rc, int timo)
BUS_DMASYNC_POSTWRITE);
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
} while (--timo > 0 && rc->rc_done != 1);
bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,