 @@ -1,14 +1,14 @@
-/*	$NetBSD: be.c,v 1.94 2019/05/29 10:07:30 msaitoh Exp $	*/
+/*	$NetBSD: be.c,v 1.95 2020/01/29 05:59:06 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -47,27 +47,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND 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 AUTHORS 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: be.c,v 1.94 2019/05/29 10:07:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.95 2020/01/29 05:59:06 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 @@ -540,36 +540,36 @@ be_get(struct be_softc *sc, int idx, int
 static inline void
 be_read(struct be_softc *sc, int idx, int len)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mbuf *m;
 	if (len <= sizeof(struct ether_header) ||
 	    len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) {
 #ifdef BEDEBUG
 		if (sc->sc_debug)
 			printf("%s: invalid packet size %d; dropping\n",
 			    ifp->if_xname, len);
 #endif
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/*
 	 * Pull packet off interface.
 	 */
 	m = be_get(sc, idx, len);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Pass the packet up. */
 	if_percpuq_enqueue(ifp->if_percpuq, m);
+}
 /*
  * Start output on interface.
  * We make two assumptions here:
  *  1) that the current priority is set to splnet _before_ this code
  *     is called *and* is returned to the appropriate priority after
  *     return
 @@ -676,27 +676,27 @@ bereset(struct be_softc *sc)
 	s = splnet();
 	behwreset(sc);
 	if ((sc->sc_ethercom.ec_if.if_flags & IFF_UP) != 0)
 		beinit(ifp);
 	splx(s);
+}
 void
 bewatchdog(struct ifnet *ifp)
+{
 	struct be_softc *sc = ifp->if_softc;
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	++sc->sc_ethercom.ec_if.if_oerrors;
+	if_statinc(ifp, if_oerrors);
 	bereset(sc);
+}
 int
 beintr(void *arg)
+{
 	struct be_softc *sc = arg;
 	bus_space_tag_t t = sc->sc_bustag;
 	uint32_t whyq, whyb, whyc;
 	int r = 0;
 	/* Read QEC status, channel status and BE status */
 @@ -840,53 +840,53 @@ beeint(struct be_softc *sc, uint32_t why
  * Transmit interrupt.
  */
 int
 betint(struct be_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	bus_space_tag_t t = sc->sc_bustag;
 	bus_space_handle_t br = sc->sc_br;
 	unsigned int bix, txflags;
 	/*
 	 * Unload collision counters
 	 */
-	ifp->if_collisions +=
+	if_statadd(ifp, if_collisions,
 	    bus_space_read_4(t, br, BE_BRI_NCCNT) +
 	    bus_space_read_4(t, br, BE_BRI_FCCNT) +
 	    bus_space_read_4(t, br, BE_BRI_EXCNT) +
-	    bus_space_read_4(t, br, BE_BRI_LTCNT);
+	    bus_space_read_4(t, br, BE_BRI_LTCNT));
 	/*
 	 * the clear the hardware counters
 	 */
 	bus_space_write_4(t, br, BE_BRI_NCCNT, 0);
 	bus_space_write_4(t, br, BE_BRI_FCCNT, 0);
 	bus_space_write_4(t, br, BE_BRI_EXCNT, 0);
 	bus_space_write_4(t, br, BE_BRI_LTCNT, 0);
 	bix = sc->sc_rb.rb_tdtail;
 	for (;;) {
 		if (sc->sc_rb.rb_td_nbusy <= 0)
 			break;
 		txflags = sc->sc_rb.rb_txd[bix].xd_flags;
 		if (txflags & QEC_XD_OWN)
 			break;
 		ifp->if_flags &= ~IFF_OACTIVE;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		if (++bix == QEC_XD_RING_MAXSIZE)
 			bix = 0;
 		--sc->sc_rb.rb_td_nbusy;
+	}
 	sc->sc_rb.rb_tdtail = bix;
 	bestart(ifp);
 	if (sc->sc_rb.rb_td_nbusy == 0)
 		ifp->if_timer = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: qe.c,v 1.75 2019/05/29 10:07:30 msaitoh Exp $	*/
+/*	$NetBSD: qe.c,v 1.76 2020/01/29 05:59:06 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -56,27 +56,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Driver for the SBus qec+qe QuadEthernet board.
+ *
  * This driver was written using the AMD MACE Am79C940 documentation, some
  * ideas gleaned from the S/Linux driver for this card, Solaris header files,
  * and a loan of a card from Paul Southworth of the Internet Engineering
  * Group (www.ieng.com).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.75 2019/05/29 10:07:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.76 2020/01/29 05:59:06 thorpej Exp $");
 #define QEDEBUG
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -396,36 +396,36 @@ qe_put(struct qe_softc *sc, int idx, str
  */
 inline void
 qe_read(struct qe_softc *sc, int idx, int len)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mbuf *m;
 	if (len <= sizeof(struct ether_header) ||
 	    len > ETHERMTU + sizeof(struct ether_header)) {
 		printf("%s: invalid packet size %d; dropping\n",
 			ifp->if_xname, len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/*
 	 * Pull packet off interface.
 	 */
 	m = qe_get(sc, idx, len);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Pass the packet up. */
 	if_percpuq_enqueue(ifp->if_percpuq, m);
+}
 /*
  * Start output on interface.
  * We make two assumptions here:
  *  1) that the current priority is set to splnet _before_ this code
  *     is called *and* is returned to the appropriate priority after
  *     return
 @@ -522,27 +522,27 @@ qereset(struct qe_softc *sc)
 	s = splnet();
 	qestop(sc);
 	qeinit(sc);
 	splx(s);
+}
 void
 qewatchdog(struct ifnet *ifp)
+{
 	struct qe_softc *sc = ifp->if_softc;
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	qereset(sc);
+}
 /*
  * Interrupt dispatch.
  */
 int
 qeintr(void *arg)
+{
 	struct qe_softc *sc = arg;
 	bus_space_tag_t t = sc->sc_bustag;
 	uint32_t qecstat, qestat;
 @@ -617,27 +617,27 @@ qe_tint(struct qe_softc *sc)
 	bix = sc->sc_rb.rb_tdtail;
 	for (;;) {
 		if (sc->sc_rb.rb_td_nbusy <= 0)
 			break;
 		txflags = sc->sc_rb.rb_txd[bix].xd_flags;
 		if (txflags & QEC_XD_OWN)
 			break;
 		ifp->if_flags &= ~IFF_OACTIVE;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		if (++bix == QEC_XD_RING_MAXSIZE)
 			bix = 0;
 		--sc->sc_rb.rb_td_nbusy;
+	}
 	sc->sc_rb.rb_tdtail = bix;
 	qestart(ifp);
 	if (sc->sc_rb.rb_td_nbusy == 0)
 		ifp->if_timer = 0;
 @@ -695,176 +695,180 @@ qe_rint(struct qe_softc *sc)
+}
 /*
  * Error interrupt.
  */
 int
 qe_eint(struct qe_softc *sc, uint32_t why)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	device_t self = sc->sc_dev;
 	const char *xname = device_xname(self);
 	int r = 0, rst = 0;
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	if (why & QE_CR_STAT_EDEFER) {
 		printf("%s: excessive tx defers.\n", xname);
 		r |= 1;
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
+	}
 	if (why & QE_CR_STAT_CLOSS) {
 		printf("%s: no carrier, link down?\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_ERETRIES) {
 		printf("%s: excessive tx retries\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_LCOLL) {
 		printf("%s: late tx transmission\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_FUFLOW) {
 		printf("%s: tx fifo underflow\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_JERROR) {
 		printf("%s: jabber seen\n", xname);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_BERROR) {
 		printf("%s: babble seen\n", xname);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_TCCOFLOW) {
-		ifp->if_collisions += 256;
+		if_statadd_ref(nsr, if_collisions, 256);
-		ifp->if_oerrors += 256;
+		if_statadd_ref(nsr, if_oerrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_TXDERROR) {
 		printf("%s: tx descriptor is bad\n", xname);
 		rst = 1;
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_TXLERR) {
 		printf("%s: tx late error\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		rst = 1;
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_TXPERR) {
 		printf("%s: tx DMA parity error\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		rst = 1;
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_TXSERR) {
 		printf("%s: tx DMA sbus error ack\n", xname);
-		ifp->if_oerrors++;
+		if_statinc_ref(nsr, if_oerrors);
 		rst = 1;
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RCCOFLOW) {
-		ifp->if_collisions += 256;
+		if_statadd_ref(nsr, if_collisions, 256);
-		ifp->if_ierrors += 256;
+		if_statadd_ref(nsr, if_ierrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RUOFLOW) {
-		ifp->if_ierrors += 256;
+		if_statadd_ref(nsr, if_ierrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_MCOFLOW) {
-		ifp->if_ierrors += 256;
+		if_statadd_ref(nsr, if_ierrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RXFOFLOW) {
 		printf("%s: rx fifo overflow\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RLCOLL) {
 		printf("%s: rx late collision\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
-		ifp->if_collisions++;
+		if_statinc_ref(nsr, if_collisions);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_FCOFLOW) {
-		ifp->if_ierrors += 256;
+		if_statadd_ref(nsr, if_ierrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_CECOFLOW) {
-		ifp->if_ierrors += 256;
+		if_statadd_ref(nsr, if_ierrors, 256);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RXDROP) {
 		printf("%s: rx packet dropped\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
+	}
 	if (why & QE_CR_STAT_RXSMALL) {
 		printf("%s: rx buffer too small\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_RXLERR) {
 		printf("%s: rx late error\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_RXPERR) {
 		printf("%s: rx DMA parity error\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
 		rst = 1;
+	}
 	if (why & QE_CR_STAT_RXSERR) {
 		printf("%s: rx DMA sbus error ack\n", xname);
-		ifp->if_ierrors++;
+		if_statinc_ref(nsr, if_ierrors);
 		r |= 1;
 		rst = 1;
+	}
 	IF_STAT_PUTREF(ifp);
 	if (r == 0)
 		aprint_error_dev(self, "unexpected interrupt error: %08x\n",
 			why);
 	if (rst) {
 		printf("%s: resetting...\n", xname);
 		qereset(sc);
 		return (-1);
+	}
 	return (r);
+}