 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cnmac.c,v 1.24 2020/06/23 05:17:13 simonb Exp $	*/
+/*	$NetBSD: if_cnmac.c,v 1.25 2021/05/27 01:43:32 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.24 2020/06/23 05:17:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.25 2021/05/27 01:43:32 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>
 @@ -268,27 +268,30 @@ cnmac_attach(device_t parent, device_t s
+	}
 	cnmac_board_mac_addr(enaddr, sizeof(enaddr), sc);
 	printf("%s: Ethernet address %s\n", device_xname(self),
 	    ether_sprintf(enaddr));
 	SIMPLEQ_INIT(&sc->sc_sendq);
 	sc->sc_soft_req_thresh = 15/* XXX */;
 	sc->sc_ext_callback_cnt = 0;
 	octgmx_stats_init(sc->sc_gmx_port);
 	callout_init(&sc->sc_tick_misc_ch, 0);
 	callout_setfunc(&sc->sc_tick_misc_ch, cnmac_tick_misc, sc);
 	callout_init(&sc->sc_tick_free_ch, 0);
 	callout_setfunc(&sc->sc_tick_free_ch, cnmac_tick_free, sc);
 	const int dv_unit = device_unit(self);
 	octfau_op_init(&sc->sc_fau_done,
 	    OCTEON_CVMSEG_ETHER_OFFSET(dv_unit, csm_ether_fau_done),
 	    OCT_FAU_REG_ADDR_END - (8 * (dv_unit + 1))/* XXX */);
 	octfau_op_set_8(&sc->sc_fau_done, 0);
 	cnmac_pip_init(sc);
 	cnmac_ipd_init(sc);
 	cnmac_pko_init(sc);
 	cnmac_configure_common(sc);
 @@ -988,26 +991,27 @@ cnmac_start(struct ifnet *ifp)
 		/* XXX XXX XXX */
 		cnmac_send_queue_flush_fetch(sc);
 		/*
 		 * If no free send buffer is available, free all the sent
 		 * buffers and bail out.
 		 */
 		if (cnmac_send_queue_is_full(sc)) {
 			SET(ifp->if_flags, IFF_OACTIVE);
 			if (wdc > 0)
 				octpko_op_doorbell_write(sc->sc_port,
 				    sc->sc_port, wdc);
 			callout_schedule(&sc->sc_tick_free_ch, 1);
 			return;
+		}
 		/* XXX XXX XXX */
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		/* XXX XXX XXX */
 		if (sc->sc_soft_req_cnt > sc->sc_soft_req_thresh)
 			cnmac_send_queue_flush(sc);
 		if (cnmac_send(sc, m, &wdc)) {
 			IF_DROP(&ifp->if_snd);
 @@ -1021,26 +1025,27 @@ cnmac_start(struct ifnet *ifp)
 		if (sc->sc_flush)
 			cnmac_send_queue_flush_sync(sc);
 		/* XXX XXX XXX */
 		/* Send next iobdma request */
 		cnmac_send_queue_flush_prefetch(sc);
+	}
 	if (wdc > 0)
 		octpko_op_doorbell_write(sc->sc_port, sc->sc_port, wdc);
 last:
 	cnmac_send_queue_flush_fetch(sc);
 	callout_schedule(&sc->sc_tick_free_ch, 1);
+}
 static void
 cnmac_watchdog(struct ifnet *ifp)
+{
 	struct cnmac_softc *sc = ifp->if_softc;
 	printf("%s: device timeout\n", device_xname(sc->sc_dev));
 	cnmac_configure(sc);
 	SET(ifp->if_flags, IFF_RUNNING);
 	CLR(ifp->if_flags, IFF_OACTIVE);
 @@ -1063,51 +1068,50 @@ cnmac_init(struct ifnet *ifp)
 		cnmac_configure(sc);
 		octpko_enable(sc->sc_pko);
 		octipd_enable(sc->sc_ipd);
 		sc->sc_init_flag = 1;
 	} else {
 		octgmx_port_enable(sc->sc_gmx_port, 1);
+	}
 	mii_ifmedia_change(&sc->sc_mii);
 	octgmx_set_filter(sc->sc_gmx_port);
-	callout_reset(&sc->sc_tick_misc_ch, hz, cnmac_tick_misc, sc);
+	callout_schedule(&sc->sc_tick_misc_ch, hz);
-	callout_reset(&sc->sc_tick_free_ch, hz, cnmac_tick_free, sc);
+	callout_schedule(&sc->sc_tick_free_ch, hz);
 	SET(ifp->if_flags, IFF_RUNNING);
 	CLR(ifp->if_flags, IFF_OACTIVE);
 	return 0;
+}
 static void
 cnmac_stop(struct ifnet *ifp, int disable)
+{
 	struct cnmac_softc *sc = ifp->if_softc;
 	callout_stop(&sc->sc_tick_misc_ch);
 	callout_stop(&sc->sc_tick_free_ch);
 	mii_down(&sc->sc_mii);
 	octgmx_port_enable(sc->sc_gmx_port, 0);
 	/* Mark the interface as down and cancel the watchdog timer. */
 	CLR(ifp->if_flags, IFF_RUNNING | IFF_OACTIVE);
 	ifp->if_timer = 0;
+}
 /* ---- misc */
 static int
 cnmac_reset(struct cnmac_softc *sc)
+{
 	octgmx_reset_speed(sc->sc_gmx_port);
 	octgmx_reset_flowctl(sc->sc_gmx_port);
 	octgmx_reset_timing(sc->sc_gmx_port);
 	return 0;
+}
 @@ -1324,33 +1328,28 @@ cnmac_tick_free(void *arg)
 	int timo;
 	int s;
 	s = splnet();
 	/* 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 */
-	/* XXX XXX XXX */
+	timo = (sc->sc_ext_callback_cnt > 0) ? 1 : hz;
 	/* ??? */
 	timo = hz - (100 * sc->sc_ext_callback_cnt);
 	if (timo < 10)
 		 timo = 10;
 	callout_schedule(&sc->sc_tick_free_ch, timo);
 	/* XXX XXX XXX */
 	splx(s);
+}
 /*
  * cnmac_tick_misc
+ *
  * => collect statistics
  * => check link status
  * => called at softclock
  */
 static void
 cnmac_tick_misc(void *arg)
+{