bnxt_en: Let bnxt_stamp_tx_skb() return error code

Change the function bnxt_stamp_tx_skb() to return 0 for suceess
or -EAGAIN if the timestamp is still pending in firmware.  The
calling PTP aux worker will reschedule based on the return code.

Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
index baf191959b13f731be209a415a973306e7a2e385..bd1e270307ecb0f1d973f384b57f4bde0b347072 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
@@ -683,7 +683,7 @@ static u64 bnxt_cc_read(const struct cyclecounter *cc)
        return ns;
 }
 
-static void bnxt_stamp_tx_skb(struct bnxt *bp, struct sk_buff *skb)
+static int bnxt_stamp_tx_skb(struct bnxt *bp, struct sk_buff *skb)
 {
        struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
        struct skb_shared_hwtstamps timestamp;
@@ -711,7 +711,7 @@ static void bnxt_stamp_tx_skb(struct bnxt *bp, struct sk_buff *skb)
        } else {
                if (!time_after_eq(jiffies, txts_req->abs_txts_tmo)) {
                        txts_req->txts_pending = true;
-                       return;
+                       return -EAGAIN;
                }
                ptp->stats.ts_lost++;
                netdev_warn_once(bp->dev,
@@ -722,6 +722,8 @@ static void bnxt_stamp_tx_skb(struct bnxt *bp, struct sk_buff *skb)
        txts_req->tx_skb = NULL;
        atomic_inc(&ptp->tx_avail);
        txts_req->txts_pending = false;
+
+       return 0;
 }
 
 static long bnxt_ptp_ts_aux_work(struct ptp_clock_info *ptp_info)
@@ -730,12 +732,16 @@ static long bnxt_ptp_ts_aux_work(struct ptp_clock_info *ptp_info)
                                                ptp_info);
        unsigned long now = jiffies;
        struct bnxt *bp = ptp->bp;
+       int rc = 0;
 
        if (ptp->txts_req.tx_skb)
-               bnxt_stamp_tx_skb(bp, ptp->txts_req.tx_skb);
+               rc = bnxt_stamp_tx_skb(bp, ptp->txts_req.tx_skb);
 
-       if (!time_after_eq(now, ptp->next_period))
+       if (!time_after_eq(now, ptp->next_period)) {
+               if (rc == -EAGAIN)
+                       return 0;
                return ptp->next_period - now;
+       }
 
        bnxt_ptp_get_current_time(bp);
        ptp->next_period = now + HZ;
@@ -745,7 +751,7 @@ static long bnxt_ptp_ts_aux_work(struct ptp_clock_info *ptp_info)
                spin_unlock_bh(&ptp->ptp_lock);
                ptp->next_overflow_check = now + BNXT_PHC_OVERFLOW_PERIOD;
        }
-       if (ptp->txts_req.txts_pending)
+       if (rc == -EAGAIN)
                return 0;
        return HZ;
 }