Support for the MII on the D-Link DL10019/DL10022 NE2000-compatible Ethernet

chips; from NetBSD, with some required modifications by me.

4 files changed, 388 insertions, 1 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 54145804158..8a4bb09da49 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.192 2001/03/21 23:24:50 art Exp $
+#	$OpenBSD: files,v 1.193 2001/03/29 01:26:46 aaron Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -53,6 +53,7 @@ define	ncr53c7xx	# NCR 53c7xx SCSI Bus Controller
 define	pdq		# DEC FDDI chipset
 define	dp8390nic	# 8390-family Ethernet controllers
 define	rtl80x9		# RealTek 8019/8029 NE2000-compatible
+define	dl10019		# DL10019/10022-family Ethernet controllers
 
 # a wscons output device; used later, but needs to be near the top for
 # common file (e.g. vga) definitions.
@@ -190,6 +191,9 @@ file	dev/ic/smc91cxx.c	sm
 device	ne: ether, ifnet, dp8390nic, ifmedia
 file	dev/ic/ne2000.c		ne
 
+# D-Link DL10019/10022 NE2000-compatible network interface subroutines
+file	dev/ic/dl10019.c	dl10019
+
 # Intel i82596/i82586 Ethernet Controller
 device	ie: ether, ifnet, ifmedia
 file	dev/ic/i82596.c		ie & (ie_pci | ie_eisa | ie_gsc)
