 @@ -1,37 +1,37 @@
-/*	$NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $	*/
+/*	$NetBSD: if_nfe.c,v 1.53 2010/11/03 14:03:40 jakllsch Exp $	*/
 /*	$OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $	*/
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2005, 2006 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.53 2010/11/03 14:03:40 jakllsch Exp $");
 #include "opt_inet.h"
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 @@ -65,26 +65,27 @@ __KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1
 #include <dev/mii/miivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/if_nfereg.h>
 #include <dev/pci/if_nfevar.h>
 static int nfe_ifflags_cb(struct ethercom *);
 int	nfe_match(device_t, cfdata_t, void *);
 void	nfe_attach(device_t, device_t, void *);
 int	nfe_detach(device_t, int);
 void	nfe_power(int, void *);
 void	nfe_miibus_statchg(device_t);
 int	nfe_miibus_readreg(device_t, int, int);
 void	nfe_miibus_writereg(device_t, int, int, int);
 int	nfe_intr(void *);
 int	nfe_ioctl(struct ifnet *, u_long, void *);
 void	nfe_txdesc32_sync(struct nfe_softc *, struct nfe_desc32 *, int);
 void	nfe_txdesc64_sync(struct nfe_softc *, struct nfe_desc64 *, int);
 void	nfe_txdesc32_rsync(struct nfe_softc *, int, int, int);
 void	nfe_txdesc64_rsync(struct nfe_softc *, int, int, int);
 void	nfe_rxdesc32_sync(struct nfe_softc *, struct nfe_desc32 *, int);
 void	nfe_rxdesc64_sync(struct nfe_softc *, struct nfe_desc64 *, int);
 void	nfe_rxeof(struct nfe_softc *);
 @@ -101,28 +102,28 @@ void	nfe_jpool_free(struct nfe_softc *);
 int	nfe_alloc_rx_ring(struct nfe_softc *, struct nfe_rx_ring *);
 void	nfe_reset_rx_ring(struct nfe_softc *, struct nfe_rx_ring *);
 void	nfe_free_rx_ring(struct nfe_softc *, struct nfe_rx_ring *);
 int	nfe_alloc_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
 void	nfe_reset_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
 void	nfe_free_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
 void	nfe_setmulti(struct nfe_softc *);
 void	nfe_get_macaddr(struct nfe_softc *, uint8_t *);
 void	nfe_set_macaddr(struct nfe_softc *, const uint8_t *);
 void	nfe_tick(void *);
 void	nfe_poweron(device_t);
 bool	nfe_resume(device_t, const pmf_qual_t *);
-CFATTACH_DECL_NEW(nfe, sizeof(struct nfe_softc), nfe_match, nfe_attach,
+CFATTACH_DECL_NEW(nfe, sizeof(struct nfe_softc),
-    NULL, NULL);
+    nfe_match, nfe_attach, nfe_detach, NULL);
 /* #define NFE_NO_JUMBO */
 #ifdef NFE_DEBUG
 int nfedebug = 0;
 #define DPRINTF(x)	do { if (nfedebug) printf x; } while (0)
 #define DPRINTFN(n,x)	do { if (nfedebug >= (n)) printf x; } while (0)
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 /* deal with naming differences */
 @@ -208,41 +209,41 @@ nfe_match(device_t dev, cfdata_t match,
+	}
 	return 0;
+}
 void
 nfe_attach(device_t parent, device_t self, void *aux)
+{
 	struct nfe_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	struct ifnet *ifp;
 	bus_size_t memsize;
 	pcireg_t memtype, csr;
 	char devinfo[256];
 	int mii_flags = 0;
 	sc->sc_dev = self;
 	sc->sc_pc = pa->pa_pc;
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NFE_PCI_BA);
 	switch (memtype) {
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
 	case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
 		if (pci_mapreg_map(pa, NFE_PCI_BA, memtype, 0, &sc->sc_memt,
-		    &sc->sc_memh, NULL, &memsize) == 0)
+		    &sc->sc_memh, NULL, &sc->sc_mems) == 0)
 			break;
 		/* FALLTHROUGH */
 	default:
 		aprint_error_dev(self, "could not map mem space\n");
 		return;
+	}
 	if (pci_intr_map(pa, &ih) != 0) {
 		aprint_error_dev(self, "could not map interrupt\n");
 		goto fail;
+	}
 	intrstr = pci_intr_string(pc, ih);
 @@ -415,28 +416,76 @@ nfe_attach(device_t parent, device_t sel
 	if (pmf_device_register(self, NULL, nfe_resume))
 		pmf_class_network_register(self, ifp);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	return;
 fail:
 	if (sc->sc_ih != NULL) {
 		pci_intr_disestablish(pc, sc->sc_ih);
 		sc->sc_ih = NULL;
+	}
-	if (memsize)
+	if (sc->sc_mems != 0) {
-		bus_space_unmap(sc->sc_memt, sc->sc_memh, memsize);
+		bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_mems);
 		sc->sc_mems = 0;
+	}
+}
 int
 nfe_detach(device_t self, int flags)
