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

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

details:   https://anonhg.NetBSD.org/src/rev/dc3455b35e6d
branches:  netbsd-7
changeset: 446238:dc3455b35e6d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 28 16:26:31 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1656):

        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.

XXX pullup-[78]

diffstat:

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

diffs (39 lines):

diff -r e0132c7817d4 -r dc3455b35e6d sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Sat Nov 24 17:25:39 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Nov 28 16:26:31 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.289.2.17 2018/11/09 11:28:39 sborrill Exp $        */
+/*     $NetBSD: if_wm.c,v 1.289.2.18 2018/11/28 16:26:31 martin 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.289.2.17 2018/11/09 11:28:39 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.18 2018/11/28 16:26:31 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -7300,7 +7300,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;
@@ -7377,8 +7377,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 )) {