[src/trunk]: src/sys/dev/pci Move the location of wm_smbustopci() call.

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

details:   https://anonhg.NetBSD.org/src/rev/ba79605c828b
branches:  trunk
changeset: 348931:ba79605c828b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Nov 16 09:27:49 2016 +0000

description:
Move the location of wm_smbustopci() call.

diffstat:

 sys/dev/pci/if_wm.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 96202cf81b89 -r ba79605c828b sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Nov 16 08:56:17 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Nov 16 09:27:49 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.447 2016/11/16 08:56:17 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.448 2016/11/16 09:27:49 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.447 2016/11/16 08:56:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.448 2016/11/16 09:27:49 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1935,11 +1935,6 @@
        CSR_READ(sc, WMREG_COLC);
        CSR_READ(sc, WMREG_RXERRC);
 
-       /* get PHY control from SMBus to PCIe */
-       if ((sc->sc_type == WM_T_PCH) || (sc->sc_type == WM_T_PCH2)
-           || (sc->sc_type == WM_T_PCH_LPT) || (sc->sc_type == WM_T_PCH_SPT))
-               wm_smbustopci(sc);
-
        if ((sc->sc_type == WM_T_82574) || (sc->sc_type == WM_T_82583)
            || (sc->sc_type >= WM_T_ICH8))
                sc->sc_ich_phymtx = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NET);
@@ -8365,6 +8360,11 @@
        }
        mii->mii_statchg = wm_gmii_statchg;
 
+       /* get PHY control from SMBus to PCIe */
+       if ((sc->sc_type == WM_T_PCH) || (sc->sc_type == WM_T_PCH2)
+           || (sc->sc_type == WM_T_PCH_LPT) || (sc->sc_type == WM_T_PCH_SPT))
+               wm_smbustopci(sc);
+
        wm_gmii_reset(sc);
 
        sc->sc_ethercom.ec_mii = &sc->sc_mii;