bnxt_en: Do not read the PTP PHC during chip reset

During error recovery or hot firmware upgrade, the chip may be under
reset and the PHC register read cycles may cause completion timeouts.
Check that the chip is not under reset condition before proceeding
to read the PHC by checking the flag BNXT_STATE_IN_FW_RESET.  We also
need to take the ptp_lock before we set this flag to prevent race
conditions.

We need this logic because the PHC now will stay registered after
bnxt_close().

Reviewed-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.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 43562dd..fddf2cd 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11397,13 +11397,20 @@ static bool is_bnxt_fw_ok(struct bnxt *bp)
 static void bnxt_force_fw_reset(struct bnxt *bp)
 {
        struct bnxt_fw_health *fw_health = bp->fw_health;
+       struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
        u32 wait_dsecs;
 
        if (!test_bit(BNXT_STATE_OPEN, &bp->state) ||
            test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
                return;
 
-       set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+       if (ptp) {
+               spin_lock_bh(&ptp->ptp_lock);
+               set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+               spin_unlock_bh(&ptp->ptp_lock);
+       } else {
+               set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+       }
        bnxt_fw_reset_close(bp);
        wait_dsecs = fw_health->master_func_wait_dsecs;
        if (fw_health->master) {
@@ -11459,9 +11466,16 @@ void bnxt_fw_reset(struct bnxt *bp)
        bnxt_rtnl_lock_sp(bp);
        if (test_bit(BNXT_STATE_OPEN, &bp->state) &&
            !test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
+               struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
                int n = 0, tmo;
 
-               set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+               if (ptp) {
+                       spin_lock_bh(&ptp->ptp_lock);
+                       set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+                       spin_unlock_bh(&ptp->ptp_lock);
+               } else {
+                       set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
+               }
                if (bp->pf.active_vfs &&
                    !test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state))
                        n = bnxt_get_registered_vfs(bp);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
index d2bd4fc..49531e7 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
@@ -55,16 +55,19 @@ static int bnxt_ptp_settime(struct ptp_clock_info *ptp_info,
 }
 
 /* Caller holds ptp_lock */
-static u64 bnxt_refclk_read(struct bnxt *bp, struct ptp_system_timestamp *sts)
+static int bnxt_refclk_read(struct bnxt *bp, struct ptp_system_timestamp *sts,
+                           u64 *ns)
 {
        struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
-       u64 ns;
+
+       if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
+               return -EIO;
 
        ptp_read_system_prets(sts);
-       ns = readl(bp->bar0 + ptp->refclk_mapped_regs[0]);
+       *ns = readl(bp->bar0 + ptp->refclk_mapped_regs[0]);
        ptp_read_system_postts(sts);
-       ns |= (u64)readl(bp->bar0 + ptp->refclk_mapped_regs[1]) << 32;
-       return ns;
+       *ns |= (u64)readl(bp->bar0 + ptp->refclk_mapped_regs[1]) << 32;
+       return 0;
 }
 
 static void bnxt_ptp_get_current_time(struct bnxt *bp)
@@ -75,7 +78,7 @@ static void bnxt_ptp_get_current_time(struct bnxt *bp)
                return;
        spin_lock_bh(&ptp->ptp_lock);
        WRITE_ONCE(ptp->old_time, ptp->current_time);
-       ptp->current_time = bnxt_refclk_read(bp, NULL);
+       bnxt_refclk_read(bp, NULL, &ptp->current_time);
        spin_unlock_bh(&ptp->ptp_lock);
 }
 
@@ -108,9 +111,14 @@ static int bnxt_ptp_gettimex(struct ptp_clock_info *ptp_info,
        struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,
                                                ptp_info);
        u64 ns, cycles;
+       int rc;
 
        spin_lock_bh(&ptp->ptp_lock);
-       cycles = bnxt_refclk_read(ptp->bp, sts);
+       rc = bnxt_refclk_read(ptp->bp, sts, &cycles);
+       if (rc) {
+               spin_unlock_bh(&ptp->ptp_lock);
+               return rc;
+       }
        ns = timecounter_cyc2time(&ptp->tc, cycles);
        spin_unlock_bh(&ptp->ptp_lock);
        *ts = ns_to_timespec64(ns);
@@ -309,8 +317,10 @@ static void bnxt_unmap_ptp_regs(struct bnxt *bp)
 static u64 bnxt_cc_read(const struct cyclecounter *cc)
 {
        struct bnxt_ptp_cfg *ptp = container_of(cc, struct bnxt_ptp_cfg, cc);
+       u64 ns = 0;
 
-       return bnxt_refclk_read(ptp->bp, NULL);
+       bnxt_refclk_read(ptp->bp, NULL, &ns);
+       return ns;
 }
 
 static void bnxt_stamp_tx_skb(struct bnxt *bp, struct sk_buff *skb)
@@ -439,7 +449,7 @@ int bnxt_ptp_init(struct bnxt *bp)
        }
        if (bp->flags & BNXT_FLAG_CHIP_P5) {
                spin_lock_bh(&ptp->ptp_lock);
-               ptp->current_time = bnxt_refclk_read(bp, NULL);
+               bnxt_refclk_read(bp, NULL, &ptp->current_time);
                WRITE_ONCE(ptp->old_time, ptp->current_time);
                spin_unlock_bh(&ptp->ptp_lock);
                ptp_schedule_worker(ptp->ptp_clock, 0);