[src/trunk]: src/sys/dev/pci Swap enumeration of 82578 and 82577. Same as Fre...

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

details:   https://anonhg.NetBSD.org/src/rev/b8f068c232cd
branches:  trunk
changeset: 448698:b8f068c232cd
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Feb 07 10:29:53 2019 +0000

description:
Swap enumeration of 82578 and 82577. Same as FreeBSD. Chip Model number of
82578 is +1 from 82577 but 82577 is functionally newer than 82578 (and 82577's
MII_MODEL(0x05) is greater than 82578's (0x04)). This change doesn't affect any
behavior to if_wm.c (NFCI).

 Add comment.

diffstat:

 sys/dev/pci/if_wmvar.h |  32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r 29a0491736a2 -r b8f068c232cd sys/dev/pci/if_wmvar.h
--- a/sys/dev/pci/if_wmvar.h    Thu Feb 07 06:10:29 2019 +0000
+++ b/sys/dev/pci/if_wmvar.h    Thu Feb 07 10:29:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wmvar.h,v 1.42 2018/12/25 07:41:21 msaitoh Exp $    */
+/*     $NetBSD: if_wmvar.h,v 1.43 2019/02/07 10:29:53 msaitoh Exp $    */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -160,19 +160,35 @@
        WM_T_PCH_CNP,                   /* (I219) */
 } wm_chip_type;
 
+/*
+ * Variations of internal or external PHYs
+ *
+ *  +- 82562 - 8254[17] - 8257[12] - 82566
+ *  |
+ * -+------------------------------------->
+ *
+ *                                                        +--- 82580 - I350
+ *                                                        |
+ *                             +- 82578 - 82577 - 82579 - I217 - I218 - I219
+ *                             |
+ *   +- 8256[34] --- 82567 - 82573
+ *   |
+ *  -+--------------------------->
+ */
+
 typedef enum {
        WMPHY_UNKNOWN = 0,
        WMPHY_NONE,
-       WMPHY_M88,
-       WMPHY_IGP,
-       WMPHY_IGP_2,
-       WMPHY_GG82563,  /* 82563: 80003 */
+       WMPHY_M88,      /* 88E1000: 8254[34], E1011: 8254[056], E1111: 82573 */
+       WMPHY_IGP,      /* 8254[17] */
+       WMPHY_IGP_2,    /* 8257[12] */
+       WMPHY_GG82563,  /* 8256[34]: 80003 */
        WMPHY_IGP_3,    /* 82566: 82575, 82576, ICH8, ICH9 */
-       WMPHY_IFE,      /* 82562 */
+       WMPHY_IFE,      /* 82562: ICH8 ICH9 */
        WMPHY_BM,       /* 82567: ICH8 ICH9 ICH10 */
-       WMPHY_82577,    /* 82577: PCH */
        WMPHY_82578,    /* 82578: PCH */
-       WMPHY_82579,    /* 82579: PCH2 */
+       WMPHY_82577,    /* 82577: PCH (NOTE: functionality newer than 82578) */
+       WMPHY_82579,    /* 82579 : PCH2 */
        WMPHY_I217,     /* I217:  _LPT, I218: _LPT, I219: _SPT _CNP */
        WMPHY_82580,    /* 82580: 82580 or I350 */
        WMPHY_VF,