 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.53.2.7 2024/03/10 19:00:27 martin Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2014 Kevin Lo <kevlo@FreeBSD.org>
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*-
  * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188EU/RTL8188RU/RTL8192CU
  * RTL8192EU.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.7 2024/03/10 19:00:27 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 @@ -798,80 +798,115 @@ urtwn_free_tx_list(struct urtwn_softc *s
 	/* NB: Caller must abort pipe first. */
 	for (size_t j = 0; j < sc->tx_npipe; j++) {
 		for (i = 0; i < URTWN_TX_LIST_COUNT; i++) {
 			CTASSERT(sizeof(xfer) == sizeof(void *));
 			xfer = atomic_swap_ptr(&sc->tx_data[j][i].xfer, NULL);
 			if (xfer != NULL)
 				usbd_destroy_xfer(xfer);
+		}
+	}
+}
 static void
 urtwn_cmdq_invariants(struct urtwn_softc *sc)
+{
 	struct urtwn_host_cmd_ring *const ring __diagused = &sc->cmdq;
 	KASSERT(mutex_owned(&sc->sc_task_mtx));
 	KASSERTMSG((ring->cur >= 0 && ring->cur < URTWN_HOST_CMD_RING_COUNT),
 	    "%s: cur=%d next=%d queued=%d",
 	    device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
 	KASSERTMSG((ring->next >= 0 && ring->next < URTWN_HOST_CMD_RING_COUNT),
 	    "%s: cur=%d next=%d queued=%d",
 	    device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
 	KASSERTMSG((ring->queued >= 0 &&
 		ring->queued <= URTWN_HOST_CMD_RING_COUNT),
 	    "%s: %d commands queued",
 	    device_xname(sc->sc_dev), ring->queued);
+}
 static void
 urtwn_task(void *arg)
+{
 	struct urtwn_softc *sc = arg;
 	struct urtwn_host_cmd_ring *ring = &sc->cmdq;
 	struct urtwn_host_cmd *cmd;
 	int s;
 	DPRINTFN(DBG_FN, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
 	/* Process host commands. */
 	s = splusb();
 	mutex_spin_enter(&sc->sc_task_mtx);
 	urtwn_cmdq_invariants(sc);
 	while (ring->next != ring->cur) {
 		KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
 		    device_xname(sc->sc_dev),
 		    ring->cur, ring->next, ring->queued);
 		cmd = &ring->cmd[ring->next];
 		mutex_spin_exit(&sc->sc_task_mtx);
 		splx(s);
 		/* Invoke callback with kernel lock held. */
 		cmd->cb(sc, cmd->data);
 		s = splusb();
 		mutex_spin_enter(&sc->sc_task_mtx);
 		urtwn_cmdq_invariants(sc);
 		KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
 		    device_xname(sc->sc_dev),
 		    ring->cur, ring->next, ring->queued);
 		ring->queued--;
 		ring->next = (ring->next + 1) % URTWN_HOST_CMD_RING_COUNT;
+	}
 	mutex_spin_exit(&sc->sc_task_mtx);
 	wakeup(&sc->cmdq);
 	splx(s);
+}
 static void
 urtwn_do_async(struct urtwn_softc *sc, void (*cb)(struct urtwn_softc *, void *),
     void *arg, int len)
+{
 	struct urtwn_host_cmd_ring *ring = &sc->cmdq;
 	struct urtwn_host_cmd *cmd;
 	bool schedtask = false;
 	int s;
 	DPRINTFN(DBG_FN, ("%s: %s: cb=%p, arg=%p, len=%d\n",
 	    device_xname(sc->sc_dev), __func__, cb, arg, len));
 	s = splusb();
 	mutex_spin_enter(&sc->sc_task_mtx);
 	urtwn_cmdq_invariants(sc);
 	cmd = &ring->cmd[ring->cur];
 	cmd->cb = cb;
 	KASSERT(len <= sizeof(cmd->data));
 	memcpy(cmd->data, arg, len);
 	ring->cur = (ring->cur + 1) % URTWN_HOST_CMD_RING_COUNT;
-	/* If there is no pending command already, schedule a task. */
+	/*
-	if (!sc->sc_dying && ++ring->queued == 1) {
+	 * Schedule a task to process the command if need be.
-		mutex_spin_exit(&sc->sc_task_mtx);
+	 */
-		usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER);
+	if (!sc->sc_dying) {
-	} else
+		if (ring->queued == URTWN_HOST_CMD_RING_COUNT)
-		mutex_spin_exit(&sc->sc_task_mtx);
+			device_printf(sc->sc_dev, "command queue overflow\n");
 		else if (ring->queued++ == 0)
 			schedtask = true;
+	}
 	mutex_spin_exit(&sc->sc_task_mtx);
 	splx(s);
 	if (schedtask)
 		usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER);
+}
 static void
 urtwn_wait_async(struct urtwn_softc *sc)
+{
 	DPRINTFN(DBG_FN, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
 	/* Wait for all queued asynchronous commands to complete. */
 	while (sc->cmdq.queued > 0)
 		tsleep(&sc->cmdq, 0, "endtask", 0);
+}