Pull up following revision(s) (requested by jmcneill in ticket NetBSD#69):

	sys/dev/ic/bwi.c: revision 1.45
	sys/dev/ic/bwireg.h: revision 1.6
	sys/dev/ic/bwivar.h: revision 1.12

bwi: AMRR fix, PCI/cardbus interrupt fix, and other enhancements.
- Fix AMRR by passing the correct "retry count" to _bwi_txeof() from
  bwi_txeof(). While here, cleanup parsing of BWI_TXSTATUS_0 fields to
  make the code more readable.
- IPL_SOFTNET is enough for PIO locks and workqueues, no need for IPL_NET
- Extend the SDIO bus intr_mask fix to all busses, I'd be amazed if
  PCI or Cardbus devices worked at all with the old code.
- Since we only load firmware from disk once, only log the firmware
  revision once. Previously it was being printed every time bwi_init was
  called.

Author: MartinHusemann

sys/dev/ic/bwi.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bwi.c,v 1.43.2.1 2025/10/20 13:57:46 martin Exp $	*/
+/*	$NetBSD: bwi.c,v 1.43.2.2 2025/10/26 12:30:39 martin Exp $	*/
 /*	$OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.43.2.1 2025/10/20 13:57:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.43.2.2 2025/10/26 12:30:39 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -719,7 +719,8 @@ bwi_softintr(void *arg)
 	struct bwi_softc *sc = arg;
 	struct bwi_mac *mac;
 	struct ifnet *ifp = &sc->sc_if;
-	uint32_t intr_status, intr_mask;
+	const uint32_t intr_mask = BWI_INIT_INTRS;
+	uint32_t intr_status;
 	uint32_t txrx_intr_status[BWI_TXRX_NRING];
 	int i, s, txrx_error, tx = 0, rx_data = -1;
 
@@ -735,12 +736,6 @@ bwi_softintr(void *arg)
 		if (intr_status == 0xffffffff)	/* Not for us */
 			goto out;
 
-		if (BWI_IS_SDIO(sc)) {
-			intr_mask = 0xffffffff;
-		} else {
-			/* XXX FIXME */
-			intr_mask = CSR_READ_4(sc, BWI_MAC_INTR_MASK);
-		}
 		DPRINTF(sc, BWI_DBG_INTR,
 		    "intr status 0x%08x mask 0x%08x -> 0x%08x\n",
 		    intr_status, intr_mask, intr_status & intr_mask);
@@ -894,14 +889,14 @@ bwi_attach(struct bwi_softc *sc)
 	if (BWI_IS_SDIO(sc)) {
 		error = workqueue_create(&sc->sc_taskq,
 		    device_xname(sc->sc_dev), bwi_task, sc, PRI_NONE,
-		    IPL_NET, 0);
+		    IPL_SOFTNET, 0);
 		if (error != 0) {
 			device_printf(sc->sc_dev,
 			    "failed to create workqueue\n");
 			goto fail;
 		}
 		sc->sc_freetask = pool_cache_init(sizeof(struct bwi_task),
-		    0, 0, 0, "bwitask", NULL, IPL_NET, NULL, NULL, NULL);
+		    0, 0, 0, "bwitask", NULL, IPL_SOFTNET, NULL, NULL, NULL);
 		pool_cache_prime(sc->sc_freetask, BWI_TASK_COUNT);
 	} else {
 		sc->sc_soft_ih = softint_establish(SOFTINT_NET, bwi_softintr,
@@ -2142,9 +2137,12 @@ bwi_mac_fw_load(struct bwi_mac *mac)
 		return (ENODEV);
 	}
 
-	aprint_normal_dev(sc->sc_dev, "firmware rev 0x%04x,"
-	    " patch level 0x%04x\n", fw_rev,
-	    MOBJ_READ_2(mac, BWI_COMM_MOBJ, BWI_COMM_MOBJ_FWPATCHLV));
+	if (fw_rev != sc->sc_fw_rev) {
+		aprint_normal_dev(sc->sc_dev, "firmware rev 0x%04x,"
+		    " patch level 0x%04x\n", fw_rev,
+		    MOBJ_READ_2(mac, BWI_COMM_MOBJ, BWI_COMM_MOBJ_FWPATCHLV));
+		sc->sc_fw_rev = fw_rev;
+	}
 
 	return (0);
 }
