bnx2x: revised driver prints

We've revised driver prints, changing the mask of existing prints
to allow better control over the debug messages, added prints to
error scenarios, removed unnecessary prints and corrected some spelling.
Please note that this patch contains lines with over 80 characters,
as string messages were kept in a single line.

Signed-off-by: Merav Sicron <meravs@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 116 insertions, 73 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 858d1b5433de..3618a00a8144 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -280,7 +280,7 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         cmd->maxtxpkt = 0;
         cmd->maxrxpkt = 0;
 
-        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL, "ethtool_cmd: cmd %d\n"
            "  supported 0x%x  advertising 0x%x  speed %u\n"
            "  duplex %d  port %d  phy_address %d  transceiver %d\n"
            "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
@@ -301,7 +301,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         if (IS_MF_SD(bp))
                 return 0;
 
-        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL, "ethtool_cmd: cmd %d\n"
            "  supported 0x%x  advertising 0x%x  speed %u\n"
            "  duplex %d  port %d  phy_address %d  transceiver %d\n"
            "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
@@ -325,18 +325,17 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         line_speed = 10000;
 
                 if (bp->common.bc_ver < REQ_BC_VER_4_SET_MF_BW) {
-                        BNX2X_DEV_INFO("To set speed BC %X or higher "
-                                       "is required, please upgrade BC\n",
-                                       REQ_BC_VER_4_SET_MF_BW);
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "To set speed BC %X or higher is required, please upgrade BC\n",
+                           REQ_BC_VER_4_SET_MF_BW);
                         return -EINVAL;
                 }
 
                 part = (speed * 100) / line_speed;
 
                 if (line_speed < speed || !part) {
-                        BNX2X_DEV_INFO("Speed setting should be in a range "
-                                       "from 1%% to 100%% "
-                                       "of actual line speed\n");
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Speed setting should be in a range from 1%% to 100%% of actual line speed\n");
                         return -EINVAL;
                 }
 
@@ -358,7 +357,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 if (!(bp->port.supported[0] & SUPPORTED_TP ||
                       bp->port.supported[1] & SUPPORTED_TP)) {
-                        DP(NETIF_MSG_LINK, "Unsupported port type\n");
+                        DP(BNX2X_MSG_ETHTOOL, "Unsupported port type\n");
                         return -EINVAL;
                 }
                 bp->link_params.multi_phy_config &=
@@ -378,7 +377,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 if (!(bp->port.supported[0] & SUPPORTED_FIBRE ||
                       bp->port.supported[1] & SUPPORTED_FIBRE)) {
-                        DP(NETIF_MSG_LINK, "Unsupported port type\n");
+                        DP(BNX2X_MSG_ETHTOOL, "Unsupported port type\n");
                         return -EINVAL;
                 }
                 bp->link_params.multi_phy_config &=
@@ -392,7 +391,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         PORT_HW_CFG_PHY_SELECTION_SECOND_PHY;
                 break;
         default:
-                DP(NETIF_MSG_LINK, "Unsupported port type\n");
+                DP(BNX2X_MSG_ETHTOOL, "Unsupported port type\n");
                 return -EINVAL;
         }
         /* Save new config in case command complete successully */
@@ -401,7 +400,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         cfg_idx = bnx2x_get_link_cfg_idx(bp);
         /* Restore old config in case command failed */
         bp->link_params.multi_phy_config = old_multi_phy_config;
