[src/trunk]: src/sys/dev/pci - Define WMPHY_I217, WMPHY_VF and WMPHY_210.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/38ecf261b533
branches:  trunk
changeset: 348595:38ecf261b533
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 28 06:27:11 2016 +0000

description:
- 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.

diffstat:

 sys/dev/pci/if_wm.c    |  10 ++++++----
 sys/dev/pci/if_wmvar.h |   7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r 22995c082d3a -r 38ecf261b533 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 28 05:52:05 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Oct 28 06:27:11 2016 +0000
@@ -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 @@
                        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 @@
                            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 @@
                            MII_IGPHY_PAGE_SELECT, reg);
                else
                        wm_gmii_mdic_writereg(self, phy,
-                           GG82563_PHY_PAGE_SELECT,
+                           BME1000_PHY_PAGE_SELECT,
                            reg >> GG82563_PAGE_SHIFT);
        }
 
diff -r 22995c082d3a -r 38ecf261b533 sys/dev/pci/if_wmvar.h
--- a/sys/dev/pci/if_wmvar.h    Fri Oct 28 05:52:05 2016 +0000
+++ b/sys/dev/pci/if_wmvar.h    Fri Oct 28 06:27:11 2016 +0000
@@ -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 @@
        WMPHY_82577,
        WMPHY_82578,
        WMPHY_82579,
-       WMPHY_82580
+       WMPHY_I217,
+       WMPHY_82580,
+       WMPHY_VF,
+       WMPHY_210
 } wm_phy_type;