 @@ -1,14 +1,14 @@
-/*	$NetBSD: makphy.c,v 1.42.8.3 2019/08/01 14:27:30 martin Exp $	*/
+/*	$NetBSD: makphy.c,v 1.42.8.4 2020/01/28 09:34:29 martin Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -49,27 +49,27 @@
  * 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 Marvell 88E1000 ``Alaska'' 10/100/1000 PHY.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.42.8.3 2019/08/01 14:27:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.42.8.4 2020/01/28 09:34:29 martin Exp $");
 #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>
 @@ -194,27 +194,27 @@ makphymatch(device_t parent, cfdata_t ma
 	return 0;
+}
 static void
 makphyattach(device_t parent, device_t self, void *aux)
+{
 	struct mii_softc *sc = device_private(self);
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 	const struct mii_phydesc *mpd;
 	struct makphy_softc *maksc = (struct makphy_softc *)sc;
 	const char *name;
-	int model, val;
+	int reg, model;
 	mpd = mii_phy_match(ma, makphys);
 	aprint_naive(": Media interface\n");
 	if (mpd)
 		name = mpd->mpd_name;
 	else if (makphy_isi210(parent, ma)) {
 		name = MII_STR_xxMARVELL_I210;
 		maksc->sc_flags |= MAKPHY_F_I210;
 	} else
 		panic("Unknown PHY");
 	aprint_normal(": %s, rev. %d\n", name, MII_REV(ma->mii_id2));
 	sc->mii_dev = self;
 @@ -235,64 +235,99 @@ makphyattach(device_t parent, device_t s
 		/* FALLTHROUGH */
 	case MII_MODEL_xxMARVELL_E1000_3:
 	case MII_MODEL_xxMARVELL_E1000S:
 	case MII_MODEL_xxMARVELL_E1000_5:
 		/* 88E1000 series has no EADR */
 		break;
 	default:
 page0:
 		/* Make sure page 0 is selected. */
 		PHY_WRITE(sc, MAKPHY_EADR, 0);
 		break;
+	}
 	switch (model) {
 	case MII_MODEL_xxMARVELL_E1011:
 	case MII_MODEL_xxMARVELL_E1112:
 		val = PHY_READ(sc, MAKPHY_ESSR);
 		if ((val != 0) && (((u_int)val & 0x0000ffffU) != 0x0000ffffU)
 		    && ((val & ESSR_FIBER_LINK) != 0))
 			sc->mii_flags |= MIIF_HAVEFIBER;
 		break;
 	default:
 		break;
 	PHY_RESET(sc);
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	if (sc->mii_capabilities & BMSR_EXTSTAT)
 		sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
 	if (((sc->mii_extcapabilities & (EXTSR_1000TFDX | EXTSR_1000THDX))
 		!= 0)
 	    && ((sc->mii_extcapabilities & (EXTSR_1000XFDX | EXTSR_1000XHDX))
 		!= 0)) {
 		bool fiberonly = false, copperonly = false;
 		/* Both copper and fiber are set. check MODE[] */
 		switch (sc->mii_mpd_model) {
 		case MII_MODEL_xxMARVELL_E1011:
 		case MII_MODEL_xxMARVELL_E1111:
 			/* These devices have ESSR register */
 			reg = PHY_READ(sc, MAKPHY_ESSR);
 			if ((reg & ESSR_AUTOSEL_DISABLE) != 0) {
 				switch (reg & ESSR_HWCFG_MODE) {
 				case ESSR_RTBI_FIBER:
 				case ESSR_RGMII_FIBER:
 				case ESSR_RGMII_SGMII: /* right? */
 				case ESSR_TBI_FIBER:
 				case ESSR_GMII_FIBER:
 					fiberonly = true;
 					break;
 				case ESSR_SGMII_WC_COPPER:
 				case ESSR_SGMII_WOC_COPPER:
 				case ESSR_RTBI_COPPER:
 				case ESSR_RGMII_COPPER:
 				case ESSR_GMII_COPPER:
 					copperonly = true;
 				default:
 					break;
+				}
+			}
 			break;
 		default:
 			break;
+		}
 		if (fiberonly || copperonly)
 			aprint_debug_dev(self, "both copper and fiber are set "
 			    "but MODE[] is %s only.\n",
 			    fiberonly ? "fiber" : "copper");
 		if (fiberonly)
 			sc->mii_extcapabilities
 			    &= ~(EXTSR_1000TFDX | EXTSR_1000THDX);
 		else if (copperonly) {
 			sc->mii_extcapabilities
 			    &= ~(EXTSR_1000XFDX | EXTSR_1000XHDX);
 			sc->mii_flags &= ~MIIF_IS_1000X;
+		}
+	}
 	aprint_normal_dev(self, "");
 	if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0 &&
 	    (sc->mii_extcapabilities & EXTSR_MEDIAMASK) == 0)
 		aprint_error("no media present");
 	else
 		mii_phy_add_media(sc);
 	aprint_normal("\n");