-        DP(NETIF_MSG_LINK, "cfg_idx = %x\n", cfg_idx);
+        DP(BNX2X_MSG_ETHTOOL, "cfg_idx = %x\n", cfg_idx);
 
         if (cmd->autoneg == AUTONEG_ENABLE) {
                 u32 an_supported_speed = bp->port.supported[cfg_idx];
@@ -410,14 +409,14 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         an_supported_speed |= (SUPPORTED_100baseT_Half |
                                                SUPPORTED_100baseT_Full);
                 if (!(bp->port.supported[cfg_idx] & SUPPORTED_Autoneg)) {
-                        DP(NETIF_MSG_LINK, "Autoneg not supported\n");
+                        DP(BNX2X_MSG_ETHTOOL, "Autoneg not supported\n");
                         return -EINVAL;
                 }
 
                 /* advertise the requested speed and duplex if supported */
                 if (cmd->advertising & ~an_supported_speed) {
-                        DP(NETIF_MSG_LINK, "Advertisement parameters "
-                                           "are not supported\n");
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Advertisement parameters are not supported\n");
                         return -EINVAL;
                 }
 
@@ -466,7 +465,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         if (cmd->duplex == DUPLEX_FULL) {
                                 if (!(bp->port.supported[cfg_idx] &
                                       SUPPORTED_10baseT_Full)) {
-                                        DP(NETIF_MSG_LINK,
+                                        DP(BNX2X_MSG_ETHTOOL,
                                            "10M full not supported\n");
                                         return -EINVAL;
                                 }
@@ -476,7 +475,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         } else {
                                 if (!(bp->port.supported[cfg_idx] &
                                       SUPPORTED_10baseT_Half)) {
-                                        DP(NETIF_MSG_LINK,
+                                        DP(BNX2X_MSG_ETHTOOL,
                                            "10M half not supported\n");
                                         return -EINVAL;
                                 }
@@ -490,7 +489,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         if (cmd->duplex == DUPLEX_FULL) {
                                 if (!(bp->port.supported[cfg_idx] &
                                                 SUPPORTED_100baseT_Full)) {
-                                        DP(NETIF_MSG_LINK,
+                                        DP(BNX2X_MSG_ETHTOOL,
                                            "100M full not supported\n");
                                         return -EINVAL;
                                 }
@@ -500,7 +499,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         } else {
                                 if (!(bp->port.supported[cfg_idx] &
                                                 SUPPORTED_100baseT_Half)) {
-                                        DP(NETIF_MSG_LINK,
+                                        DP(BNX2X_MSG_ETHTOOL,
                                            "100M half not supported\n");
                                         return -EINVAL;
                                 }
@@ -512,13 +511,15 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 case SPEED_1000:
                         if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK, "1G half not supported\n");
+                                DP(BNX2X_MSG_ETHTOOL,
+                                   "1G half not supported\n");
                                 return -EINVAL;
                         }
 
                         if (!(bp->port.supported[cfg_idx] &
                               SUPPORTED_1000baseT_Full)) {
-                                DP(NETIF_MSG_LINK, "1G full not supported\n");
+                                DP(BNX2X_MSG_ETHTOOL,
+                                   "1G full not supported\n");
                                 return -EINVAL;
                         }
 
@@ -528,14 +529,14 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 case SPEED_2500:
                         if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK,
+                                DP(BNX2X_MSG_ETHTOOL,
                                    "2.5G half not supported\n");
                                 return -EINVAL;
                         }
 
                         if (!(bp->port.supported[cfg_idx]
                               & SUPPORTED_2500baseX_Full)) {
-                                DP(NETIF_MSG_LINK,
+                                DP(BNX2X_MSG_ETHTOOL,
                                    "2.5G full not supported\n");
                                 return -EINVAL;
                         }
@@ -546,13 +547,15 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 case SPEED_10000:
                         if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK, "10G half not supported\n");
+                                DP(BNX2X_MSG_ETHTOOL,
+                                   "10G half not supported\n");
                                 return -EINVAL;
                         }
 
                         if (!(bp->port.supported[cfg_idx]
                               & SUPPORTED_10000baseT_Full)) {
-                                DP(NETIF_MSG_LINK, "10G full not supported\n");
+                                DP(BNX2X_MSG_ETHTOOL,
+                                   "10G full not supported\n");
                                 return -EINVAL;
                         }
 
@@ -561,7 +564,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         break;
 
                 default:
-                        DP(NETIF_MSG_LINK, "Unsupported speed %u\n", speed);
+                        DP(BNX2X_MSG_ETHTOOL, "Unsupported speed %u\n", speed);
                         return -EINVAL;
                 }
 
@@ -570,7 +573,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 bp->port.advertising[cfg_idx] = advertising;
         }
 
-        DP(NETIF_MSG_LINK, "req_line_speed %d\n"
+        DP(BNX2X_MSG_ETHTOOL, "req_line_speed %d\n"
            "  req_duplex %d  advertising 0x%x\n",
            bp->link_params.req_line_speed[cfg_idx],
            bp->link_params.req_duplex[cfg_idx],
@@ -850,13 +853,16 @@ static int bnx2x_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct bnx2x *bp = netdev_priv(dev);
 
-        if (wol->wolopts & ~WAKE_MAGIC)
+        if (wol->wolopts & ~WAKE_MAGIC) {
+                DP(BNX2X_MSG_ETHTOOL, "WOL not supproted\n");
                 return -EINVAL;
+        }
 
         if (wol->wolopts & WAKE_MAGIC) {
-                if (bp->flags & NO_WOL_FLAG)
+                if (bp->flags & NO_WOL_FLAG) {
+                        DP(BNX2X_MSG_ETHTOOL, "WOL not supproted\n");
                         return -EINVAL;
-
+                }
                 bp->wol = 1;
         } else
                 bp->wol = 0;
@@ -955,7 +961,8 @@ static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
         }
 
         if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))) {
-                DP(BNX2X_MSG_NVM, "cannot get access to nvram interface\n");
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot get access to nvram interface\n");
                 return -EBUSY;
         }
 
