altima 101/101L phy from netbsd via freebsd; hugh@ testing

4 files changed, 370 insertions, 2 deletions

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
new file mode 100644
index 00000000000..a1ec0e2fa1d
--- /dev/null
+++ b/sys/dev/mii/acphy.c
@@ -0,0 +1,232 @@
+/*	$OpenBSD: acphy.c,v 1.1 2003/08/12 19:42:37 mickey Exp $	*/
+/*	$NetBSD: acphy.c,v 1.13 2003/04/29 01:49:33 thorpej Exp $	*/
+
+/*
+ * Copyright 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. 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
+ *    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 for the NetBSD Project by
+ *	Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+
+/*
+ * Driver for the Altima AC101 PHY.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/socket.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/if_media.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <dev/mii/miidevs.h>
+
+#include <dev/mii/acphyreg.h>
+
+int	acphymatch(struct device *, void *, void *);
+void	acphyattach(struct device *, struct device *, void *);
+
+struct cfattach acphy_ca = {
+	sizeof(struct mii_softc), acphymatch, acphyattach, mii_phy_detach,
+	    mii_phy_activate
+};
+
+struct cfdriver acphy_cd = {
+	NULL, "acphy", DV_DULL
+};
+
+int	acphy_service(struct mii_softc *, struct mii_data *, int);
+void	acphy_status(struct mii_softc *);
+
+int
+acphymatch(struct device *parent, void *match, void *aux)
+{
+	struct mii_attach_args *ma = aux;
+
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxALTIMA &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxALTIMA_AC101)
+		return (10);
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxALTIMA &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxALTIMA_AC101L)
+		return (10);
+
+	return (0);
+}
+
+void
+acphyattach(struct device *parent, struct device *self, void *aux)
+{
+	struct mii_softc *sc = (struct mii_softc *)self;
+	struct mii_attach_args *ma = aux;
+	struct mii_data *mii = ma->mii_data;
+
+	printf(": %s, rev. %d\n", MII_STR_xxALTIMA_AC101, MII_REV(ma->mii_id2));
+
+	sc->mii_inst = mii->mii_instance;
+	sc->mii_phy = ma->mii_phyno;
+	sc->mii_service = acphy_service;
+	sc->mii_status = acphy_status;
+	sc->mii_pdata = mii;
+	sc->mii_flags = ma->mii_flags;
+	sc->mii_anegticks = 5;
+
+	mii_phy_reset(sc);
+
+	/*
+	 * XXX Check MCR_FX_SEL to set MIIF_HAVE_FIBER?
+	 */
+
+	sc->mii_capabilities =
+	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
+
+#define	ADD(m, c)	ifmedia_add(&mii->mii_media, (m), (c), NULL)
+	if (sc->mii_flags & MIIF_HAVEFIBER) {
+		ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst),
+		    MII_MEDIA_100_TX);
+		ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, IFM_FDX, sc->mii_inst),
+		    MII_MEDIA_100_TX);
+	}
+#undef ADD
+
+	if (sc->mii_capabilities & BMSR_MEDIAMASK)
+		mii_phy_add_media(sc);
+}
+
+int
+acphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
+{
+	struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+	int reg;
+
+	switch (cmd) {
+	case MII_POLLSTAT:
+		/*
+		 * If we're not polling our PHY instance, just return.
+		 */
+		if (IFM_INST(ife->ifm_media) != sc->mii_inst)
+			return (0);
+		break;
+
+	case MII_MEDIACHG:
+		/*
+		 * If the media indicates a different PHY instance,
+		 * isolate ourselves.
+		 */
+		if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
+			reg = PHY_READ(sc, MII_BMCR);
+			PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
+			return (0);
+		}
+
+		/*
+		 * If the interface is not up, don't do anything.
+		 */
+		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
+			break;
+
+		mii_phy_setmedia(sc);
+		break;
+
+	case MII_TICK:
+		/*
+		 * If we're not currently selected, just return.
+		 */
+		if (IFM_INST(ife->ifm_media) != sc->mii_inst)
+			return (0);
+
+		if (mii_phy_tick(sc) == EJUSTRETURN)
+			return (0);
+		break;
+
+	case MII_DOWN:
+		mii_phy_down(sc);
+		return (0);
+	}
+
+	/* Update the media status. */
+	mii_phy_status(sc);
+
+	/* Callback if something changed. */
+	mii_phy_update(sc, cmd);
+	return (0);
+}
+
+void
+acphy_status(struct mii_softc *sc)
+{
+	struct mii_data *mii = sc->mii_pdata;
+	struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+	int bmsr, bmcr, dr;
+
+	mii->mii_media_status = IFM_AVALID;
+	mii->mii_media_active = IFM_ETHER;
+
+	bmsr = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR);
+	dr = PHY_READ(sc, MII_ACPHY_DR);
+
+	if (bmsr & BMSR_LINK)
+		mii->mii_media_status |= IFM_ACTIVE;
+
+	bmcr = PHY_READ(sc, MII_BMCR);
+	if (bmcr & BMCR_ISO) {
+		mii->mii_media_active |= IFM_NONE;
+		mii->mii_media_status = 0;
+		return;
+	}
+
+	if (bmcr & BMCR_LOOP)
+		mii->mii_media_active |= IFM_LOOP;
+
+	if (bmcr & BMCR_AUTOEN) {
+		/*
+		 * The media status bits are only valid if autonegotiation
+		 * has completed (or it's disabled).
+		 */
+		if ((bmsr & BMSR_ACOMP) == 0) {
+			/* Erg, still trying, I guess... */
+			mii->mii_media_active |= IFM_NONE;
+			return;
+		}
+
+		if (dr & DR_SPEED)
+			mii->mii_media_active |= IFM_100_TX;
+		else
+			mii->mii_media_active |= IFM_10_T;
+		if (dr & DR_DPLX)
+			mii->mii_media_active |= IFM_FDX;
+	} else
+		mii->mii_media_active = ife->ifm_media;
+}
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
new file mode 100644
index 00000000000..ae359ead47b
--- /dev/null
+++ b/sys/dev/mii/acphyreg.h
@@ -0,0 +1,131 @@
+/*	$NetBSD: acphyreg.h,v 1.1 2001/08/24 17:54:33 thorpej Exp $	*/
+
+/*
+ * Copyright 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. 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
+ *    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 for the NetBSD Project by
+ *	Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+
+#ifndef _DEV_MII_ACPHYREG_H_
+#define	_DEV_MII_ACPHYREG_H_
+
+/*
+ * Altima AC101 PHY registers.
+ *
+ * Note the AC101 and the AMD Ac79c874 are the same PHY core.  There
+ * are some registers documented in the AC101 manual that are not in
+ * the Am79c874 manual, and vice-versa.  I have no idea how to tell
+ * the two apart, but we don't really use the registers that fall into
+ * this category, anyhow.
+ */
+
+#define	MII_ACPHY_PILR		0x10	/* polarity and interrupt control */
+#define	PILR_REPEATER		0x8000	/* repeater mode */
+#define	PILR_INTR_LEVL		0x4000	/* 1 = active high, 0 = active low */
+#define	PILR_SQE_INHIBIT	0x0800	/* disable 10T SQE testing */
+#define	PILR_10T_LOOP		0x0400	/* enable loopback in 10T */
+#define	PILR_GPIO1_DATA		0x0200	/* GPIO1 pin */
+#define	PILR_GPIO1_DIR		0x0100	/* 1 = input */
+#define	PILR_GPIO0_DATA		0x0080	/* GPIO0 pin */
+#define	PILR_GPIO0_DIR		0x0040	/* 1 = input */
+#define	PILR_AUTO_POL_DIS	0x0020	/* disable auto-polarity */
+#define	PILR_REVERSE_POL	0x0010	/* 1 = reverse, 0 = normal */
+#define	PILR_RXCLK_CTRL		0x0001	/* disable RX_CLK when idle */
+
+
+#define	MII_ACPHY_ICSR		0x11	/* interrupt control/status */
+#define	ICSR_JABBER_IE		0x8000	/* jabber interrupt enable */
+#define	ICSR_RX_ER_IE		0x4000	/* Rx error interrupt enable */
+#define	ICSR_PAGE_RX_IE		0x2000	/* page received interrupt enable */
+#define	ICSR_PD_FAULT_IE	0x1000	/* parallel detection fault int en */
+#define	ICSR_LP_ACK_IE		0x0800	/* link partner ACK interrupt en */
+#define	ICSR_LNK_NOT_OK_IE	0x0400	/* link not okay interrupt enable */
+#define	ICSR_R_FAULT_IE		0x0200	/* remote fault interrupt enable */
+#define	ICSR_ANEG_COMP_IE	0x0100	/* autonegotiation complete int en */
+#define	ICSR_JABBER_INT		0x0080	/* jabber interrupt */
+#define	ICSR_RX_ER_INT		0x0040	/* Rx error interrupt */
+#define	ICSR_PAGE_RX_INT	0x0020	/* page received interrupt */
+#define	ICSR_PD_FAULT_INT	0x0010	/* parallel detection fault interrupt */
+#define	ICSR_LP_ACK_INT		0x0008	/* link partner ACK interrupt */
+#define	ICSR_LNK_NOT_OK_INT	0x0004	/* link not okay interrupt */
+#define	ICSR_R_FAULT_INT	0x0002	/* remote fault interrupt */
+#define	ICSR_ANEG_COMP_INT	0x0001	/* autonegotiation complete interrupt */
+
+
+#define	MII_ACPHY_DR		0x12	/* diagnostic register */
+#define	DR_DPLX			0x0800	/* full-duplex resolved */
+#define	DR_SPEED		0x0400	/* 100BASE-TX resolved */
+#define	DR_RX_PASS		0x0200	/* manchester/signal received */
+#define	DR_RX_LOCK		0x0100	/* PLL signal has been locked */
+
+
+#define	MII_ACPHY_PLR		0x13	/* power/loopback register */
+#define	PLR_TB125		0x0040	/* Tx transformer ratio 1.25:1 */
+#define	PLR_LOW_POWER_MODE	0x0020	/* enable advanced power saving mode */
+#define	PLR_TEST_LOOPBACK	0x0010	/* enable test loopback */
+#define	PLR_DIGITAL_LOOPBACK	0x0008	/* enable loopback */
+#define	PLR_LP_LPBK		0x0004	/* enable link pulse loopback */
+#define	PLR_NLP_LINK_INT_TEST	0x0002	/* send NLP instead of FLP */
+#define	PLR_REDUCE_TIMER	0x0001	/* reduce time constant for aneg */
+
+
+/*	AC101 only	*/
+#define	MII_ACPHY_CMR		0x14	/* cable measurement register */
+#define	CMR_MASK		0x00f0	/* cable measurement mask */
+
+
+#define	MII_ACPHY_MCR		0x15	/* mode control register */
+#define	MCR_NLP_DISABLE		0x4000	/* force good 10BASE-T link */
+#define	MCR_FORCE_LINK_UP	0x2000	/* force good 100BASE-TX link */
+#define	MCR_JABBER_DISABLE	0x1000	/* disable jabber function */
+#define	MCR_10BT_SEL		0x0800	/* enable 7-wire 10T operation */
+#define	MCR_CONF_ALED		0x0400	/* 1 = ALED only Rx, 0 = ALED Rx/Tx */
+#define	MCR_LED_SEL		0x0200	/* 1 = tqphy-compat LED config */
+#define	MCR_FEF_DIS		0x0100	/* disable far-end-fault insertion */
+#define	MCR_FORCE_FEF_TX	0x0080	/* force FEF transmission */
+#define	MCR_RX_ER_CNT_FULL	0x0040	/* Rx error counter full */
+#define	MCR_DIS_RX_ER_CNT	0x0020	/* disable Rx error counter */
+#define	MCR_DIS_WDT		0x0010	/* disable the watchdog timer */
+#define	MCR_EN_RPBK		0x0008	/* enable remote loopback */
+#define	MCR_DIS_SCRM		0x0004	/* enable 100M data scrambling */
+#define	MCR_PCSBP		0x0002	/* bypass PCS */
+#define	MCR_FX_SEL		0x0001	/* FX mode selected */
+
+
+/*	Am79c874 only	*/
+#define	MII_ACPHY_DCR		0x17	/* disconnect counter register */
+
+
+#define	MII_ACPHY_RECR		0x18	/* receive error counter register */
+
+
+#endif /* _DEV_MII_ACPHYREG_H_ */
diff --git a/sys/dev/mii/files.mii b/sys/dev/mii/files.mii
index 5eba00ad32f..4ddef9a6945 100644
--- a/sys/dev/mii/files.mii
+++ b/sys/dev/mii/files.mii
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mii,v 1.19 2002/05/07 19:31:16 nate Exp $
+#	$OpenBSD: files.mii,v 1.20 2003/08/12 19:42:37 mickey Exp $
 #	$NetBSD: files.mii,v 1.13 1998/11/05 00:36:48 thorpej Exp $
 
 file    dev/mii/mii.c				mii
@@ -93,6 +93,10 @@ device amphy: mii_phy
 attach amphy at mii
 file dev/mii/amphy.c				amphy
 
+device acphy: mii_phy
+attach acphy at mii
+file dev/mii/acphy.c				acphy
+
 device nsgphy: mii_phy
 attach nsgphy at mii
 file dev/mii/nsgphy.c				nsgphy
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 3fc50823f82..9ee02667317 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.36 2003/05/14 05:16:58 nate Exp $
+$OpenBSD: miidevs,v 1.37 2003/08/12 19:42:37 mickey Exp $
 /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
 
 /*-
@@ -99,6 +99,7 @@ model AMD 79C873phy		0x0036 Am79C873 internal PHY
 
 /* Altima Communications PHYs */
 model xxALTIMA AC101		0x0021 AC101 10/100 media interface
+model xxALTIMA AC101L		0x0012 AC101L 10/100 media interface
 
 /* Broadcom Corp. PHYs */
 model xxBROADCOM BCM5400	0x0004 BCM5400 1000baseTX PHY