diff options
| author | nonaka <nonaka@NetBSD.org> | 2019-11-22 12:30:32 +0000 |
|---|---|---|
| committer | nonaka <nonaka@NetBSD.org> | 2019-11-22 12:30:32 +0000 |
| commit | d8e951ae50f4d47e0130e04422b4e035ded2bbca (patch) | |
| tree | 2d94e9d66c2a73aacfe0c1fc20c2b53dc63da063 /sys/dev/hyperv | |
| parent | b66afcbf664ec02debf1adafc2ffa512f22f12bd (diff) | |
vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9).
Diffstat (limited to 'sys/dev/hyperv')
| -rw-r--r-- | sys/dev/hyperv/hvkbd.c | 6 | ||||
| -rw-r--r-- | sys/dev/hyperv/if_hvn.c | 12 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus.c | 9 |
3 files changed, 14 insertions, 13 deletions
diff --git a/sys/dev/hyperv/hvkbd.c b/sys/dev/hyperv/hvkbd.c index 04188c49ce8..b27cedab9d8 100644 --- a/sys/dev/hyperv/hvkbd.c +++ b/sys/dev/hyperv/hvkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hvkbd.c,v 1.4 2019/11/15 08:51:27 nonaka Exp $ */ +/* $NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 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.4 2019/11/15 08:51:27 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -347,7 +347,7 @@ hvkbd_connect(struct hvkbd_softc *sc) if (cold) delay(1000); else - tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", 1); + tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1)); s = spltty(); hvkbd_intr(sc); splx(s); diff --git a/sys/dev/hyperv/if_hvn.c b/sys/dev/hyperv/if_hvn.c index 5f2ef6f3fdf..0e1c10a39cd 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.7 2019/11/18 04:38:48 nonaka Exp $ */ +/* $NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 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.7 2019/11/18 04:38:48 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1063,7 +1063,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *cmd, size_t cmdsize, uint64_t tid, if (cold) delay(1000); else - tsleep(cmd, PRIBIO, "nvsout", 1); + tsleep(cmd, PRIBIO, "nvsout", mstohz(1)); } else if (rv) { DPRINTF("%s: NVSP operation %u send error %d\n", device_xname(sc->sc_dev), hdr->nvs_type, rv); @@ -1084,7 +1084,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *cmd, size_t cmdsize, uint64_t tid, if (cold) delay(1000); else - tsleep(sc, PRIBIO | PCATCH, "nvscmd", 1); + tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1)); s = splnet(); hvn_nvs_intr(sc); splx(s); @@ -1385,7 +1385,7 @@ hvn_rndis_cmd(struct hvn_softc *sc, struct rndis_cmd *rc, int timo) if (cold) delay(1000); else - tsleep(rc, PRIBIO, "rndisout", 1); + tsleep(rc, PRIBIO, "rndisout", mstohz(1)); } else if (rv) { DPRINTF("%s: RNDIS operation %u send error %d\n", device_xname(sc->sc_dev), hdr->rm_type, rv); @@ -1407,7 +1407,7 @@ hvn_rndis_cmd(struct hvn_softc *sc, struct rndis_cmd *rc, int timo) if (cold) delay(1000); else - tsleep(rc, PRIBIO | PCATCH, "rndiscmd", 1); + tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1)); s = splnet(); hvn_nvs_intr(sc); splx(s); diff --git a/sys/dev/hyperv/vmbus.c b/sys/dev/hyperv/vmbus.c index 7a91b79a923..f6c7cecbe25 100644 --- a/sys/dev/hyperv/vmbus.c +++ b/sys/dev/hyperv/vmbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $ */ +/* $NetBSD: vmbus.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $ */ /* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */ /*- @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -604,7 +604,7 @@ vmbus_start(struct vmbus_softc *sc, struct vmbus_msg *msg, paddr_t msg_pa) hyperv_intr(); splx(s); } else - tsleep(wchan, PRIBIO, wchan, 1); + tsleep(wchan, PRIBIO, wchan, mstohz(delays[i])); } if (status != HYPERCALL_STATUS_SUCCESS) { device_printf(sc->sc_dev, @@ -666,7 +666,8 @@ vmbus_wait(struct vmbus_softc *sc, hyperv_intr(); splx(s); } else - tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait", 1); + tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait", + mstohz(1)); } } |
