[src/trunk]: src/sys/dev - Use MII_ADDRMASK.

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

details:   https://anonhg.NetBSD.org/src/rev/1d42a730a8ec
branches:  trunk
changeset: 818735:1d42a730a8ec
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 28 05:50:18 2016 +0000

description:
- Use MII_ADDRMASK.
- Remove debug printf().

diffstat:

 sys/dev/mii/igphyreg.h   |   5 ++---
 sys/dev/mii/ikphyreg.h   |   5 ++---
 sys/dev/mii/inbmphyreg.h |  11 +++++------
 sys/dev/pci/if_wm.c      |  21 ++++++++++-----------
 4 files changed, 19 insertions(+), 23 deletions(-)

diffs (169 lines):

diff -r 70bee5de0a14 -r 1d42a730a8ec sys/dev/mii/igphyreg.h
--- a/sys/dev/mii/igphyreg.h    Fri Oct 28 05:47:16 2016 +0000
+++ b/sys/dev/mii/igphyreg.h    Fri Oct 28 05:50:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igphyreg.h,v 1.8 2015/10/26 02:31:31 msaitoh Exp $     */
+/*     $NetBSD: igphyreg.h,v 1.9 2016/10/28 05:50:18 msaitoh Exp $     */
 
 /*******************************************************************************
 
@@ -165,9 +165,8 @@
  * IGP3 regs
  */
 #define IGP3_PAGE_SHIFT                5
-#define IGP3_MAX_REG_ADDRESS   0x1f  /* 5 bit address bus (0-0x1f) */
 #define IGP3_REG(page, reg) \
-       (((page) << IGP3_PAGE_SHIFT) | ((reg) & IGP3_MAX_REG_ADDRESS))
+       (((page) << IGP3_PAGE_SHIFT) | ((reg) & MII_MAXREGADDR))
 
 #define IGP3_VR_CTRL   IGP3_REG(776, 18)
 #define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK   0x0300
diff -r 70bee5de0a14 -r 1d42a730a8ec sys/dev/mii/ikphyreg.h
--- a/sys/dev/mii/ikphyreg.h    Fri Oct 28 05:47:16 2016 +0000
+++ b/sys/dev/mii/ikphyreg.h    Fri Oct 28 05:50:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ikphyreg.h,v 1.2 2010/11/29 23:04:42 jym Exp $ */
+/*     $NetBSD: ikphyreg.h,v 1.3 2016/10/28 05:50:18 msaitoh Exp $     */
 /*******************************************************************************
 Copyright (c) 2001-2005, Intel Corporation 
 All rights reserved.
@@ -41,10 +41,9 @@
  */
 #define GG82563_PAGE_SHIFT        5
 #define GG82563_REG(page, reg)    \
-        (((page) << GG82563_PAGE_SHIFT) | ((reg) & GG82563_MAX_REG_ADDRESS))
+        (((page) << GG82563_PAGE_SHIFT) | ((reg) & MII_ADDRMASK))
 #define GG82563_MIN_ALT_REG       30
 
-#define GG82563_MAX_REG_ADDRESS        0x1F  /* 5 bit address bus (0-0x1F) */
 #define GG82563_MAX_MULTI_PAGE_REG     0xF   /* Registers equal on all pages */
 
 
diff -r 70bee5de0a14 -r 1d42a730a8ec sys/dev/mii/inbmphyreg.h
--- a/sys/dev/mii/inbmphyreg.h  Fri Oct 28 05:47:16 2016 +0000
+++ b/sys/dev/mii/inbmphyreg.h  Fri Oct 28 05:50:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inbmphyreg.h,v 1.6 2016/10/19 08:22:57 msaitoh Exp $   */
+/*     $NetBSD: inbmphyreg.h,v 1.7 2016/10/28 05:50:18 msaitoh Exp $   */
 /*******************************************************************************
 Copyright (c) 2001-2005, Intel Corporation 
 All rights reserved.
@@ -44,16 +44,15 @@
  */
 #define BME1000_PAGE_SHIFT        5
 #define BME1000_REG(page, reg)    \
-        (((page) << BME1000_PAGE_SHIFT) | ((reg) & BME1000_MAX_REG_ADDRESS))
+        (((page) << BME1000_PAGE_SHIFT) | ((reg) & MII_ADDRMASK))
 
-#define BME1000_MAX_REG_ADDRESS        0x1f  /* 5 bit address bus (0-0x1f) */
 #define BME1000_MAX_MULTI_PAGE_REG     0xf   /* Registers equal on all pages */
 
 #define        BM_PHY_REG_PAGE(offset)                 \
        ((uint16_t)(((offset) >> BME1000_PAGE_SHIFT) & 0xffff))