@@ -7596,7 +7594,8 @@ bwi_start(struct ifnet *ifp)
 		tbd->tbd_used++;
 		idx = (idx + 1) % BWI_TX_NDESC;
 
-		if (tbd->tbd_used + BWI_TX_NSPRDESC >= BWI_TX_NDESC) {
+		if (tbd->tbd_used + BWI_TX_NSPRDESC >=
+		    (BWI_IS_SDIO(sc) ? 32 : BWI_TX_NDESC)) {
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
 		}
@@ -8057,7 +8056,7 @@ bwi_pio_alloc(struct bwi_softc *sc)
 		sc->sc_txeof_status = bwi_txeof_status_pio;
 	}
 
-	mutex_init(&sc->sc_pio_txlock, MUTEX_DEFAULT, IPL_NET);
+	mutex_init(&sc->sc_pio_txlock, MUTEX_DEFAULT, IPL_SOFTNET);
 	STAILQ_INIT(&sc->sc_pio_txpend);
 
 	sc->sc_pio_fifolen = 2000 - 80;
@@ -10017,22 +10016,28 @@ bwi_txeof(struct bwi_softc *sc)
 
 	for (;;) {
 		uint32_t tx_status0;
-		uint16_t tx_id, tx_info;
+		uint16_t tx_id;
+		uint8_t tx_cnt;
 
 		tx_status0 = CSR_READ_4(sc, BWI_TXSTATUS_0);
 		if ((tx_status0 & BWI_TXSTATUS_0_MORE) == 0)
 			break;
 		(void)CSR_READ_4(sc, BWI_TXSTATUS_1);
 
 		tx_id = __SHIFTOUT(tx_status0, BWI_TXSTATUS_0_TXID_MASK);
-		tx_info = BWI_TXSTATUS_0_INFO(tx_status0);
+		tx_cnt = __SHIFTOUT(tx_status0, BWI_TXSTATUS_0_DATA_TXCNT_MASK);
 
-		if (tx_info & 0x30) /* XXX */
+		if ((tx_status0 &
+		     (BWI_TXSTATUS_0_PENDING | BWI_TXSTATUS_0_AMPDU)) != 0) {
 			continue;
+		}
 
-		_bwi_txeof(sc, tx_id, (tx_info >> 8) & 0xf);
+		_bwi_txeof(sc, tx_id, tx_cnt != 1);
 
 		if_statinc(ifp, if_opackets);
+		if (tx_cnt == 0) {
+			if_statinc(ifp, if_oerrors);
+		}
 	}
 
 	if ((ifp->if_flags & IFF_OACTIVE) == 0)

sys/dev/ic/bwireg.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bwireg.h,v 1.5 2025/01/19 00:29:28 jmcneill Exp $	*/
+/*	$NetBSD: bwireg.h,v 1.5.2.1 2025/10/26 12:30:39 martin Exp $	*/
 /*	$OpenBSD: bwireg.h,v 1.7 2007/11/17 16:50:02 mglocker Exp $	*/
 
 /*
@@ -251,7 +251,9 @@
 #define BWI_TXSTATUS_0			0x00000170
 #define BWI_TXSTATUS_0_MORE		(1 << 0)
 #define BWI_TXSTATUS_0_TXID_MASK	0xffff0000
-#define BWI_TXSTATUS_0_INFO(st)		(((st) & 0xfff0) | (((st) & 0xf) >> 1))
+#define BWI_TXSTATUS_0_DATA_TXCNT_MASK	0x0000f000
+#define BWI_TXSTATUS_0_PENDING		0x00000040
+#define BWI_TXSTATUS_0_AMPDU		0x00000020
 #define BWI_TXSTATUS_1			0x00000174
 
 #define BWI_TXRX_CTRL_BASE		0x200

sys/dev/ic/bwivar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bwivar.h,v 1.11 2025/01/19 00:29:28 jmcneill Exp $	*/
+/*	$NetBSD: bwivar.h,v 1.11.2.1 2025/10/26 12:30:39 martin Exp $	*/
 /*	$OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $	*/
 
 /*
@@ -690,6 +690,9 @@ struct bwi_softc {
 	int			 sc_txpwr_calib;
 	int			 sc_debug;	/* BWI_DBG_ */
 
+	/* Firmware info */
+	uint16_t		 sc_fw_rev; /* Last firmware revision */
+
 	struct bpf_if		*sc_drvbpf;
 
 	union {