[dpdk-dev] [PATCH 08/13] net/bnxt: advertise error recovery capability and handle async event

Ajit Khaparde ajit.khaparde at broadcom.com
Thu Aug 22 07:53:55 CEST 2019


From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>

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 at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt.h      |  2 ++
 drivers/net/bnxt/bnxt_cpr.c  | 45 ++++++++++++++++++++++++++++++++++++
 drivers/net/bnxt/bnxt_cpr.h  | 12 ++++++++++
 drivers/net/bnxt/bnxt_hwrm.c |  5 ++++
 drivers/net/bnxt/bnxt_hwrm.h |  2 ++
 5 files changed, 66 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 1da09569d..f9147a9a8 100644
--- 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 6e0b1d67e..7f5b3314e 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -20,6 +20,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 */
@@ -63,6 +64,31 @@ void bnxt_handle_async_event(struct bnxt *bp,
 		bp->flags |= BNXT_FLAG_FW_RESET;
 		bnxt_dev_reset_and_resume(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;
@@ -184,3 +210,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 4e63fd12f..22fba5b40 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -113,4 +113,16 @@ int bnxt_dev_reset_and_resume(struct bnxt *bp);
 #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 2d9c43c98..350e867bf 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -685,6 +685,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;
 
 	HWRM_PREP(req, FUNC_DRV_RGTR, BNXT_USE_CHIMP_MB);
 	req.enables = rte_cpu_to_le_32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VER |
@@ -716,6 +718,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 c332c129d..44e335507 100644
--- 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	\
-- 
2.20.1 (Apple Git-117)



More information about the dev mailing list