-#define        BM_PHY_REG_NUM(offset)                  \
-       ((uint16_t)((offset) & BME1000_MAX_REG_ADDRESS)         \
-       | (((offset) >> (21 - BME1000_PAGE_SHIFT)) & ~BME1000_MAX_REG_ADDRESS))
+#define        BM_PHY_REG_NUM(offset)                          \
+       ((uint16_t)((offset) & MII_ADDRMASK)            \
+       | (((offset) >> (21 - BME1000_PAGE_SHIFT)) & ~MII_ADDRMASK))
 
 /* BME1000 Specific Registers */
 #define BME1000_PHY_SPEC_CTRL  BME1000_REG(0, 16) /* PHY Specific Control */
diff -r 70bee5de0a14 -r 1d42a730a8ec sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 28 05:47:16 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Oct 28 05:50:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.431 2016/10/28 05:29:11 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.432 2016/10/28 05:50:18 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.431 2016/10/28 05:29:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.432 2016/10/28 05:50:18 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -8685,7 +8685,7 @@
                return 0;
        }
 
-       if ((reg & GG82563_MAX_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
+       if ((reg & MII_ADDRMASK) < GG82563_MIN_ALT_REG) {
                wm_gmii_mdic_writereg(self, phy, GG82563_PHY_PAGE_SELECT,
                    reg >> GG82563_PAGE_SHIFT);
        } else {
@@ -8694,7 +8694,7 @@
        }
        /* Wait more 200us for a bug of the ready bit in the MDIC register */
        delay(200);
-       rv = wm_gmii_mdic_readreg(self, phy, reg & GG82563_MAX_REG_ADDRESS);
+       rv = wm_gmii_mdic_readreg(self, phy, reg & MII_ADDRMASK);
        delay(200);
        sc->phy.release(sc);
 
@@ -8722,7 +8722,7 @@
                return;
        }
 
-       if ((reg & GG82563_MAX_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
+       if ((reg & MII_ADDRMASK) < GG82563_MIN_ALT_REG) {
                wm_gmii_mdic_writereg(self, phy, GG82563_PHY_PAGE_SELECT,
                    reg >> GG82563_PAGE_SHIFT);
        } else {
@@ -8731,7 +8731,7 @@
        }
        /* Wait more 200us for a bug of the ready bit in the MDIC register */
        delay(200);
-       wm_gmii_mdic_writereg(self, phy, reg & GG82563_MAX_REG_ADDRESS, val);
+       wm_gmii_mdic_writereg(self, phy, reg & MII_ADDRMASK, val);
        delay(200);
 
        sc->phy.release(sc);
@@ -8766,7 +8766,7 @@
                            reg >> GG82563_PAGE_SHIFT);
        }
 
-       rv = wm_gmii_mdic_readreg(self, phy, reg & GG82563_MAX_REG_ADDRESS);
+       rv = wm_gmii_mdic_readreg(self, phy, reg & MII_ADDRMASK);
        sc->phy.release(sc);
        return rv;
 }
@@ -8799,7 +8799,7 @@
                            reg >> GG82563_PAGE_SHIFT);
        }
 
-       wm_gmii_mdic_writereg(self, phy, reg & GG82563_MAX_REG_ADDRESS, val);
+       wm_gmii_mdic_writereg(self, phy, reg & MII_ADDRMASK, val);
        sc->phy.release(sc);
 }
 
@@ -8906,7 +8906,7 @@
                    page << BME1000_PAGE_SHIFT);
        }
 
-       rv = wm_gmii_mdic_readreg(self, phy, regnum & IGPHY_MAXREGADDR);
+       rv = wm_gmii_mdic_readreg(self, phy, regnum & MII_ADDRMASK);
        return rv;
 }
 
@@ -8971,7 +8971,7 @@
                    page << BME1000_PAGE_SHIFT);
        }
 
-       wm_gmii_mdic_writereg(self, phy, regnum & IGPHY_MAXREGADDR, val);
+       wm_gmii_mdic_writereg(self, phy, regnum & MII_ADDRMASK, val);
 }
 
 /*
@@ -12277,7 +12277,6 @@
                 */
                child = LIST_FIRST(&sc->sc_mii.mii_phys);
                if ((child != NULL) && (child->mii_mpd_rev < 2)) {
-                       printf("XXX 82578 rev < 2\n");
                        PHY_RESET(child);
                        sc->sc_mii.mii_writereg(sc->sc_dev, 2, MII_BMCR,
                            0x3140);