Переглянути джерело

qcacmn: Fix compilation issues in management Rx REO simulation

Fix compilation issues in management Rx reorder simulation
framework.

CRs-Fixed: 3364105
Change-Id: I74041e1d7b4fde289b5e09086d438af529255a8b
Edayilliam Jayadev 2 роки тому
батько
коміт
3a12fcc91e

+ 11 - 9
umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_rx_reo.c

@@ -4336,7 +4336,6 @@ mgmt_rx_reo_sim_receive_from_air(struct mgmt_rx_reo_sim_mac_hw *mac_hw,
 				 struct mgmt_rx_frame_params *frame)
 {
 	uint8_t valid_link_list_index;
-	QDF_STATUS status;
 	int8_t link_id;
 
 	if (!mac_hw) {
@@ -4604,19 +4603,19 @@ mgmt_rx_reo_sim_deinit_master_frame_list(
  */
 static QDF_STATUS
 mgmt_rx_reo_sim_generate_unique_link_id(
-		struct wlan_objmgr_pdev *link_id_to_pdev_map, uint8_t *link_id)
+		struct wlan_objmgr_pdev **link_id_to_pdev_map, uint8_t *link_id)
 {
 	uint8_t random_link_id;
-	uint8_t link_id;
+	uint8_t link;
 
 	if (!link_id_to_pdev_map || !link_id)
 		return QDF_STATUS_E_NULL_VALUE;
 
-	for (link_id = 0; link_id < MAX_MLO_LINKS; link_id++)
-		if (!link_id_to_pdev_map[link_id])
+	for (link = 0; link < MAX_MLO_LINKS; link++)
+		if (!link_id_to_pdev_map[link])
 			break;
 
-	if (link_id == MAX_MLO_LINKS) {
+	if (link == MAX_MLO_LINKS) {
 		mgmt_rx_reo_err("All link ids are already allocated");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -4651,6 +4650,7 @@ mgmt_rx_reo_sim_insert_into_link_id_to_pdev_map(
 		struct wlan_objmgr_pdev *pdev)
 {
 	uint8_t link_id;
+	QDF_STATUS status;
 
 	if (!link_id_to_pdev_map) {
 		mgmt_rx_reo_err("Link id to pdev map is null");
@@ -4665,7 +4665,7 @@ mgmt_rx_reo_sim_insert_into_link_id_to_pdev_map(
 	qdf_spin_lock(&link_id_to_pdev_map->lock);
 
 	status = mgmt_rx_reo_sim_generate_unique_link_id(
-					link_id_to_pdev_map->map, &link_id)
+					link_id_to_pdev_map->map, &link_id);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		qdf_spin_unlock(&link_id_to_pdev_map->lock);
 		return QDF_STATUS_E_FAILURE;
@@ -4886,13 +4886,15 @@ mgmt_rx_reo_sim_stop(uint8_t ml_grp_id)
 				sim_context->host_mgmt_frame_handler[link_id]);
 	}
 
-	status = mgmt_rx_reo_print_ingress_frame_debug_info();
+	status = mgmt_rx_reo_print_ingress_frame_info
+			(MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_PRINT_MAX_FRAMES);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		mgmt_rx_reo_err("Failed to print ingress frame debug info");
 		return status;
 	}
 
-	status = mgmt_rx_reo_print_egress_frame_debug_info();
+	status = mgmt_rx_reo_print_egress_frame_info
+			(MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_PRINT_MAX_FRAMES);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		mgmt_rx_reo_err("Failed to print egress frame debug info");
 		return status;

+ 4 - 2
umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_rx_reo_i.h

@@ -72,12 +72,14 @@
 #define MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_WAIT_COUNT_MAX_SIZE   (69)
 #define MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_PER_LINK_SNAPSHOTS_MAX_SIZE   (94)
 #define MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_SNAPSHOT_MAX_SIZE     (22)
+#define MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_PRINT_MAX_FRAMES     (0)
 
 #define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_BOARDER_MAX_SIZE   (785)
 #define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_FLAG_MAX_SIZE   (13)
 #define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_WAIT_COUNT_MAX_SIZE   (69)
 #define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_PER_LINK_SNAPSHOTS_MAX_SIZE   (94)
 #define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_SNAPSHOT_MAX_SIZE     (22)
+#define MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_PRINT_MAX_FRAMES     (0)
 #endif /* WLAN_MGMT_RX_REO_DEBUG_SUPPORT*/
 
 /*
@@ -450,7 +452,7 @@ struct mgmt_rx_reo_sim_context {
 	struct workqueue_struct *fw_mgmt_frame_handler[MAX_MLO_LINKS];
 	struct mgmt_rx_reo_master_frame_list master_frame_list;
 	struct mgmt_rx_reo_mac_hw_simulator mac_hw_sim;
-	struct mgmt_rx_reo_snapshot snapshot[MAX_MLO_LINKS]
+	struct mgmt_rx_reo_shared_snapshot snapshot[MAX_MLO_LINKS]
 					    [MGMT_RX_REO_SHARED_SNAPSHOT_MAX];
 	struct mgmt_rx_reo_sim_link_id_to_pdev_map link_id_to_pdev_map;
 	uint8_t mlo_grp_id;
@@ -1052,7 +1054,7 @@ QDF_STATUS
 mgmt_rx_reo_sim_get_snapshot_address(
 			struct wlan_objmgr_pdev *pdev,
 			enum mgmt_rx_reo_shared_snapshot_id id,
-			struct mgmt_rx_reo_snapshot **address);
+			struct mgmt_rx_reo_shared_snapshot **address);
 
 /**
  * mgmt_rx_reo_sim_pdev_object_create_notification() - pdev create handler for

+ 15 - 1
umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_rx_reo_utils_api.c

@@ -173,7 +173,19 @@ wlan_mgmt_rx_reo_get_snapshot_info
 			 enum mgmt_rx_reo_shared_snapshot_id id,
 			 struct mgmt_rx_reo_snapshot_info *snapshot_info)
 {
-	return mgmt_rx_reo_sim_get_snapshot_info(pdev, id, snapshot_info);
+	QDF_STATUS status;
+
+	status = mgmt_rx_reo_sim_get_snapshot_address(pdev, id,
+						      &snapshot_info->address);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		mgmt_rx_reo_err("Failed to get snapshot address for ID = %d",
+				id);
+		return status;
+	}
+
+	snapshot_info->version = 1;
+
+	return QDF_STATUS_SUCCESS;
 }
 
 /**
@@ -338,6 +350,8 @@ wlan_mgmt_rx_reo_is_feature_enabled_at_pdev(struct wlan_objmgr_pdev *pdev)
 	return true;
 }
 
+qdf_export_symbol(wlan_mgmt_rx_reo_is_feature_enabled_at_pdev);
+
 QDF_STATUS
 wlan_mgmt_rx_reo_sim_start(uint8_t ml_grp_id)
 {