@@ -986,7 +993,8 @@ static int bnx2x_release_nvram_lock(struct bnx2x *bp)
         }
 
         if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)) {
-                DP(BNX2X_MSG_NVM, "cannot free access to nvram interface\n");
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot free access to nvram interface\n");
                 return -EBUSY;
         }
 
@@ -1060,7 +1068,9 @@ static int bnx2x_nvram_read_dword(struct bnx2x *bp, u32 offset, __be32 *ret_val,
                         break;
                 }
         }
-
+        if (rc == -EBUSY)
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "nvram read timeout expired\n");
         return rc;
 }
 
@@ -1072,15 +1082,15 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
         __be32 val;
 
         if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-                DP(BNX2X_MSG_NVM,
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
                    offset, buf_size);
                 return -EINVAL;
         }
 
         if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "Invalid parameter: offset (0x%x) + buf_size (0x%x) > flash_size (0x%x)\n",
                    offset, buf_size, bp->common.flash_size);
                 return -EINVAL;
         }
@@ -1125,10 +1135,13 @@ static int bnx2x_get_eeprom(struct net_device *dev,
         struct bnx2x *bp = netdev_priv(dev);
         int rc;
 
-        if (!netif_running(dev))
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
+        }
 
-        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
            "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
            eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
            eeprom->len, eeprom->len);
@@ -1177,6 +1190,9 @@ static int bnx2x_nvram_write_dword(struct bnx2x *bp, u32 offset, u32 val,
                 }
         }
 
+        if (rc == -EBUSY)
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "nvram write timeout expired\n");
         return rc;
 }
 
@@ -1191,8 +1207,8 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
         __be32 val;
 
         if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "Invalid parameter: offset (0x%x) + buf_size (0x%x) > flash_size (0x%x)\n",
                    offset, buf_size, bp->common.flash_size);
                 return -EINVAL;
         }
@@ -1240,15 +1256,15 @@ static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf,
                 return bnx2x_nvram_write1(bp, offset, data_buf, buf_size);
 
         if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-                DP(BNX2X_MSG_NVM,
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
                    offset, buf_size);
                 return -EINVAL;
         }
 
         if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "Invalid parameter: offset (0x%x) + buf_size (0x%x) > flash_size (0x%x)\n",
                    offset, buf_size, bp->common.flash_size);
                 return -EINVAL;
         }
@@ -1296,10 +1312,13 @@ static int bnx2x_set_eeprom(struct net_device *dev,
         int port = BP_PORT(bp);
         int rc = 0;
         u32 ext_phy_config;
-        if (!netif_running(dev))
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
+        }
 
-        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
            "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
            eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
            eeprom->len, eeprom->len);
@@ -1308,8 +1327,11 @@ static int bnx2x_set_eeprom(struct net_device *dev,
 
         /* PHY eeprom can be accessed only by the PMF */
         if ((eeprom->magic >= 0x50485900) && (eeprom->magic <= 0x504859FF) &&
-            !bp->port.pmf)
+            !bp->port.pmf) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "wrong magic or interface is not pmf\n");
                 return -EINVAL;
+        }
 
         ext_phy_config =
                 SHMEM_RD(bp,
@@ -1421,8 +1443,8 @@ static int bnx2x_set_ringparam(struct net_device *dev,
         struct bnx2x *bp = netdev_priv(dev);
 
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                netdev_err(dev, "Handling parity error recovery. "
-                                "Try again later\n");
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Handling parity error recovery. Try again later\n");
                 return -EAGAIN;
         }
 
@@ -1430,8 +1452,10 @@ static int bnx2x_set_ringparam(struct net_device *dev,
             (ering->rx_pending < (bp->disable_tpa ? MIN_RX_SIZE_NONTPA :
                                                     MIN_RX_SIZE_TPA)) ||
             (ering->tx_pending > MAX_TX_AVAIL) ||
-            (ering->tx_pending <= MAX_SKB_FRAGS + 4))
+            (ering->tx_pending <= MAX_SKB_FRAGS + 4)) {
+                DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EINVAL;
+        }
 
         bp->rx_ring_size = ering->rx_pending;
         bp->tx_ring_size = ering->tx_pending;
