sfc: improve PTP error reporting

Log a message if PTP probing fails; if we then, unexpectedly, get PTP
 events, only log a message for the first one on each device.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index dcd6be14a430..009bf28bdba5 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -747,7 +747,14 @@ static int efx_ef10_probe(struct efx_nic *efx)
         if (rc && rc != -EPERM)
                 goto fail5;
 
-        efx_ptp_probe(efx, NULL);
+        rc = efx_ptp_probe(efx, NULL);
+        /* Failure to probe PTP is not fatal.
+         * In the case of EPERM, efx_ptp_probe will print its own message (in
+         * efx_ptp_get_attributes()), so we don't need to.
+         */
+        if (rc && rc != -EPERM)
+                netif_warn(efx, drv, efx->net_dev,
+                           "Failed to probe PTP, rc=%d\n", rc);
 
 #ifdef CONFIG_SFC_SRIOV
         if ((efx->pci_dev->physfn) && (!efx->pci_dev->is_physfn)) {
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 2e41f2c39c4a..6b8730a24513 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -813,6 +813,7 @@ struct vfdi_status;
  * @vf_init_count: Number of VFs that have been fully initialised.
  * @vi_scale: log2 number of vnics per VF.
  * @ptp_data: PTP state data
+ * @ptp_warned: has this NIC seen and warned about unexpected PTP events?
  * @vpd_sn: Serial number read from VPD
  * @monitor_work: Hardware monitor workitem
  * @biu_lock: BIU (bus interface unit) lock
@@ -968,6 +969,7 @@ struct efx_nic {
 #endif
 
         struct efx_ptp_data *ptp_data;
+        bool ptp_warned;
 
         char *vpd_sn;
 
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index caa89bf7603e..3b37d7ded3c4 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -1662,9 +1662,11 @@ void efx_ptp_event(struct efx_nic *efx, efx_qword_t *ev)
         int code = EFX_QWORD_FIELD(*ev, MCDI_EVENT_CODE);
 
         if (!ptp) {
-                if (net_ratelimit())
+                if (!efx->ptp_warned) {
                         netif_warn(efx, drv, efx->net_dev,
                                    "Received PTP event but PTP not set up\n");
+                        efx->ptp_warned = true;
+                }
                 return;
         }