CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri Oct 28 06:27:11 UTC 2016

Modified Files:
        src/sys/dev/pci: if_wm.c if_wmvar.h

Log Message:
- Define WMPHY_I217, WMPHY_VF and WMPHY_210.
- Use BME1000_PHY_PAGE_SELECT in wm_gmii_bm_{read,write}reg(). This change has
  no effect because GG82563_PHY_PAGE_SELECT and BME1000_PHY_PAGE_SELECT have
  the same value.


To generate a diff of this commit:
cvs rdiff -u -r1.432 -r1.433 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_wmvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.432 src/sys/dev/pci/if_wm.c:1.433
--- src/sys/dev/pci/if_wm.c:1.432	Fri Oct 28 05:50:18 2016
+++ src/sys/dev/pci/if_wm.c	Fri Oct 28 06:27:11 2016
@@ -1,4 +1,4 @@
-/*	$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.
@@ -84,7 +84,7 @@
  */
 
 #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"
@@ -8252,10 +8252,12 @@ wm_gmii_mediainit(struct wm_softc *sc, p
 			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) {
@@ -8762,7 +8764,7 @@ wm_gmii_bm_readreg(device_t self, int ph
 			    MII_IGPHY_PAGE_SELECT, reg);
 		else
 			wm_gmii_mdic_writereg(self, phy,
-			    GG82563_PHY_PAGE_SELECT,
+			    BME1000_PHY_PAGE_SELECT,
 			    reg >> GG82563_PAGE_SHIFT);
 	}
 
@@ -8795,7 +8797,7 @@ wm_gmii_bm_writereg(device_t self, int p
 			    MII_IGPHY_PAGE_SELECT, reg);
 		else
 			wm_gmii_mdic_writereg(self, phy,
-			    GG82563_PHY_PAGE_SELECT,
+			    BME1000_PHY_PAGE_SELECT,
 			    reg >> GG82563_PAGE_SHIFT);
 	}
 

Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.31 src/sys/dev/pci/if_wmvar.h:1.32
--- src/sys/dev/pci/if_wmvar.h:1.31	Fri May  6 08:56:20 2016
+++ src/sys/dev/pci/if_wmvar.h	Fri Oct 28 06:27:11 2016
@@ -1,4 +1,4 @@
-/*	$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.
@@ -165,7 +165,10 @@ typedef enum {
 	WMPHY_82577,
 	WMPHY_82578,
 	WMPHY_82579,
-	WMPHY_82580
+	WMPHY_I217,
+	WMPHY_82580,
+	WMPHY_VF,
+	WMPHY_210
 } wm_phy_type;