 @@ -1,14 +1,14 @@
-/*	$NetBSD: hvkbd.c,v 1.1.4.6 2019/11/24 08:11:06 martin Exp $	*/
+/*	$NetBSD: hvkbd.c,v 1.1.4.7 2021/01/29 18:18:25 martin Exp $	*/
 /*-
  * Copyright (c) 2017 Microsoft Corp.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -26,27 +26,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * $FreeBSD: head/sys/dev/hyperv/input/hv_kbd.c 317821 2017-05-05 03:28:30Z sephe $
  * $FreeBSD: head/sys/dev/hyperv/input/hv_kbdc.c 320490 2017-06-30 03:01:22Z sephe $
  * $FreeBSD: head/sys/dev/hyperv/input/hv_kbdc.h 316515 2017-04-05 05:01:23Z sephe $
  */
 #ifdef _KERNEL_OPT
 #include "opt_pckbd_layout.h"
 #include "opt_wsdisplay_compat.h"
 #endif /* _KERNEL_OPT */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.1.4.6 2019/11/24 08:11:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.1.4.7 2021/01/29 18:18:25 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/pmf.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <dev/hyperv/vmbusvar.h>
 @@ -353,27 +353,28 @@ hvkbd_connect(struct hvkbd_softc *sc)
 	if (error) {
 		aprint_error_dev(sc->sc_dev, "failed to send connect: %d\n",
 		    error);
 		return error;
+	}
 	do {
 		if (cold) {
 			delay(1000);
 			s = spltty();
 			hvkbd_intr(sc);
 			splx(s);
 		} else
-			tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
+			tsleep(sc, PRIBIO | PCATCH, "hvkbdcon",
 			    max(1, mstohz(1)));
 	} while (--timo > 0 && sc->sc_connected == 0);
 	if (timo == 0 && sc->sc_connected == 0) {
 		aprint_error_dev(sc->sc_dev, "connect timed out\n");
 		return ETIMEDOUT;
+	}
 	if (!(sc->sc_connect_status & RESP_STATUS_ACCEPTED)) {
 		aprint_error_dev(sc->sc_dev, "protocol request failed\n");
 		return ENODEV;
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $	*/
+/*	$NetBSD: if_hvn.c,v 1.2.2.9 2021/01/29 18:18:25 martin Exp $	*/
 /*	$OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016 Microsoft Corp.
  * Copyright (c) 2010-2012 Citrix Inc.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2016 Mike Belopuhov <mike@esdenera.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * The OpenBSD port was done under funding by Esdenera Networks GmbH.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.9 2021/01/29 18:18:25 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 @@ -1055,52 +1055,53 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
 	int tries = 10;
 	int rv, s;
 	sc->sc_nvsdone = 0;
 	do {
 		rv = vmbus_channel_send(sc->sc_chan, cmd, cmdsize,
 		    tid, VMBUS_CHANPKT_TYPE_INBAND,
 		    timo ? VMBUS_CHANPKT_FLAG_RC : 0);
 		if (rv == EAGAIN) {
 			if (cold)
 				delay(1000);
 			else
-				tsleep(cmd, PRIBIO, "nvsout", mstohz(1));
+				tsleep(cmd, PRIBIO, "nvsout",
 				    max(1, mstohz(1)));
 		} else if (rv) {
 			DPRINTF("%s: NVSP operation %u send error %d\n",
 			    device_xname(sc->sc_dev), hdr->nvs_type, rv);
 			return rv;
+		}
 	} while (rv != 0 && --tries > 0);
 	if (tries == 0 && rv != 0) {
 		device_printf(sc->sc_dev,
 		    "NVSP operation %u send error %d\n", hdr->nvs_type, rv);
 		return rv;
+	}
 	if (timo == 0)
 		return 0;
 	do {
 		if (cold) {
 			delay(1000);
 			s = splnet();
 			hvn_nvs_intr(sc);
 			splx(s);
 		} else
 			tsleep(sc->sc_nvsrsp, PRIBIO | PCATCH, "nvscmd",
-			    mstohz(1));
+			    max(1, mstohz(1)));
 	} while (--timo > 0 && sc->sc_nvsdone != 1);
 	if (timo == 0 && sc->sc_nvsdone != 1) {
 		device_printf(sc->sc_dev, "NVSP operation %u timed out\n",
 		    hdr->nvs_type);
 		return ETIMEDOUT;
+	}
 	return 0;
+}
 static int
 hvn_nvs_ack(struct hvn_softc *sc, uint64_t tid)
+{
 @@ -1378,52 +1379,54 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
 	sgl[0].gpa_ofs = 0;
 	rc->rc_done = 0;
 	hvn_submit_cmd(sc, rc);
 	do {
 		rv = vmbus_channel_send_sgl(sc->sc_chan, sgl, 1, &rc->rc_msg,
 		    sizeof(*msg), rc->rc_id);
 		if (rv == EAGAIN) {
 			if (cold)
 				delay(1000);
 			else
-				tsleep(rc, PRIBIO, "rndisout", mstohz(1));
+				tsleep(rc, PRIBIO, "rndisout",
 				    max(1, mstohz(1)));
 		} else if (rv) {
 			DPRINTF("%s: RNDIS operation %u send error %d\n",
 			    device_xname(sc->sc_dev), hdr->rm_type, rv);
 			hvn_rollback_cmd(sc, rc);
 			return rv;
+		}
 	} while (rv != 0 && --tries > 0);
 	if (tries == 0 && rv != 0) {
 		device_printf(sc->sc_dev,
 		    "RNDIS operation %u send error %d\n", hdr->rm_type, rv);
 		return rv;
+	}
 	bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,
 	    BUS_DMASYNC_POSTWRITE);
 	do {
 		if (cold) {
 			delay(1000);
 			s = splnet();
 			hvn_nvs_intr(sc);
 			splx(s);
 		} else
-			tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
+			tsleep(rc, PRIBIO | PCATCH, "rndiscmd",
 			    max(1, mstohz(1)));
 	} while (--timo > 0 && rc->rc_done != 1);
 	bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,
 	    BUS_DMASYNC_POSTREAD);
 	if (rc->rc_done != 1) {
 		rv = timo == 0 ? ETIMEDOUT : EINTR;
 		if (hvn_rollback_cmd(sc, rc)) {
 			hvn_release_cmd(sc, rc);
 			rv = 0;
 		} else if (rv == ETIMEDOUT) {
 			device_printf(sc->sc_dev,
 			    "RNDIS operation %u timed out\n", hdr->rm_type);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmbus.c,v 1.2.2.5 2019/11/24 08:11:06 martin Exp $	*/
+/*	$NetBSD: vmbus.c,v 1.2.2.6 2021/01/29 18:18:25 martin Exp $	*/
 /*	$OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $	*/
 /*-
  * Copyright (c) 2009-2012 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * Copyright (c) 2016 Mike Belopuhov <mike@esdenera.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * The OpenBSD port was done under funding by Esdenera Networks GmbH.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.2.2.5 2019/11/24 08:11:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.2.2.6 2021/01/29 18:18:25 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <sys/bitops.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/xcall.h>
 @@ -594,27 +594,28 @@ vmbus_start(struct vmbus_softc *sc, stru
 	for (i = 0; i < __arraycount(delays); i++) {
 		status = hyperv_hypercall_post_message(
 		    msg_pa + offsetof(struct vmbus_msg, msg_req));
 		if (status == HYPERCALL_STATUS_SUCCESS)
 			break;
 		if (msg->msg_flags & MSGF_NOSLEEP) {
 			delay(delays[i]);
 			s = splnet();
 			hyperv_intr();
 			splx(s);
 		} else
-			tsleep(wchan, PRIBIO, wchan, mstohz(delays[i]));
+			tsleep(wchan, PRIBIO, wchan,
 			    max(1, mstohz(delays[i] / 1000)));
+	}
 	if (status != HYPERCALL_STATUS_SUCCESS) {
 		device_printf(sc->sc_dev,
 		    "posting vmbus message failed with %d\n", status);
 		if (!(msg->msg_flags & MSGF_NOQUEUE)) {
 			mutex_enter(&sc->sc_req_lock);
 			TAILQ_REMOVE(&sc->sc_reqs, msg, msg_entry);
 			mutex_exit(&sc->sc_req_lock);
+		}
 		return EIO;
+	}
 	return 0;
 @@ -657,27 +658,27 @@ vmbus_wait(struct vmbus_softc *sc,
     int (*cond)(struct vmbus_softc *, struct vmbus_msg *),
     struct vmbus_msg *msg, void *wchan, const char *wmsg)
+{
 	int s;
 	while (!cond(sc, msg)) {
 		if (msg->msg_flags & MSGF_NOSLEEP) {
 			delay(1000);
 			s = splnet();
 			hyperv_intr();
 			splx(s);
 		} else
 			tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait",
-			    mstohz(1));
+			    max(1, mstohz(1)));
+	}
+}
 static uint16_t
 vmbus_intr_signal(struct vmbus_softc *sc, paddr_t con_pa)
+{
 	uint64_t status;
 	status = hyperv_hypercall_signal_event(con_pa);
 	return (uint16_t)status;
+}
 #if LONG_BIT == 64