@@ -1459,7 +1483,7 @@ static void bnx2x_get_pauseparam(struct net_device *dev,
         epause->tx_pause = ((cfg_reg & BNX2X_FLOW_CTRL_TX) ==
                             BNX2X_FLOW_CTRL_TX);
 
-        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL, "ethtool_pauseparam: cmd %d\n"
            "  autoneg %d  rx_pause %d  tx_pause %d\n",
            epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
 }
@@ -1472,7 +1496,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
         if (IS_MF(bp))
                 return 0;
 
-        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
+        DP(BNX2X_MSG_ETHTOOL, "ethtool_pauseparam: cmd %d\n"
            "  autoneg %d  rx_pause %d  tx_pause %d\n",
            epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
 
@@ -1489,7 +1513,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
 
         if (epause->autoneg) {
                 if (!(bp->port.supported[cfg_idx] & SUPPORTED_Autoneg)) {
-                        DP(NETIF_MSG_LINK, "autoneg not supported\n");
+                        DP(BNX2X_MSG_ETHTOOL, "autoneg not supported\n");
                         return -EINVAL;
                 }
 
@@ -1499,7 +1523,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
                 }
         }
 
-        DP(NETIF_MSG_LINK,
+        DP(BNX2X_MSG_ETHTOOL,
            "req_flow_ctrl 0x%x\n", bp->link_params.req_flow_ctrl[cfg_idx]);
 
         if (netif_running(dev)) {
@@ -1631,8 +1655,11 @@ static int bnx2x_test_registers(struct bnx2x *bp)
                 { BNX2X_CHIP_MASK_ALL, 0xffffffff, 0, 0x00000000 }
         };
 
-        if (!netif_running(bp->dev))
+        if (!netif_running(bp->dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return rc;
+        }
 
         if (CHIP_IS_E1(bp))
                 hw = BNX2X_CHIP_MASK_E1;
@@ -1677,7 +1704,7 @@ static int bnx2x_test_registers(struct bnx2x *bp)
 
                         /* verify value is as expected */
                         if ((val & mask) != (wr_val & mask)) {
-                                DP(NETIF_MSG_HW,
+                                DP(BNX2X_MSG_ETHTOOL,
                                    "offset 0x%x: val 0x%x != 0x%x mask 0x%x\n",
                                    offset, val, wr_val, mask);
                                 goto test_reg_exit;
@@ -1731,8 +1758,11 @@ static int bnx2x_test_memory(struct bnx2x *bp)
                 { NULL, 0xffffffff, {0, 0, 0, 0} }
         };
 
-        if (!netif_running(bp->dev))
+        if (!netif_running(bp->dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return rc;
+        }
 
         if (CHIP_IS_E1(bp))
                 index = BNX2X_CHIP_E1_OFST;
@@ -1747,7 +1777,7 @@ static int bnx2x_test_memory(struct bnx2x *bp)
         for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {
                 val = REG_RD(bp, prty_tbl[i].offset);
                 if (val & ~(prty_tbl[i].hw_mask[index])) {
-                        DP(NETIF_MSG_HW,
+                        DP(BNX2X_MSG_ETHTOOL,
                            "%s is 0x%x\n", prty_tbl[i].name, val);
                         goto test_mem_exit;
                 }
@@ -1762,7 +1792,7 @@ static int bnx2x_test_memory(struct bnx2x *bp)
         for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {
                 val = REG_RD(bp, prty_tbl[i].offset);
                 if (val & ~(prty_tbl[i].hw_mask[index])) {
-                        DP(NETIF_MSG_HW,
+                        DP(BNX2X_MSG_ETHTOOL,
                            "%s is 0x%x\n", prty_tbl[i].name, val);
                         goto test_mem_exit;
                 }
@@ -1783,7 +1813,7 @@ static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up, u8 is_serdes)
                         msleep(20);
 
                 if (cnt <= 0 && bnx2x_link_test(bp, is_serdes))
-                        DP(NETIF_MSG_LINK, "Timeout waiting for link up\n");
+                        DP(BNX2X_MSG_ETHTOOL, "Timeout waiting for link up\n");
         }
 }
 
@@ -1833,6 +1863,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
                 bnx2x_phy_init(&bp->link_params, &bp->link_vars);
                 break;
         default:
+                DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EINVAL;
         }
 
@@ -1841,6 +1872,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
                      bp->dev->mtu : ETH_MAX_PACKET_SIZE) + ETH_HLEN);
         skb = netdev_alloc_skb(bp->dev, fp_rx->rx_buf_size);
         if (!skb) {
+                DP(BNX2X_MSG_ETHTOOL, "Can't allocate skb\n");
                 rc = -ENOMEM;
                 goto test_loopback_exit;
         }
@@ -1855,7 +1887,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
         if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                 rc = -ENOMEM;
                 dev_kfree_skb(skb);
-                BNX2X_ERR("Unable to map SKB\n");
+                DP(BNX2X_MSG_ETHTOOL, "Unable to map SKB\n");
                 goto test_loopback_exit;
         }
 
@@ -1985,13 +2017,13 @@ static int bnx2x_test_loopback(struct bnx2x *bp)
 
         res = bnx2x_run_loopback(bp, BNX2X_PHY_LOOPBACK);
         if (res) {
-                DP(NETIF_MSG_PROBE, "  PHY loopback failed  (res %d)\n", res);
+                DP(BNX2X_MSG_ETHTOOL, "  PHY loopback failed  (res %d)\n", res);
                 rc |= BNX2X_PHY_LOOPBACK_FAILED;
         }
 
         res = bnx2x_run_loopback(bp, BNX2X_MAC_LOOPBACK);
         if (res) {
-                DP(NETIF_MSG_PROBE, "  MAC loopback failed  (res %d)\n", res);
+                DP(BNX2X_MSG_ETHTOOL, "  MAC loopback failed  (res %d)\n", res);
                 rc |= BNX2X_MAC_LOOPBACK_FAILED;
         }
 
@@ -2027,7 +2059,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 
         buf = kmalloc(0x350, GFP_KERNEL);
         if (!buf) {
-                DP(NETIF_MSG_PROBE, "kmalloc failed\n");
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "kmalloc failed\n");
                 rc = -ENOMEM;
                 goto test_nvram_exit;
         }
