net/bnxt: fix coding style

[dpdk.git] / drivers / net / bnxt / bnxt_cpr.c

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 1b046bb..118cf03 100644 (file)
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -5,13 +5,47 @@
 
 #include <rte_malloc.h>
 #include <rte_alarm.h>
+#include <rte_cycles.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
 #include "hsi_struct_def_dpdk.h"
 
+void bnxt_wait_for_device_shutdown(struct bnxt *bp)
+{
+       uint32_t val, timeout;
+
+       /* if HWRM_FUNC_QCAPS_OUTPUT_FLAGS_ERR_RECOVER_RELOAD is set
+        * in HWRM_FUNC_QCAPS command, wait for FW_STATUS to set
+        * the SHUTDOWN bit in health register
+        */
+       if (!(bp->recovery_info &&
+             (bp->flags & BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD)))
+               return;
+
+       /* Driver has to wait for fw_reset_max_msecs or shutdown bit which comes
+        * first for FW to collect crash dump.
+        */
+       timeout = bp->fw_reset_max_msecs;
+
+       /* Driver has to poll for shutdown bit in fw_status register
+        *
+        * 1. in case of hot fw upgrade, this bit will be set after all
+        *    function drivers unregistered with fw.
+        * 2. in case of fw initiated error recovery, this bit will be
+        *    set after fw has collected the core dump
+        */
+       do {
+               val = bnxt_read_fw_status_reg(bp, BNXT_FW_STATUS_REG);
+               if (val & BNXT_FW_STATUS_SHUTDOWN)
+                       return;
+
+               rte_delay_ms(100);
+               timeout -= 100;
+       } while (timeout);
+}
+
 /*
  * Async event handling
  */
@@ -31,7 +65,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
        case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE:
        case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE:
                /* FALLTHROUGH */
-               bnxt_link_update_op(bp->eth_dev, 1);
+               bnxt_link_update_op(bp->eth_dev, 0);
                break;
        case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD:
                PMD_DRV_LOG(INFO, "Async event: PF driver unloaded\n");
@@ -90,9 +124,19 @@ void bnxt_handle_async_event(struct bnxt *bp,
                PMD_DRV_LOG(INFO, "recovery enabled(%d), master function(%d)\n",
                            bnxt_is_recovery_enabled(bp),
                            bnxt_is_master_func(bp));
+
+               if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED)
+                       return;
+
+               info->last_heart_beat =
+                       bnxt_read_fw_status_reg(bp, BNXT_FW_HEARTBEAT_CNT_REG);
+               info->last_reset_counter =
+                       bnxt_read_fw_status_reg(bp, BNXT_FW_RECOVERY_CNT_REG);
+
+               bnxt_schedule_fw_health_check(bp);
                break;
        default:
-               PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id);
+               PMD_DRV_LOG(DEBUG, "handle_async_event id = 0x%x\n", event_id);
                break;
        }
 }
@@ -209,7 +253,7 @@ int bnxt_event_hwrm_resp_handler(struct bnxt *bp, struct cmpl_base *cmp)
                break;
        default:
                /* Ignore any other events */
-               PMD_DRV_LOG(INFO, "Ignoring %02x completion\n", CMP_TYPE(cmp));
+               PMD_DRV_LOG(DEBUG, "Ignoring %02x completion\n", CMP_TYPE(cmp));
                break;
        }