 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_emac.c,v 1.53 2020/07/06 09:34:17 rin Exp $	*/
+/*	$NetBSD: if_emac.c,v 1.54 2021/01/24 05:22:21 rin Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge and Jason Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -42,41 +42,43 @@
  *            tested
  *            ------
  * 405EP	-  10/100 x2
  * 405EX/EXr	o  10/100/1000 x2 (EXr x1), STA v2, 256bit hash-Table, RGMII
  * 405GP/GPr	o  10/100
  * 440EP	-  10/100 x2, ZMII
  * 440GP	-  10/100 x2, ZMII
  * 440GX	-  10/100/1000 x4, ZMII/RGMII(ch 2, 3), TAH(ch 2, 3)
  * 440SP	-  10/100/1000
  * 440SPe	-  10/100/1000, STA v2
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.53 2020/07/06 09:34:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.54 2021/01/24 05:22:21 rin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_emac.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/rndsource.h>
 #include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <net/bpf.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dcr4xx.h>
 #include <powerpc/ibm4xx/mal405gp.h>
 #include <powerpc/ibm4xx/dev/emacreg.h>
 @@ -200,26 +202,28 @@ struct emac_softc {
 	struct evcnt sc_ev_txdrop;	/* Tx packets dropped (too many segs) */
 	struct evcnt sc_ev_tu;		/* Tx underrun */
 #endif /* EMAC_EVENT_COUNTERS */
 	int sc_txfree;			/* number of free Tx descriptors */
 	int sc_txnext;			/* next ready Tx descriptor */
 	int sc_txsfree;			/* number of free Tx jobs */
 	int sc_txsnext;			/* next ready Tx job */
 	int sc_txsdirty;		/* dirty Tx jobs */
 	int sc_rxptr;			/* next ready RX descriptor/descsoft */
 	krndsource_t rnd_source;	/* random source */
 	void (*sc_rmii_enable)(device_t, int);		/* reduced MII enable */
 	void (*sc_rmii_disable)(device_t, int);		/* reduced MII disable*/
 	void (*sc_rmii_speed)(device_t, int, int);	/* reduced MII speed */
 };
 #ifdef EMAC_EVENT_COUNTERS
 #define	EMAC_EVCNT_INCR(ev)	(ev)->ev_count++
 #else
 #define	EMAC_EVCNT_INCR(ev)	/* nothing */
 #endif
 #define	EMAC_CDTXADDR(sc, x)	((sc)->sc_cddma + EMAC_CDTXOFF((x)))
 #define	EMAC_CDRXADDR(sc, x)	((sc)->sc_cddma + EMAC_CDRXOFF((x)))
 @@ -545,26 +549,29 @@ emac_attach(device_t parent, device_t se
 	/*
 	 * We can support 802.1Q VLAN-sized frames.
 	 */
 	sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
 	/*
 	 * Attach the interface.
 	 */
 	if_attach(ifp);
 	if_deferred_start_init(ifp, NULL);
 	ether_ifattach(ifp, enaddr);
 	rnd_attach_source(&sc->rnd_source, xname, RND_TYPE_NET,
 	    RND_FLAG_DEFAULT);
 #ifdef EMAC_EVENT_COUNTERS
 	/*
 	 * Attach the event counters.
 	 */
 	evcnt_attach_dynamic(&sc->sc_ev_txintr, EVCNT_TYPE_INTR,
 	    NULL, xname, "txintr");
 	evcnt_attach_dynamic(&sc->sc_ev_rxintr, EVCNT_TYPE_INTR,
 	    NULL, xname, "rxintr");
 	evcnt_attach_dynamic(&sc->sc_ev_txde, EVCNT_TYPE_INTR,
 	    NULL, xname, "txde");
 	evcnt_attach_dynamic(&sc->sc_ev_rxde, EVCNT_TYPE_INTR,
 	    NULL, xname, "rxde");
 	evcnt_attach_dynamic(&sc->sc_ev_intr, EVCNT_TYPE_INTR,
 @@ -1244,33 +1251,34 @@ emac_set_filter(struct emac_softc *sc)
 	return 0;
+}
 /*
  * Reap completed Tx descriptors.
  */
 static int
 emac_txreap(struct emac_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct emac_txsoft *txs;
 	int handled, i;
-	uint32_t txstat;
+	uint32_t txstat, count;
 	EMAC_EVCNT_INCR(&sc->sc_ev_txreap);
 	handled = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	count = 0;
 	/*
 	 * Go through our Tx list and free mbufs for those
 	 * frames that have been transmitted.
 	 */
 	for (i = sc->sc_txsdirty; sc->sc_txsfree != EMAC_TXQUEUELEN;
 	    i = EMAC_NEXTTXS(i), sc->sc_txsfree++) {
 		txs = &sc->sc_txsoft[i];
 		EMAC_CDTXSYNC(sc, txs->txs_lastdesc,
 		    txs->txs_dmamap->dm_nsegs,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		txstat = sc->sc_txdescs[txs->txs_lastdesc].md_stat_ctrl;
 @@ -1307,38 +1315,43 @@ emac_txreap(struct emac_softc *sc)
 			if (txstat & EMAC_TXS_ED)
 				aprint_error_ifnet(ifp, "excessive deferral\n");
 			if (txstat & EMAC_TXS_EC)
 				aprint_error_ifnet(ifp,
 				    "excessive collisions\n");
+		}
 		sc->sc_txfree += txs->txs_ndesc;
 		bus_dmamap_sync(sc->sc_dmat, txs->txs_dmamap,
 , txs->txs_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, txs->txs_dmamap);
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
 		count++;
+	}
 	/* Update the dirty transmit buffer pointer. */
 	sc->sc_txsdirty = i;
 	/*
 	 * If there are no more pending transmissions, cancel the watchdog
 	 * timer.
 	 */
 	if (sc->sc_txsfree == EMAC_TXQUEUELEN)
 		ifp->if_timer = 0;
 	if (count != 0)
 		rnd_add_uint32(&sc->rnd_source, count);
 	return handled;
+}
 /*
  * Reset functions
  */
 static void
 emac_soft_reset(struct emac_softc *sc)
+{
 	uint32_t sdr;
 	int t = 0;
 @@ -1572,31 +1585,32 @@ emac_txeob_intr(void *arg)
 	/* try to get more packets going */
 	if_schedule_deferred_start(&sc->sc_ethercom.ec_if);
 	return handled;
+}
 int
 emac_rxeob_intr(void *arg)
+{
 	struct emac_softc *sc = arg;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct emac_rxsoft *rxs;
 	struct mbuf *m;
-	uint32_t rxstat;
+	uint32_t rxstat, count;
 	int i, len;
 	EMAC_EVCNT_INCR(&sc->sc_ev_rxintr);
 	count = 0;
 	for (i = sc->sc_rxptr; ; i = EMAC_NEXTRX(i)) {
 		rxs = &sc->sc_rxsoft[i];
 		EMAC_CDRXSYNC(sc, i,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		rxstat = sc->sc_rxdescs[i].md_stat_ctrl;
 		if (rxstat & MAL_RX_EMPTY) {
 			/*
 			 * We have processed all of the receive buffers.
 			 */
 			/* Flush current empty descriptor */
 @@ -1671,31 +1685,36 @@ emac_rxeob_intr(void *arg)
 				bus_dmamap_sync(sc->sc_dmat,
 				    rxs->rxs_dmamap, 0,
 				    rxs->rxs_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				continue;
+			}
+		}
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = len;
 		/* Pass it on. */
 		if_percpuq_enqueue(ifp->if_percpuq, m);
 		count++;
+	}
 	/* Update the receive pointer. */
 	sc->sc_rxptr = i;
 	if (count != 0)
 		rnd_add_uint32(&sc->rnd_source, count);
 	return 1;
+}
 int
 emac_txde_intr(void *arg)
+{
 	struct emac_softc *sc = arg;
 	EMAC_EVCNT_INCR(&sc->sc_ev_txde);
 	aprint_error_dev(sc->sc_dev, "emac_txde_intr\n");
 	return 1;
+}