@@ -2035,13 +2067,15 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 
         rc = bnx2x_nvram_read(bp, 0, data, 4);
         if (rc) {
-                DP(NETIF_MSG_PROBE, "magic value read (rc %d)\n", rc);
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "magic value read (rc %d)\n", rc);
                 goto test_nvram_exit;
         }
 
         magic = be32_to_cpu(buf[0]);
         if (magic != 0x669955aa) {
-                DP(NETIF_MSG_PROBE, "magic value (0x%08x)\n", magic);
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "wrong magic value (0x%08x)\n", magic);
                 rc = -ENODEV;
                 goto test_nvram_exit;
         }
@@ -2051,15 +2085,15 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
                 rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
                                       nvram_tbl[i].size);
                 if (rc) {
-                        DP(NETIF_MSG_PROBE,
+                        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                            "nvram_tbl[%d] read data (rc %d)\n", i, rc);
                         goto test_nvram_exit;
                 }
 
                 crc = ether_crc_le(nvram_tbl[i].size, data);
                 if (crc != CRC32_RESIDUAL) {
-                        DP(NETIF_MSG_PROBE,
-                           "nvram_tbl[%d] crc value (0x%08x)\n", i, crc);
+                        DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                           "nvram_tbl[%d] wrong crc value (0x%08x)\n", i, crc);
                         rc = -ENODEV;
                         goto test_nvram_exit;
                 }
@@ -2075,8 +2109,11 @@ static int bnx2x_test_intr(struct bnx2x *bp)
 {
         struct bnx2x_queue_state_params params = {0};
 
-        if (!netif_running(bp->dev))
+        if (!netif_running(bp->dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return -ENODEV;
+        }
 
         params.q_obj = &bp->fp->q_obj;
         params.cmd = BNX2X_Q_CMD_EMPTY;
@@ -2092,8 +2129,8 @@ static void bnx2x_self_test(struct net_device *dev,
         struct bnx2x *bp = netdev_priv(dev);
         u8 is_serdes;
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                netdev_err(bp->dev, "Handling parity error recovery. "
-                                    "Try again later\n");
+                netdev_err(bp->dev,
+                           "Handling parity error recovery. Try again later\n");
                 etest->flags |= ETH_TEST_FL_FAILED;
                 return;
         }
@@ -2306,11 +2343,16 @@ static int bnx2x_set_phys_id(struct net_device *dev,
 {
         struct bnx2x *bp = netdev_priv(dev);
 
-        if (!netif_running(dev))
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
+        }
 
-        if (!bp->port.pmf)
+        if (!bp->port.pmf) {
+                DP(BNX2X_MSG_ETHTOOL, "Interface is not pmf\n");
                 return -EOPNOTSUPP;
+        }
 
         switch (state) {
         case ETHTOOL_ID_ACTIVE:
@@ -2347,6 +2389,7 @@ static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
                 return 0;
 
         default:
+                DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EOPNOTSUPP;
         }
 }