diff --git a/sys/dev/ic/dl10019.c b/sys/dev/ic/dl10019.c
new file mode 100644
index 00000000000..1983c3ed13b
--- /dev/null
+++ b/sys/dev/ic/dl10019.c
@@ -0,0 +1,261 @@
+/*	$OpenBSD: dl10019.c,v 1.1 2001/03/29 01:26:47 aaron Exp $	*/
+/*	$NetBSD$	*/
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION 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/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <net/if_media.h>
+
+#ifdef INET
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
+#endif
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/mii/miivar.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/mii_bitbang.h>
+
+#include <dev/ic/dp8390reg.h>
+#include <dev/ic/dp8390var.h>
+
+#include <dev/ic/ne2000reg.h>
+#include <dev/ic/ne2000var.h>
+
+#include <dev/ic/dl10019reg.h>
+#include <dev/ic/dl10019var.h>
+
+int	dl10019_mii_readreg(struct device *, int, int);
+void	dl10019_mii_writereg(struct device *, int, int, int);
+void	dl10019_mii_statchg(struct device *);
+
+void	dl10019_mii_reset(struct dp8390_softc *);
+
+/*
+ * MII bit-bang glue.
+ */
+u_int32_t dl10019_mii_bitbang_read(struct device *);
+void dl10019_mii_bitbang_write(struct device *, u_int32_t);
+
+const struct mii_bitbang_ops dl10019_mii_bitbang_ops = {
+	dl10019_mii_bitbang_read,
+	dl10019_mii_bitbang_write,
+	{
+		DL0_GPIO_MII_DATAOUT,	/* MII_BIT_MDO */
+		DL0_GPIO_MII_DATAIN,	/* MII_BIT_MDI */
+		DL0_GPIO_MII_CLK,	/* MII_BIT_MDC */
+		DL0_19_GPIO_MII_DIROUT,	/* MII_BIT_DIR_HOST_PHY */
+		0,			/* MII_BIT_DIR_PHY_HOST */
+	}
+};
+
+const struct mii_bitbang_ops dl10022_mii_bitbang_ops = {
+	dl10019_mii_bitbang_read,
+	dl10019_mii_bitbang_write,
+	{
+		DL0_GPIO_MII_DATAOUT,	/* MII_BIT_MDO */
+		DL0_GPIO_MII_DATAIN,	/* MII_BIT_MDI */
+		DL0_GPIO_MII_CLK,	/* MII_BIT_MDC */
+		DL0_22_GPIO_MII_DIROUT,	/* MII_BIT_DIR_HOST_PHY */
+		0,			/* MII_BIT_DIR_PHY_HOST */
+	}
+};
+
+void
+dl10019_mii_reset(struct dp8390_softc *sc)
+{
+	struct ne2000_softc *nsc = (void *) sc;
+
+	if (nsc->sc_type != NE2000_TYPE_DL10022)
+		return;
+
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO, 0x08);
+	DELAY(1);
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO, 0x0c);
+	DELAY(1);
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO, 0x08);
+	DELAY(1);
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO, 0x0c);
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO, 0x00);
+}
+
+void
+dl10019_media_init(struct dp8390_softc *sc)
+{
+	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+
+	sc->sc_mii.mii_ifp = ifp;
+	sc->sc_mii.mii_readreg = dl10019_mii_readreg;
+	sc->sc_mii.mii_writereg = dl10019_mii_writereg;
+	sc->sc_mii.mii_statchg = dl10019_mii_statchg;
+	ifmedia_init(&sc->sc_mii.mii_media, 0, dp8390_mediachange,
+	    dp8390_mediastatus);
+
+	dl10019_mii_reset(sc);
+
+	mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+	    MII_OFFSET_ANY, 0);
+
+	if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
+		ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
+		ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE);
+	} else
+		ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+}
+
+void
+dl10019_media_fini(struct dp8390_softc *sc)
+{
+	mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
+}
+
+int
+dl10019_mediachange(struct dp8390_softc *sc)
+{
+	mii_mediachg(&sc->sc_mii);
+	return (0);
+}
+
+void
+dl10019_mediastatus(struct dp8390_softc *sc, struct ifmediareq *ifmr)
+{
+	mii_pollstat(&sc->sc_mii);
+	ifmr->ifm_status = sc->sc_mii.mii_media_status;
+	ifmr->ifm_active = sc->sc_mii.mii_media_active;
+}
+
+void
+dl10019_init_card(struct dp8390_softc *sc)
+{
+	dl10019_mii_reset(sc);
+	mii_mediachg(&sc->sc_mii);
+}
+
+void
+dl10019_stop_card(struct dp8390_softc *sc)
+{
+	mii_down(&sc->sc_mii);
+}
+
+u_int32_t
+dl10019_mii_bitbang_read(struct device *self)
+{
+	struct dp8390_softc *sc = (void *) self;
+
+	/* We're already in Page 0. */
+	return (bus_space_read_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO) &
+	    ~DL0_GPIO_PRESERVE);
+}
+
+void
+dl10019_mii_bitbang_write(struct device *self, u_int32_t val)
+{
+	struct dp8390_softc *sc = (void *) self;
+	u_int8_t gpio;
+
+	/* We're already in Page 0. */
+	gpio = bus_space_read_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO);
+	bus_space_write_1(sc->sc_regt, sc->sc_regh, NEDL_DL0_GPIO,
+	    (val & ~DL0_GPIO_PRESERVE) | (gpio & DL0_GPIO_PRESERVE));
+}
+
+int
+dl10019_mii_readreg(struct device *self, int phy, int reg)
+{
+	struct ne2000_softc *nsc = (void *) self;
+	int val;
+
+	if (nsc->sc_type == NE2000_TYPE_DL10022) {
+		val = mii_bitbang_readreg(self, &dl10022_mii_bitbang_ops,
+		    phy, reg);
+	} else {
+		val = mii_bitbang_readreg(self, &dl10019_mii_bitbang_ops,
+		    phy, reg);
+	}
+
+	return (val);
+}
+
+void
+dl10019_mii_writereg(struct device *self, int phy, int reg, int val)
+{
+	struct ne2000_softc *nsc = (void *) self;
+	
+	if (nsc->sc_type == NE2000_TYPE_DL10022) {
+		mii_bitbang_writereg(self, &dl10022_mii_bitbang_ops,
+		    phy, reg, val);
+	} else {
+		mii_bitbang_writereg(self, &dl10019_mii_bitbang_ops,
+		    phy, reg, val);
+	}
+}
+
+void
+dl10019_mii_statchg(struct device *self)
+{
+	struct dp8390_softc *sc = (void *) self;
+	struct ne2000_softc *nsc = (void *) self;
+
+	/*
+	 * Disable collision detection on the DL10022 if
+	 * we are on a full-duplex link.
+	 */
+	if (nsc->sc_type == NE2000_TYPE_DL10022) {
+		u_int8_t diag;
+
+		if (sc->sc_mii.mii_media_active & IFM_FDX)
+			diag = DL0_DIAG_NOCOLLDETECT;
+		else
+			diag = 0;
+		bus_space_write_1(sc->sc_regt, sc->sc_regh,
+		    NEDL_DL0_DIAG, diag);
+	}
+}
diff --git a/sys/dev/ic/dl10019reg.h b/sys/dev/ic/dl10019reg.h
new file mode 100644
index 00000000000..10cb604df94
--- /dev/null
+++ b/sys/dev/ic/dl10019reg.h
@@ -0,0 +1,64 @@
+/*	$OpenBSD: dl10019reg.h,v 1.1 2001/03/29 01:26:47 aaron Exp $	*/
+/*	$NetBSD$	*/
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION 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.
+ */
+
+/*
+ * Registers on D-Link DL10019 and DL10022 NE2000-compatible Ethernet
+ * chips.
+ */
+
+#ifndef _DEV_IC_DL10019_REG_H_
+#define	_DEV_IC_DL10019_REG_H_
+
+/*
+ * Page 0 register offsets.
+ */
+#define	NEDL_DL0_GPIO		0x1c	/* general purpose I/O */
+
+#define	DL0_GPIO_MII_CLK	0x80	/* MII clock */
+#define	DL0_GPIO_MII_DATAOUT	0x40	/* MII data MAC->PHY */
+#define	DL0_22_GPIO_MII_DIROUT	0x20	/* MII direction MAC->PHY */
+#define	DL0_19_GPIO_MII_DIROUT	0x10	/* MII direction MAC->PHY */
+#define	DL0_GPIO_MII_DATAIN	0x10	/* MII data PHY->MAC */
+#define	DL0_GPIO_PRESERVE	0x0f	/* must preserve these bits! */
+
+#define	NEDL_DL0_DIAG		0x1d	/* diagnostics register */
+
+#define	DL0_DIAG_NOCOLLDETECT	0x04	/* disable collision detection */
+
+#endif /* _DEV_IC_DL10019_REG_H_ */
diff --git a/sys/dev/ic/dl10019var.h b/sys/dev/ic/dl10019var.h
new file mode 100644
index 00000000000..a2347d7d8c7
--- /dev/null
+++ b/sys/dev/ic/dl10019var.h
@@ -0,0 +1,58 @@
+/*	$OpenBSD: dl10019var.h,v 1.1 2001/03/29 01:26:47 aaron Exp $	*/
+/*	$NetBSD$	*/
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION 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.
+ */
+
+/*
+ * Definitions on D-Link DL10019 and DL10022 NE2000-compatible Ethernet
+ * chips.
+ */
+
+#ifndef _DEV_IC_DL10019_VAR_H_
+#define	_DEV_IC_DL10019_VAR_H_
+
+#ifdef _KERNEL
+void	dl10019_media_init(struct dp8390_softc *);
+void	dl10019_media_fini(struct dp8390_softc *);
+
+int	dl10019_mediachange(struct dp8390_softc *);
+void	dl10019_mediastatus(struct dp8390_softc *, struct ifmediareq *ifmr);
+void	dl10019_init_card(struct dp8390_softc *);
+void	dl10019_stop_card(struct dp8390_softc *);
+#endif /* _KERNEL */
+
+#endif /* _DEV_IC_DL10019_VAR_H_ */