 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cnmac.c,v 1.25 2021/05/27 01:43:32 simonb Exp $	*/
+/*	$NetBSD: if_cnmac.c,v 1.26 2021/05/27 03:23:29 simonb Exp $	*/
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
  * 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, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.25 2021/05/27 01:43:32 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.26 2021/05/27 03:23:29 simonb Exp $");
 /*
  * If no free send buffer is available, free all the sent buffers and bail out.
  */
 #define CNMAC_SEND_QUEUE_CHECK
 /* XXX XXX XXX XXX XXX XXX */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/pool.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 @@ -112,26 +112,27 @@ static void	cnmac_pko_init(struct cnmac_
 static void	cnmac_board_mac_addr(uint8_t *, size_t, struct cnmac_softc *);
 static int	cnmac_mii_readreg(device_t, int, int, uint16_t *);
 static int	cnmac_mii_writereg(device_t, int, int, uint16_t);
 static void	cnmac_mii_statchg(struct ifnet *);
 static int	cnmac_mediainit(struct cnmac_softc *);
 static void	cnmac_mediastatus(struct ifnet *, struct ifmediareq *);
 static inline void cnmac_send_queue_flush_prefetch(struct cnmac_softc *);
 static inline void cnmac_send_queue_flush_fetch(struct cnmac_softc *);
 static inline void cnmac_send_queue_flush(struct cnmac_softc *);
 static inline void cnmac_send_queue_flush_sync(struct cnmac_softc *);
 static void cnmac_send_queue_check_and_flush(struct cnmac_softc *);
 static inline int cnmac_send_queue_is_full(struct cnmac_softc *);
 static inline void cnmac_send_queue_add(struct cnmac_softc *, struct mbuf *,
     uint64_t *);
 static inline void cnmac_send_queue_del(struct cnmac_softc *, struct mbuf **,
     uint64_t **);
 static inline int cnmac_buf_free_work(struct cnmac_softc *, uint64_t *);
 static inline void cnmac_buf_ext_free(struct mbuf *, void *, size_t, void *);
 static int	cnmac_ioctl(struct ifnet *, u_long, void *);
 static void	cnmac_watchdog(struct ifnet *);
 static int	cnmac_init(struct ifnet *);
 static void	cnmac_stop(struct ifnet *, int);
 static void	cnmac_start(struct ifnet *);
 @@ -594,26 +595,43 @@ cnmac_send_queue_is_full(struct cnmac_so
 	nofree_cnt = sc->sc_soft_req_cnt + sc->sc_hard_done_cnt;
 	if (__predict_false(nofree_cnt == GATHER_QUEUE_SIZE - 1)) {
 		cnmac_send_queue_flush(sc);
 		cnmac_send_queue_flush_sync(sc);
 		return 1;
+	}
 #endif
 	return 0;
+}
 static void
 cnmac_send_queue_check_and_flush(struct cnmac_softc *sc)
+{
 	int s;
 	/* XXX XXX XXX */
 	s = splnet();
 	if (sc->sc_soft_req_cnt > 0) {
 		cnmac_send_queue_flush_prefetch(sc);
 		cnmac_send_queue_flush_fetch(sc);
 		cnmac_send_queue_flush(sc);
 		cnmac_send_queue_flush_sync(sc);
+	}
 	splx(s);
 	/* XXX XXX XXX */
+}
 /*
  * (Ab)use m_nextpkt and m_paddr to maintain mbuf chain and pointer to gather
  * buffer.  Other mbuf members may be used by m_freem(), so don't touch them!
  */
 struct _send_queue_entry {
 	union {
 		struct mbuf _sqe_s_mbuf;
 		struct {
 			char _sqe_s_entry_pad[offsetof(struct mbuf, m_nextpkt)];
 			SIMPLEQ_ENTRY(_send_queue_entry) _sqe_s_entry_entry;
 		} _sqe_s_entry;
 		struct {
 @@ -1289,26 +1307,28 @@ cnmac_intr(void *arg)
 		octpow_tag_sw_wait();
 		octpow_work_request_async(OCTEON_CVMSEG_OFFSET(csm_pow_intr),
 		    POW_NO_WAIT);
 		port = __SHIFTOUT(work[1], PIP_WQE_WORD1_IPRT);
 		if (port != sc->sc_port) {
 			printf("%s: unexpected wqe port %u, should be %u\n",
 			    device_xname(sc->sc_dev), port, sc->sc_port);
 			goto wqe_error;
+		}
 		(void)cnmac_recv(sc, work);
 		cnmac_send_queue_check_and_flush(sc);
+	}
 	_POW_WR8(sc->sc_pow, POW_WQ_INT_OFFSET, wqmask);
 	return 1;
 wqe_error:
 	printf("word0: 0x%016" PRIx64 "\n", work[0]);
 	printf("word1: 0x%016" PRIx64 "\n", work[1]);
 	printf("word2: 0x%016" PRIx64 "\n", work[2]);
 	printf("word3: 0x%016" PRIx64 "\n", work[3]);
 	panic("wqe_error");
+}
 @@ -1316,41 +1336,31 @@ wqe_error:
 /* ---- tick */
 /*
  * cnmac_tick_free
+ *
  * => garbage collect send gather buffer / mbuf
  * => called at softclock
  */
 static void
 cnmac_tick_free(void *arg)
+{
 	struct cnmac_softc *sc = arg;
 	int timo;
 	int s;
-	s = splnet();
+	cnmac_send_queue_check_and_flush(sc);
 	/* XXX XXX XXX */
 	if (sc->sc_soft_req_cnt > 0) {
 		cnmac_send_queue_flush_prefetch(sc);
 		cnmac_send_queue_flush_fetch(sc);
 		cnmac_send_queue_flush(sc);
 		cnmac_send_queue_flush_sync(sc);
 	/* XXX XXX XXX */
 	timo = (sc->sc_ext_callback_cnt > 0) ? 1 : hz;
 	callout_schedule(&sc->sc_tick_free_ch, timo);
 	splx(s);
+}
 /*
  * cnmac_tick_misc
+ *
  * => collect statistics
  * => check link status
  * => called at softclock
  */
 static void
 cnmac_tick_misc(void *arg)
+{
 	struct cnmac_softc *sc = arg;