sfc: Implement message level control

Replace EFX_ERR() with netif_err(), EFX_INFO() with netif_info(),
EFX_LOG() with netif_dbg() and EFX_TRACE() and EFX_REGDUMP() with
netif_vdbg().

Replace EFX_ERR_RL(), EFX_INFO_RL() and EFX_LOG_RL() using explicit
calls to net_ratelimit().

Implement the ethtool operations to get and set message level flags,
and add a 'debug' module parameter for the initial value.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 23 insertions, 16 deletions

diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index 0548fcbbdcd0..eeaf0bd64bd3 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -63,7 +63,8 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
                 /* Read MMD STATUS2 to check it is responding. */
                 status = efx_mdio_read(efx, mmd, MDIO_STAT2);
                 if ((status & MDIO_STAT2_DEVPRST) != MDIO_STAT2_DEVPRST_VAL) {
-                        EFX_ERR(efx, "PHY MMD %d not responding.\n", mmd);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "PHY MMD %d not responding.\n", mmd);
                         return -EIO;
                 }
         }
@@ -72,12 +73,14 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
         status = efx_mdio_read(efx, mmd, MDIO_STAT1);
         if (status & MDIO_STAT1_FAULT) {
                 if (fault_fatal) {
-                        EFX_ERR(efx, "PHY MMD %d reporting fatal"
-                                " fault: status %x\n", mmd, status);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "PHY MMD %d reporting fatal"
+                                  " fault: status %x\n", mmd, status);
                         return -EIO;
                 } else {
-                        EFX_LOG(efx, "PHY MMD %d reporting status"
-                                " %x (expected)\n", mmd, status);
+                        netif_dbg(efx, hw, efx->net_dev,
+                                  "PHY MMD %d reporting status"
+                                  " %x (expected)\n", mmd, status);
                 }
         }
         return 0;
@@ -103,8 +106,9 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
                         if (mask & 1) {
                                 stat = efx_mdio_read(efx, mmd, MDIO_CTRL1);
                                 if (stat < 0) {
-                                        EFX_ERR(efx, "failed to read status of"
-                                                " MMD %d\n", mmd);
+                                        netif_err(efx, hw, efx->net_dev,
+                                                  "failed to read status of"
+                                                  " MMD %d\n", mmd);
                                         return -EIO;
                                 }
                                 if (stat & MDIO_CTRL1_RESET)
@@ -119,8 +123,9 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
                 msleep(spintime);
         }
         if (in_reset != 0) {
-                EFX_ERR(efx, "not all MMDs came out of reset in time."
-                        " MMDs still in reset: %x\n", in_reset);
+                netif_err(efx, hw, efx->net_dev,
+                          "not all MMDs came out of reset in time."
+                          " MMDs still in reset: %x\n", in_reset);
                 rc = -ETIMEDOUT;
         }
         return rc;
@@ -142,16 +147,18 @@ int efx_mdio_check_mmds(struct efx_nic *efx,
         devs1 = efx_mdio_read(efx, probe_mmd, MDIO_DEVS1);
         devs2 = efx_mdio_read(efx, probe_mmd, MDIO_DEVS2);
         if (devs1 < 0 || devs2 < 0) {
-                EFX_ERR(efx, "failed to read devices present\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "failed to read devices present\n");
                 return -EIO;
         }
         devices = devs1 | (devs2 << 16);
         if ((devices & mmd_mask) != mmd_mask) {
-                EFX_ERR(efx, "required MMDs not present: got %x, "
-                        "wanted %x\n", devices, mmd_mask);
+                netif_err(efx, hw, efx->net_dev,
+                          "required MMDs not present: got %x, wanted %x\n",
+                          devices, mmd_mask);
                 return -ENODEV;
         }
-        EFX_TRACE(efx, "Devices present: %x\n", devices);
+        netif_vdbg(efx, hw, efx->net_dev, "Devices present: %x\n", devices);
 
         /* Check all required MMDs are responding and happy. */
         while (mmd_mask) {
@@ -219,7 +226,7 @@ static void efx_mdio_set_mmd_lpower(struct efx_nic *efx,
 {
         int stat = efx_mdio_read(efx, mmd, MDIO_STAT1);
 
-        EFX_TRACE(efx, "Setting low power mode for MMD %d to %d\n",
+        netif_vdbg(efx, drv, efx->net_dev, "Setting low power mode for MMD %d to %d\n",
                   mmd, lpower);
 
         if (stat & MDIO_STAT1_LPOWERABLE) {
@@ -349,8 +356,8 @@ int efx_mdio_test_alive(struct efx_nic *efx)
 
         if ((physid1 == 0x0000) || (physid1 == 0xffff) ||
             (physid2 == 0x0000) || (physid2 == 0xffff)) {
-                EFX_ERR(efx, "no MDIO PHY present with ID %d\n",
-                        efx->mdio.prtad);
+                netif_err(efx, hw, efx->net_dev,
+                          "no MDIO PHY present with ID %d\n", efx->mdio.prtad);
                 rc = -EINVAL;
         } else {
                 rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);