 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.432 2016/10/28 05:50:18 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.433 2016/10/28 06:27:11 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 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
 @@ -74,27 +74,27 @@
+ *
  *	- Check XXX'ed comments
  *	- Disable D0 LPLU on 8257[12356], 82580 and I350.
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Advanced Receive Descriptor
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.432 2016/10/28 05:50:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.433 2016/10/28 06:27:11 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -8242,30 +8242,32 @@ wm_gmii_mediainit(struct wm_softc *sc, p
 		break;
 	default:
 		if (((sc->sc_flags & WM_F_SGMII) != 0)
 		    && !wm_sgmii_uses_mdio(sc)){
 			/* SGMII */
 			mii->mii_readreg = wm_sgmii_readreg;
 			mii->mii_writereg = wm_sgmii_writereg;
 		} else if (sc->sc_type >= WM_T_ICH8) {
 			/* non-82567 ICH8, 9 and 10 */
 			mii->mii_readreg = wm_gmii_i82544_readreg;
 			mii->mii_writereg = wm_gmii_i82544_writereg;
 		} else if (sc->sc_type >= WM_T_80003) {
 			/* 80003 */
 			sc->sc_phytype = WMPHY_GG82563;
 			mii->mii_readreg = wm_gmii_i80003_readreg;
 			mii->mii_writereg = wm_gmii_i80003_writereg;
 		} else if (sc->sc_type >= WM_T_I210) {
 			/* I210 and I211 */
 			sc->sc_phytype = WMPHY_210;
 			mii->mii_readreg = wm_gmii_gs40g_readreg;
 			mii->mii_writereg = wm_gmii_gs40g_writereg;
 		} else if (sc->sc_type >= WM_T_82580) {
 			/* 82580, I350 and I354 */
 			sc->sc_phytype = WMPHY_82580;
 			mii->mii_readreg = wm_gmii_82580_readreg;
 			mii->mii_writereg = wm_gmii_82580_writereg;
 		} else if (sc->sc_type >= WM_T_82544) {
 			/* 82544, 0, [56], [17], 8257[1234] and 82583 */
 			mii->mii_readreg = wm_gmii_i82544_readreg;
 			mii->mii_writereg = wm_gmii_i82544_writereg;
 		} else {
 			mii->mii_readreg = wm_gmii_i82543_readreg;
 @@ -8752,27 +8754,27 @@ wm_gmii_bm_readreg(device_t self, int ph
 	if (sc->phy.acquire(sc)) {
 		aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
 		    __func__);
 		return 0;
+	}
 	if (reg > BME1000_MAX_MULTI_PAGE_REG) {
 		if (phy == 1)
 			wm_gmii_mdic_writereg(self, phy,
 			    MII_IGPHY_PAGE_SELECT, reg);
 		else
 			wm_gmii_mdic_writereg(self, phy,
-			    GG82563_PHY_PAGE_SELECT,
+			    BME1000_PHY_PAGE_SELECT,
 			    reg >> GG82563_PAGE_SHIFT);
+	}
 	rv = wm_gmii_mdic_readreg(self, phy, reg & MII_ADDRMASK);
 	sc->phy.release(sc);
 	return rv;
+}
 /*
  * wm_gmii_bm_writereg:	[mii interface function]
+ *
  *	Write a PHY register on the kumeran.
  * This could be handled by the PHY layer if we didn't have to lock the
 @@ -8785,27 +8787,27 @@ wm_gmii_bm_writereg(device_t self, int p
 	if (sc->phy.acquire(sc)) {
 		aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
 		    __func__);
 		return;
+	}
 	if (reg > BME1000_MAX_MULTI_PAGE_REG) {
 		if (phy == 1)
 			wm_gmii_mdic_writereg(self, phy,
 			    MII_IGPHY_PAGE_SELECT, reg);
 		else
 			wm_gmii_mdic_writereg(self, phy,
-			    GG82563_PHY_PAGE_SELECT,
+			    BME1000_PHY_PAGE_SELECT,
 			    reg >> GG82563_PAGE_SHIFT);
+	}
 	wm_gmii_mdic_writereg(self, phy, reg & MII_ADDRMASK, val);
 	sc->phy.release(sc);
+}
 static void
 wm_access_phy_wakeup_reg_bm(device_t self, int offset, int16_t *val, int rd)
+{
 	struct wm_softc *sc = device_private(self);
 	uint16_t regnum = BM_PHY_REG_NUM(offset);
 	uint16_t wuce;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wmvar.h,v 1.31 2016/05/06 08:56:20 msaitoh Exp $	*/
+/*	$NetBSD: if_wmvar.h,v 1.32 2016/10/28 06:27:11 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 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
 @@ -155,24 +155,27 @@ typedef enum {
 typedef enum {
 	WMPHY_UNKNOWN = 0,
 	WMPHY_NONE,
 	WMPHY_M88,
 	WMPHY_IGP,
 	WMPHY_IGP_2,
 	WMPHY_GG82563,
 	WMPHY_IGP_3,
 	WMPHY_IFE,
 	WMPHY_BM,
 	WMPHY_82577,
 	WMPHY_82578,
 	WMPHY_82579,
-	WMPHY_82580
+	WMPHY_I217,
 	WMPHY_82580,
 	WMPHY_VF,
 	WMPHY_210
 } wm_phy_type;
 #define WM_GEN_POLL_TIMEOUT	640
 #define WM_PHY_CFG_TIMEOUT	100
 #define	WM_ICH8_LAN_INIT_TIMEOUT 1500
 #define	WM_MDIO_OWNERSHIP_TIMEOUT 10
 #define	WM_MAX_PLL_TRIES	5
 #endif /* _DEV_PCI_IF_WMVAR_H_ */