+{
 	struct nfe_softc *sc = device_private(self);
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	int s;
 	s = splnet();
 	nfe_stop(ifp, 1);
 	pmf_device_deregister(self);
 	callout_destroy(&sc->sc_tick_ch);
 	ether_ifdetach(ifp);
 	if_detach(ifp);
 	mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
 	nfe_free_rx_ring(sc, &sc->rxq);
 	mutex_destroy(&sc->rxq.mtx);
 	nfe_free_tx_ring(sc, &sc->txq);
 	if (sc->sc_ih != NULL) {
 		pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
 		sc->sc_ih = NULL;
+	}
 	if ((sc->sc_flags & NFE_CORRECT_MACADDR) != 0) {
 		nfe_set_macaddr(sc, sc->sc_enaddr);
 	} else {
 		NFE_WRITE(sc, NFE_MACADDR_LO,
 		    sc->sc_enaddr[0] <<  8 | sc->sc_enaddr[1]);
 		NFE_WRITE(sc, NFE_MACADDR_HI,
 		    sc->sc_enaddr[2] << 24 | sc->sc_enaddr[3] << 16 |
 		    sc->sc_enaddr[4] <<  8 | sc->sc_enaddr[5]);
+	}
 	if (sc->sc_mems != 0) {
 		bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_mems);
 		sc->sc_mems = 0;
+	}
 	splx(s);
 	return 0;
+}
 void
 nfe_miibus_statchg(device_t dev)
+{
 	struct nfe_softc *sc = device_private(dev);
 	struct mii_data *mii = &sc->sc_mii;
 	uint32_t phy, seed, misc = NFE_MISC1_MAGIC, link = NFE_MEDIA_SET;
 	phy = NFE_READ(sc, NFE_PHY_IFACE);
 	phy &= ~(NFE_PHY_HDX | NFE_PHY_100TX | NFE_PHY_1000T);
 	seed = NFE_READ(sc, NFE_RNDSEED);
 @@ -1530,26 +1579,28 @@ nfe_free_rx_ring(struct nfe_softc *sc, s
 	for (i = 0; i < NFE_RX_RING_COUNT; i++) {
 		data = &ring->data[i];
 		if (data->map != NULL) {
 			bus_dmamap_sync(sc->sc_dmat, data->map, 0,
 			    data->map->dm_mapsize, BUS_DMASYNC_POSTREAD);
 			bus_dmamap_unload(sc->sc_dmat, data->map);
 			bus_dmamap_destroy(sc->sc_dmat, data->map);
+		}
 		if (data->m != NULL)
 			m_freem(data->m);
+	}
 	nfe_jpool_free(sc);
+}
 struct nfe_jbuf *
 nfe_jalloc(struct nfe_softc *sc, int i)
+{
 	struct nfe_jbuf *jbuf;
 	mutex_enter(&sc->rxq.mtx);
 	jbuf = SLIST_FIRST(&sc->rxq.jfreelist);
 	if (jbuf != NULL)
 		SLIST_REMOVE_HEAD(&sc->rxq.jfreelist, jnext);
 	mutex_exit(&sc->rxq.mtx);
 	if (jbuf == NULL)
 @@ -1657,30 +1708,32 @@ fail:	nfe_jpool_free(sc);
 	return error;
+}
 void
 nfe_jpool_free(struct nfe_softc *sc)
+{
 	struct nfe_rx_ring *ring = &sc->rxq;
 	if (ring->jmap != NULL) {
 		bus_dmamap_sync(sc->sc_dmat, ring->jmap, 0,
 		    ring->jmap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, ring->jmap);
 		bus_dmamap_destroy(sc->sc_dmat, ring->jmap);
 		ring->jmap = NULL;
+	}
 	if (ring->jpool != NULL) {
 		bus_dmamem_unmap(sc->sc_dmat, ring->jpool, NFE_JPOOL_SIZE);
 		bus_dmamem_free(sc->sc_dmat, &ring->jseg, 1);
 		ring->jpool = NULL;
+	}
+}
 int
 nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
+{
 	int i, nsegs, error;
 	void **desc;
 	int descsize;
 	if (sc->sc_flags & NFE_40BIT_ADDR) {
 		desc = (void **)&ring->desc64;
 		descsize = sizeof (struct nfe_desc64);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_nfevar.h,v 1.9 2008/04/20 08:57:37 cube Exp $	*/
+/*	$NetBSD: if_nfevar.h,v 1.10 2010/11/03 14:03:40 jakllsch Exp $	*/
 /*	$OpenBSD: if_nfevar.h,v 1.13 2007/12/05 08:30:33 jsg Exp $	*/
 /*-
  * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -61,28 +61,30 @@ struct nfe_rx_ring {
 	struct nfe_jbuf		jbuf[NFE_JPOOL_COUNT];
 	int			jbufmap[NFE_RX_RING_COUNT];
 	SLIST_HEAD(, nfe_jbuf)	jfreelist;
 	int			bufsz;
 	int			cur;
 	int			next;
 	kmutex_t		mtx;
 };
 struct nfe_softc {
 	device_t		sc_dev;
 	struct ethercom		sc_ethercom;
 	uint8_t			sc_enaddr[ETHER_ADDR_LEN];
 	pci_chipset_tag_t	sc_pc;
 	bus_space_handle_t	sc_memh;
 	bus_space_tag_t		sc_memt;
 	bus_size_t		sc_mems;
 	void			*sc_ih;
 	bus_dma_tag_t		sc_dmat;
 	struct mii_data		sc_mii;
 	struct callout		sc_tick_ch;
 	int			sc_if_flags;
 	u_int			sc_flags;
 #define NFE_JUMBO_SUP		0x01
 #define NFE_40BIT_ADDR		0x02
 #define NFE_HW_CSUM		0x04
 #define NFE_HW_VLAN		0x08
 #define NFE_USE_JUMBO		0x10
 #define NFE_CORRECT_MACADDR	0x20