+}
 static void
 makphy_reset(struct mii_softc *sc)
+{
 	struct makphy_softc *maksc = (struct makphy_softc *)sc;
 	uint16_t reg;
 	mii_phy_reset(sc);
-	/*
+	/* Initialize PHY Specific Control Register. */
 	 * Initialize PHY Specific Control Register.
 	 */
 	reg = PHY_READ(sc, MAKPHY_PSCR);
 	/* Assert CRS on transmit. */
 	switch (sc->mii_mpd_model) {
 	case MII_MODEL_MARVELL_E1000_0:
 		if ((maksc->sc_flags & MAKPHY_F_I210) != 0)
 			break;
 		/* FALLTHROUGH */
 	case MII_MODEL_MARVELL_E1000_3:
 	case MII_MODEL_MARVELL_E1000_5:
 	case MII_MODEL_MARVELL_E1000_6:
 	case MII_MODEL_xxMARVELL_E1000S:
 	case MII_MODEL_xxMARVELL_E1011:
 @@ -415,27 +450,27 @@ makphy_service(struct mii_softc *sc, str
 	/* Update the media status. */
 	mii_phy_status(sc);
 	/* Callback if something changed. */
 	mii_phy_update(sc, cmd);
 	return 0;
+}
 static void
 makphy_status(struct mii_softc *sc)
+{
 	struct mii_data *mii = sc->mii_pdata;
-	int bmcr, gsr, pssr;
+	int bmcr, gsr, pssr, essr;
 	mii->mii_media_status = IFM_AVALID;
 	mii->mii_media_active = IFM_ETHER;
 	bmcr = PHY_READ(sc, MII_BMCR);
 	/* XXX FIXME: Use different page for Fiber on newer chips */
 	pssr = PHY_READ(sc, MAKPHY_PSSR);
 	if (pssr & PSSR_LINK)
 		mii->mii_media_status |= IFM_ACTIVE;
 	if (bmcr & BMCR_LOOP)
 		mii->mii_media_active |= IFM_LOOP;
 @@ -453,30 +488,65 @@ makphy_status(struct mii_softc *sc)
 		 */
 		if (!(pssr & PSSR_RESOLVED)) {
 			/* Erg, still trying, I guess... */
 			mii->mii_media_active |= IFM_NONE;
 			return;
+		}
 	} else {
 		if ((pssr & PSSR_LINK) == 0) {
 			mii->mii_media_active |= IFM_NONE;
 			return;
+		}
+	}
-	/* XXX FIXME: Use different page for Fiber on newer chips */
+	/*
 	 * XXX The following code support Fiber/Copper auto select mode
 	 * only for 88E1011, 88E1111 and 88E1112. For other chips, the document
 	 * is required.
 	 */
 	if (sc->mii_flags & MIIF_IS_1000X) {
 		/* Not in Fiber/Copper auto select mode */
 		mii->mii_media_active |= IFM_1000_SX;
 	} else if ((sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1011) ||
 	    (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1111)) {
 		/* Fiber/Copper auto select mode */
 		essr = PHY_READ(sc, MAKPHY_ESSR);
 		if ((essr & ESSR_FIBER_LINK) == 0)
 			goto copper;
 		/* XXX Assume 1000BASE-SX only */
 		mii->mii_media_active |= IFM_1000_SX;
 	} else if (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1112) {
 		/* Fiber/Copper auto select mode */
 		pssr = PHY_READ(sc, MAKPHY_PSSR);
 		if ((pssr & PSSR_RESOLUTION_FIBER) == 0)
 			goto copper;
 		switch (PSSR_SPEED_get(pssr)) {
 		case SPEED_1000:
 			mii->mii_media_active |= IFM_1000_SX;
 			break;
 		case SPEED_100:
 			mii->mii_media_active |= IFM_100_FX;
 			break;
 		default: /* Undefined (reserved) value */
 			mii->mii_media_active |= IFM_NONE;
 			mii->mii_media_status = 0;
 			return;
+		}
 	} else {
 copper:
 		switch (PSSR_SPEED_get(pssr)) {
 		case SPEED_1000:
 			mii->mii_media_active |= IFM_1000_T;
 			break;
 		case SPEED_100:
 			mii->mii_media_active |= IFM_100_TX;
 			break;
 		case SPEED_10:
 			mii->mii_media_active |= IFM_10_T;
 			break;
 		default: /* Undefined (reserved) value */
 			mii->mii_media_active |= IFM_NONE;
 			mii->mii_media_status = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makphyreg.h,v 1.6.20.1 2019/01/17 17:23:02 martin Exp $	*/
+/*	$NetBSD: makphyreg.h,v 1.6.20.2 2020/01/28 09:34:29 martin Exp $	*/
 /*-
  * 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.
 @@ -97,26 +97,32 @@
 #define	PSSR_MDIX		(1U << 6)   /* 1 = MIDX, 0 = MDI */
 #define	PSSR_CABLE_LENGTH_get(x) (((x) >> 7) & 0x3)
 #define	PSSR_LINK		(1U << 10)  /* link indication */
 #define	PSSR_RESOLVED		(1U << 11)  /* speed and duplex resolved */
 #define	PSSR_PAGE_RECEIVED	(1U << 12)  /* page received */
 #define	PSSR_DUPLEX		(1U << 13)  /* 1 = FDX */
 #define	PSSR_SPEED_get(x)	(((x) >> 14) & 0x3)
 #define	SPEED_10		0
 #define	SPEED_100		1
 #define	SPEED_1000		2
 #define	SPEED_reserved		3
 /* For 88E1112 */
 #define	PSSR_RESOLUTION_FIBER	(1U << 7)   /*
 					     * Fiber/Copper resolution
 					     * 1 = Fiber, 0 = Copper
 					     */
 #define	MAKPHY_IE		0x12	/* Interrupt enable */
 #define	IE_JABBER		(1U << 0)   /* jabber indication */
 #define	IE_POL_CHANGED		(1U << 1)   /* polarity changed */
 #define	IE_MDI_XOVER_CHANGED	(1U << 6)   /* MDI/MDIX changed */
 #define	IE_FIFO_OVER_UNDER	(1U << 7)   /* FIFO over/underflow */
 #define	IE_FALSE_CARRIER	(1U << 8)   /* false carrier detected */
 #define	IE_SYMBOL_ERROR		(1U << 9)   /* symbol error occurred */
 #define	IE_LINK_CHANGED		(1U << 10)  /* link status changed */
 #define	IE_ANEG_COMPLETE	(1U << 11)  /* autonegotiation completed */
 #define	IE_PAGE_RECEIVED	(1U << 12)  /* page received */
 #define	IE_DUPLEX_CHANGED	(1U << 13)  /* duplex changed */
 #define	IE_SPEED_CHANGED	(1U << 14)  /* speed changed */
 #define	IE_ANEG_ERROR		(1U << 15)  /* autonegotiation error occurred */
 @@ -133,33 +139,44 @@
 #define	MAKPHY_REC		0x15	/* receive error counter */
 #define	MAKPHY_EADR		0x16	/* extended address register */
 #define	MAKPHY_LEDCTRL	0x18	/* LED control */
 #define	LEDCTRL_LED_TX		(1U << 0)   /* 1 = activ/link, 0 = xmit */
 #define	LEDCTRL_LED_RX		(1U << 1)   /* 1 = activ/link, 1 = recv */
 #define	LEDCTRL_LED_DUPLEX	(1U << 2)   /* 1 = duplex, 0 = dup/coll */
 #define	LEDCTRL_LED_LINK	(1U << 3)   /* 1 = spd/link, 0 = link */
 #define	LEDCTRL_BLINK_RATE(x)	((x) << 8)
 #define	LEDCTRL_PULSE_STRCH(x)	((x) << 12)
 #define	LEDCTRL_DISABLE		(1U << 15)  /* disable LED */
 /* For 88E1011, 88E1111 */
 #define MAKPHY_ESSR		0x1b    /* Extended PHY specific status */
 #define ESSR_AUTOSEL_DISABLE	0x8000	/* Fiber/Copper autoselect disable */
 #define ESSR_FIBER_LINK		0x2000	/* Fiber/Copper resolution */
 #define ESSR_SER_ANEG_BYPASS	0x1000	/* Serial Iface Aneg bypass enable */
 #define ESSR_SER_ANEG_BYPASS_ST	0x0800	/* Serial Iface Aneg bypass status */
 #define ESSR_INTR_POLARITY	0x0400	/* Interrupt Polarity */
 #define ESSR_AUTO_MEDIAREG_SEL	0x0200	/* Auto Medium Register Selection */
 #define ESSR_DTE_DROP_HYST	0x01e0	/* DTE detect status drop hysteresis */
 #define ESSR_DTE_POWER		0x0010
 #define ESSR_HWCFG_MODE		0x000f
-#define ESSR_GMII_COPPER	0x000f
+#define ESSR_SGMII_WC_COPPER	 0x0000 /* SGMII w/ Clock w/ SGMII AN Copper */
-#define ESSR_GMII_FIBER		0x0007
+#define ESSR_RTBI_FIBER		 0x0001 /* RTBI to Fiber */
-#define ESSR_RGMII_COPPER	0x000b
+#define ESSR_RGMII_FIBER	 0x0003 /* RGMII to Fiber */
-#define ESSR_RGMII_FIBER	0x0003
+#define ESSR_SGMII_WOC_COPPER	 0x0004 /* SGMII w/o Clock w/ SGMII AN Copp. */
-#define ESSR_RGMII_SGMII	0x0006
+#define ESSR_TBI_FIBER		 0x0005 /* TBI to Fiber */
-#define ESSR_TBI_COPPER		0x000d
+#define ESSR_RGMII_SGMII	 0x0006 /* RGMII to SGMII */
-#define ESSR_TBI_FIBER		0x0005
+#define ESSR_GMII_FIBER		 0x0007 /* GMII to Fiber */
 #define ESSR_SERIAL_WAN		 0x0008 /* 88E1011: Serial w 1000KX AN */
 #define ESSR_GBIC		 0x0008 /* 88E1111: GBIC */
 #define ESSR_RTBI_COPPER	 0x0009 /* RTBI to Copper */
 #define ESSR_RGMII_COPPER	 0x000b /* RGMII to Copper */
 #define ESSR_RGMII_AUTOSEL	 0x000b /* RGMII with Auto-Selection */
 #define ESSR_SERIAL_WOAN	 0x000c /* 88E1011: Serial w/o 1000KX AN */
 #define ESSR_1000X_WOAN		 0x000c /* 88E1111: 1000X w/o AN Copper */
 #define ESSR_TBI_COPPER		 0x000d /* TBI to Copper */
 #define ESSR_GMII_SGMII		 0x000e /* GMII to SGMII */
 #define ESSR_GMII_COPPER	 0x000f /* GMII to Copper */
 #define ESSR_GMII_AUTOSEL	 0x000f /* GMII with Auto-Selection */
 #endif /* _DEV_MII_MAKPHYREG_H_ */