net/bnxt: handle error recovery FW event

1. Advertise HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ERROR_RECOVERY_SUPPORT flag
   in the FUNC_DRV_RGTR command.
2. request for the async event ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY
   in the FUNC_DRV_RGTR command.
3. handle the async event EVENT_ID_ERROR_RECOVERY from FW.

Error recovery support will be used by firmware only if all the driver
instances support error recovery process.

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index ac2bf158dd1a2b777445e1f2ec08de9774aef8e4..ea556d07922a925b6bcb9bc14c0e2628aea7e2c9 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -365,6 +365,8 @@ struct bnxt_error_recovery_info {
        uint8_t         delay_after_reset[BNXT_NUM_RESET_REG];
 #define BNXT_FLAG_ERROR_RECOVERY_HOST  (1 << 0)
 #define BNXT_FLAG_ERROR_RECOVERY_CO_CPU        (1 << 1)
+#define BNXT_FLAG_MASTER_FUNC          (1 << 2)
+#define BNXT_FLAG_RECOVERY_ENABLED     (1 << 3)
        uint32_t        flags;
 };
 

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 3afb9902b0d24e3b1610d4abe4c1d5c6737cb003..1b046bbfacc11e61639c49c5f1be731b89287626 100644 (file)
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -21,6 +21,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
        struct hwrm_async_event_cmpl *async_cmp =
                                (struct hwrm_async_event_cmpl *)cmp;
        uint16_t event_id = rte_le_to_cpu_16(async_cmp->event_id);
+       struct bnxt_error_recovery_info *info;
        uint32_t event_data;
 
        /* TODO: HWRM async events are not defined yet */
@@ -65,6 +66,31 @@ void bnxt_handle_async_event(struct bnxt *bp,
                rte_eal_alarm_set(US_PER_MS, bnxt_dev_reset_and_resume,
                                  (void *)bp);
                break;
+       case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY:
+               info = bp->recovery_info;
+
+               if (!info)
+                       return;
+
+               PMD_DRV_LOG(INFO, "Error recovery async event received\n");
+
+               event_data = rte_le_to_cpu_32(async_cmp->event_data1) &
+                               EVENT_DATA1_FLAGS_MASK;
+
+               if (event_data & EVENT_DATA1_FLAGS_MASTER_FUNC)
+                       info->flags |= BNXT_FLAG_MASTER_FUNC;
+               else
+                       info->flags &= ~BNXT_FLAG_MASTER_FUNC;
+
+               if (event_data & EVENT_DATA1_FLAGS_RECOVERY_ENABLED)
+                       info->flags |= BNXT_FLAG_RECOVERY_ENABLED;
+               else
+                       info->flags &= ~BNXT_FLAG_RECOVERY_ENABLED;
+
+               PMD_DRV_LOG(INFO, "recovery enabled(%d), master function(%d)\n",
+                           bnxt_is_recovery_enabled(bp),
+                           bnxt_is_master_func(bp));
+               break;
        default:
                PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id);
                break;
@@ -189,3 +215,22 @@ int bnxt_event_hwrm_resp_handler(struct bnxt *bp, struct cmpl_base *cmp)
 
        return evt;
 }
+
+bool bnxt_is_master_func(struct bnxt *bp)
+{
+       if (bp->recovery_info->flags & BNXT_FLAG_MASTER_FUNC)
+               return true;
+
+       return false;
+}
+
+bool bnxt_is_recovery_enabled(struct bnxt *bp)
+{
+       struct bnxt_error_recovery_info *info;
+
+       info = bp->recovery_info;
+       if (info && (info->flags & BNXT_FLAG_RECOVERY_ENABLED))
+               return true;
+
+       return false;
+}

diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index b61bafa0e8cbe83d417d95c3b7c450c7b222d2a4..f118bda36e7a0bdb2e5a8fdfcee654a73413a06b 100644 (file)
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -113,4 +113,16 @@ void bnxt_dev_reset_and_resume(void *arg);
 #define EVENT_DATA1_REASON_CODE_MASK                   \
        HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK
 
+#define EVENT_DATA1_FLAGS_MASK                         \
+       HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASK
+
+#define EVENT_DATA1_FLAGS_MASTER_FUNC                  \
+       HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC
+
+#define EVENT_DATA1_FLAGS_RECOVERY_ENABLED             \
+       HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED
+
+bool bnxt_is_recovery_enabled(struct bnxt *bp);
+bool bnxt_is_master_func(struct bnxt *bp);
+
 #endif

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 34672dfb00ff32533c4d5ffc3a899b7d3f3d3533..c7d6f9fdc41a6f8af0aabd7cff25887d84588235 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -689,6 +689,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
                return 0;
 
        flags = HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_HOT_RESET_SUPPORT;
+       if (bp->flags & BNXT_FLAG_FW_CAP_ERROR_RECOVERY)
+               flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ERROR_RECOVERY_SUPPORT;
 
        /* PFs and trusted VFs should indicate the support of the
         * Master capability on non Stingray platform
@@ -726,6 +728,9 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
                                 ASYNC_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED |
                                 ASYNC_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE |
                                 ASYNC_CMPL_EVENT_ID_RESET_NOTIFY);
+       if (bp->flags & BNXT_FLAG_FW_CAP_ERROR_RECOVERY)
+               req.async_event_fwd[0] |=
+                       rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_ERROR_RECOVERY);
        req.async_event_fwd[1] |=
                rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_PF_DRVR_UNLOAD |
                                 ASYNC_CMPL_EVENT_ID_VF_CFG_CHANGE);

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index c332c129dd48b8dac52f418e54c76a7ca59ee210..44e335507552597a24e30246a3b69ad7109311bc 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -23,6 +23,8 @@ struct bnxt_cp_ring_info;
        (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE)
 #define ASYNC_CMPL_EVENT_ID_RESET_NOTIFY \
        (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY)
+#define ASYNC_CMPL_EVENT_ID_ERROR_RECOVERY \
+       (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY)
 #define ASYNC_CMPL_EVENT_ID_PF_DRVR_UNLOAD     \
        (1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD - 32))
 #define ASYNC_CMPL_EVENT_ID_VF_CFG_CHANGE      \