[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/d055eca4de17
branches:  netbsd-8
changeset: 446191:d055eca4de17
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Nov 26 17:24:51 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1108):
        sys/dev/pci/if_wm.c: revision 1.599
- Fix a bug that i82578 PHY can't detect correctly.
- Print PHY OUI and model number if a PHY's can't be identified.

diffstat:

 sys/dev/pci/if_wm.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r d64f58d47b0c -r d055eca4de17 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Nov 26 17:22:32 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Nov 26 17:24:51 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.25 2018/11/08 12:09:18 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.26 2018/11/26 17:24:51 snj Exp $     */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.25 2018/11/08 12:09:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.26 2018/11/26 17:24:51 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -9534,7 +9534,7 @@
        } else {
                /* It's not the first call. Use PHY OUI and model */
                switch (phy_oui) {
-               case MII_OUI_ATHEROS: /* XXX ??? */
+               case MII_OUI_ATTANSIC: /* XXX ??? */
                        switch (phy_model) {
                        case 0x0004: /* XXX */
                                new_phytype = WMPHY_82578;
@@ -9611,8 +9611,9 @@
                        break;
                }
                if (new_phytype == WMPHY_UNKNOWN)
-                       aprint_verbose_dev(dev, "%s: unknown PHY model\n",
-                           __func__);
+                       aprint_verbose_dev(dev,
+                           "%s: unknown PHY model. OUI=%06x, model=%04x\n",
+                           __func__, phy_oui, phy_model);
 
                if ((sc->sc_phytype != WMPHY_UNKNOWN)
                    && (sc->sc_phytype != new_phytype )) {