[src/trunk]: src/sys/dev/hyperv vmbus(4), hvn(4), hvkbd(4): Fixed wait time f...

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68811eeb11fe
branches:  trunk
changeset: 1004956:68811eeb11fe
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Fri Nov 22 12:30:32 2019 +0000

description:
vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9).

diffstat:

 sys/dev/hyperv/hvkbd.c  |   6 +++---
 sys/dev/hyperv/if_hvn.c |  12 ++++++------
 sys/dev/hyperv/vmbus.c  |   9 +++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs (118 lines):

diff -r 8e570f715ab0 -r 68811eeb11fe sys/dev/hyperv/hvkbd.c
--- a/sys/dev/hyperv/hvkbd.c    Fri Nov 22 10:26:32 2019 +0000
+++ b/sys/dev/hyperv/hvkbd.c    Fri Nov 22 12:30:32 2019 +0000
@@ -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 @@
                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 -r 8e570f715ab0 -r 68811eeb11fe sys/dev/hyperv/if_hvn.c
--- a/sys/dev/hyperv/if_hvn.c   Fri Nov 22 10:26:32 2019 +0000
+++ b/sys/dev/hyperv/if_hvn.c   Fri Nov 22 12:30:32 2019 +0000
@@ -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 @@
                        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 @@
                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 @@
                        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 @@
                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 -r 8e570f715ab0 -r 68811eeb11fe sys/dev/hyperv/vmbus.c
--- a/sys/dev/hyperv/vmbus.c    Fri Nov 22 10:26:32 2019 +0000
+++ b/sys/dev/hyperv/vmbus.c    Fri Nov 22 12:30:32 2019 +0000
@@ -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 @@
                        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 @@
                        hyperv_intr();
                        splx(s);
                } else
-                       tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait", 1);
+                       tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait",
+                           mstohz(1));
        }
 }