[src/trunk]: src/sys/dev/pci Change debug flags to be better than before.

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

details:   https://anonhg.NetBSD.org/src/rev/15d05b531d38
branches:  trunk
changeset: 348596:15d05b531d38
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 28 06:59:08 2016 +0000

description:
Change debug flags to be better than before.

diffstat:

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

diffs (135 lines):

diff -r 38ecf261b533 -r 15d05b531d38 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 28 06:27:11 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Oct 28 06:59:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.433 2016/10/28 06:27:11 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.434 2016/10/28 06:59:08 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.433 2016/10/28 06:27:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.434 2016/10/28 06:59:08 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -8166,7 +8166,7 @@
        struct mii_data *mii = &sc->sc_mii;
        uint32_t reg;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_GMII, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
 
        /* We have GMII. */
@@ -8387,7 +8387,7 @@
        struct ifmedia_entry *ife = sc->sc_mii.mii_media.ifm_cur;
        int rc;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_GMII, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        if ((ifp->if_flags & IFF_UP) == 0)
                return 0;
@@ -8812,7 +8812,7 @@
        uint16_t regnum = BM_PHY_REG_NUM(offset);
        uint16_t wuce;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_GMII, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        /* XXX Gig must be disabled for MDIO accesses to page 800 */
        if (sc->sc_type == WM_T_PCH) {
@@ -8861,7 +8861,7 @@
        struct wm_softc *sc = device_private(self);
        int rv;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_GMII, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        if (sc->phy.acquire(sc)) {
                aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
@@ -8924,7 +8924,7 @@
 {
        struct wm_softc *sc = device_private(self);
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_GMII, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
 
        if (sc->phy.acquire(sc)) {
@@ -11267,7 +11267,7 @@
        int32_t timeout;
        uint32_t swsm;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        KASSERT(sc->sc_nvm_wordsize > 0);
 
@@ -11323,7 +11323,7 @@
 {
        uint32_t swsm;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
 
        swsm = CSR_READ(sc, WMREG_SWSM);
@@ -11343,7 +11343,7 @@
        uint32_t fwmask = mask << SWFW_FIRM_SHIFT;
        int timeout = 200;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        KASSERT((sc->sc_flags & WM_F_LOCK_SWSM) != 0);
 
@@ -11378,7 +11378,7 @@
 {
        uint32_t swfw_sync;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        KASSERT((sc->sc_flags & WM_F_LOCK_SWSM) != 0);
 
@@ -11417,7 +11417,7 @@
        uint32_t ext_ctrl;
        int timeout = 200;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
 
        mutex_enter(sc->sc_ich_phymtx); /* Use PHY mtx for both PHY and NVM */
@@ -11442,7 +11442,7 @@
 {
        uint32_t ext_ctrl;
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
 
        ext_ctrl = CSR_READ(sc, WMREG_EXTCNFCTR);
@@ -11518,7 +11518,7 @@
 wm_get_nvm_ich8lan(struct wm_softc *sc)
 {
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        mutex_enter(sc->sc_ich_nvmmtx);
 
@@ -11529,7 +11529,7 @@
 wm_put_nvm_ich8lan(struct wm_softc *sc)
 {
 
-       DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
+       DPRINTF(WM_DEBUG_LOCK, ("%s: %s called\n",
                device_xname(sc->sc_dev), __func__));
        mutex_exit(sc->sc_ich_nvmmtx);
 }