Merge "qca-wifi: Support pdevid conversion map for wmi_handle"

wmi/src/wmi_unified_ap_tlv.c

@@ -242,6 +242,7 @@ send_set_ctl_table_cmd_tlv(wmi_unified_t wmi_handle,
 				wmi_pdev_set_ctl_table_cmd_fixed_param));
 	cmd->ctl_len = param->ctl_cmd_len;
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 
 	buf_ptr += sizeof(*cmd);
@@ -316,6 +317,7 @@ send_set_mimogain_table_cmd_tlv(wmi_unified_t wmi_handle,
 		       wmi_pdev_set_mimogain_table_cmd_fixed_param));
 
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 	WMI_MIMOGAIN_ARRAY_GAIN_LEN_SET(cmd->mimogain_info, param->tbl_len);
 	WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_SET(cmd->mimogain_info,
@@ -472,6 +474,7 @@ send_packet_power_info_get_cmd_tlv(wmi_unified_t wmi_handle,
 		       WMITLV_GET_STRUCT_TLVLEN(
 				wmi_pdev_get_tpc_cmd_fixed_param));
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 	cmd->rate_flags = convert_to_power_info_rate_flags(param);
 	cmd->nss = param->nss;
@@ -518,7 +521,9 @@ send_nf_dbr_dbm_info_get_cmd_tlv(wmi_unified_t wmi_handle, uint8_t mac_id)
 		       WMITLV_TAG_STRUC_wmi_pdev_get_nfcal_power_fixed_param,
 		       WMITLV_GET_STRUCT_TLVLEN
 				(wmi_pdev_get_nfcal_power_fixed_param));
-	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(mac_id);
+	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
+								mac_id);
 
 	wmi_mtrace(WMI_PDEV_GET_NFCAL_POWER_CMDID, NO_SESSION, 0);
 	ret = wmi_unified_cmd_send(wmi_handle, buf, len,
@@ -677,6 +682,7 @@ send_set_quiet_mode_cmd_tlv(wmi_unified_t wmi_handle,
 	quiet_cmd->duration = param->duration;
 	quiet_cmd->next_start = param->offset;
 	quiet_cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+							wmi_handle,
 							WMI_HOST_PDEV_ID_SOC);
 
 	wmi_mtrace(WMI_PDEV_SET_QUIET_MODE_CMDID, NO_SESSION, 0);
@@ -987,6 +993,7 @@ static QDF_STATUS extract_offchan_data_tx_compl_param_tlv(
 	cmpl_params = param_buf->fixed_param;
 
 	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+							wmi_handle,
 							cmpl_params->pdev_id);
 	param->desc_id = cmpl_params->desc_id;
 	param->status = cmpl_params->status;
@@ -1021,6 +1028,7 @@ static QDF_STATUS extract_pdev_csa_switch_count_status_tlv(
 	csa_status = param_buf->fixed_param;
 
 	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+							wmi_handle,
 							csa_status->pdev_id);
 	param->current_switch_count = csa_status->current_switch_count;
 	param->num_vdevs = csa_status->num_vdevs;
@@ -1148,6 +1156,7 @@ static QDF_STATUS send_multiple_vdev_restart_req_cmd_tlv(
 	WMITLV_GET_STRUCT_TLVLEN
 		(wmi_pdev_multiple_vdev_restart_request_cmd_fixed_param));
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 	cmd->requestor_id = param->requestor_id;
 	cmd->disable_hw_ack = param->disable_hw_ack;
@@ -1249,6 +1258,7 @@ static QDF_STATUS extract_dcs_interference_type_tlv(
 
 	param->interference_type = param_buf->fixed_param->interference_type;
 	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+					wmi_handle,
 					param_buf->fixed_param->pdev_id);
 
 	return QDF_STATUS_SUCCESS;
@@ -1368,6 +1378,7 @@ static QDF_STATUS extract_pdev_tpc_ev_param_tlv(wmi_unified_t wmi_handle,
 	event = (wmi_pdev_tpc_event_fixed_param *)param_buf->fixed_param;
 
 	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+								wmi_handle,
 								event->pdev_id);
 	qdf_mem_copy(param->tpc, param_buf->tpc, sizeof(param->tpc));
 
@@ -1436,7 +1447,8 @@ extract_nfcal_power_ev_param_tlv(wmi_unified_t wmi_handle,
 	}
 
 	param->pdev_id = wmi_handle->ops->
-		convert_pdev_id_target_to_host(event->pdev_id);
+		convert_pdev_id_target_to_host(wmi_handle,
+					       event->pdev_id);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -2204,6 +2216,7 @@ static QDF_STATUS extract_mgmt_tx_compl_param_tlv(wmi_unified_t wmi_handle,
 	cmpl_params = param_buf->fixed_param;
 
 	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+							wmi_handle,
 							cmpl_params->pdev_id);
 	param->desc_id = cmpl_params->desc_id;
 	param->status = cmpl_params->status;
@@ -2280,6 +2293,7 @@ static QDF_STATUS extract_channel_hopping_event_tlv(
 	ch_hopping->noise_floor_report_iter = event->noise_floor_report_iter;
 	ch_hopping->noise_floor_total_iter = event->noise_floor_total_iter;
 	ch_hopping->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+								wmi_handle,
 								event->pdev_id);
 
 	return QDF_STATUS_SUCCESS;

wmi/src/wmi_unified_atf_tlv.c

@@ -76,6 +76,7 @@ send_set_atf_cmd_tlv(wmi_unified_t wmi_handle,
 		peer_info->vdev_id = param->peer_info[i].vdev_id;
 		peer_info->pdev_id =
 			wmi_handle->ops->convert_pdev_id_host_to_target(
+				wmi_handle,
 				param->peer_info[i].pdev_id);
 		/*
 		 * TLV definition for peer atf request fixed param combines
@@ -162,6 +163,7 @@ send_set_bwf_cmd_tlv(wmi_unified_t wmi_handle,
 				param->peer_info[i].vdev_id;
 		peer_info->pdev_id =
 			wmi_handle->ops->convert_pdev_id_host_to_target(
+				wmi_handle,
 				param->peer_info[i].pdev_id);
 		peer_info++;
 	}

wmi/src/wmi_unified_non_tlv.c

@@ -9867,7 +9867,8 @@ QDF_STATUS send_multiple_vdev_restart_req_cmd_non_tlv(
  *
  * Return None.
  */
-void wmi_non_tlv_pdev_id_conversion_enable(wmi_unified_t wmi_handle)
+void wmi_non_tlv_pdev_id_conversion_enable(wmi_unified_t wmi_handle,
+					   uint32_t *pdev_id_map, uint8_t size)
 {
 	WMI_LOGD("PDEV conversion Not Available");
 }

wmi/src/wmi_unified_smart_ant_tlv.c

@@ -64,6 +64,7 @@ static QDF_STATUS send_smart_ant_enable_cmd_tlv(wmi_unified_t wmi_handle,
 				wmi_pdev_smart_ant_enable_cmd_fixed_param));
 
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 	cmd->enable = param->enable;
 	cmd->mode = param->mode;
@@ -99,6 +100,7 @@ static QDF_STATUS send_smart_ant_enable_cmd_tlv(wmi_unified_t wmi_handle,
 		/* Setting it to 0 for now */
 		gpio_param->pdev_id =
 			wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 		gpio_param++;
 	}
@@ -158,6 +160,7 @@ static QDF_STATUS send_smart_ant_set_rx_ant_cmd_tlv(wmi_unified_t wmi_handle,
 		wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param));
 	cmd->rx_antenna = param->antenna;
 	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
 								param->pdev_id);
 
 	wmi_mtrace(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID, NO_SESSION, 0);
@@ -288,7 +291,9 @@ send_set_ant_switch_tbl_cmd_tlv(wmi_unified_t wmi_handle,
 	cmd->antCtrlCommon1 = param->ant_ctrl_common1;
 	cmd->antCtrlCommon2 = param->ant_ctrl_common2;
 	cmd->mac_id =
-		wmi_handle->ops->convert_pdev_id_host_to_target(param->pdev_id);
+		wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
+								param->pdev_id);
 
 	/* TLV indicating array of structures to follow */
 	buf_ptr += sizeof(wmi_pdev_set_ant_switch_tbl_cmd_fixed_param);
@@ -301,7 +306,9 @@ send_set_ant_switch_tbl_cmd_tlv(wmi_unified_t wmi_handle,
 		       WMITLV_TAG_STRUC_wmi_pdev_set_ant_ctrl_chain,
 		       WMITLV_GET_STRUCT_TLVLEN(wmi_pdev_set_ant_ctrl_chain));
 	ctrl_chain->pdev_id =
-		wmi_handle->ops->convert_pdev_id_host_to_target(param->pdev_id);
+		wmi_handle->ops->convert_pdev_id_host_to_target(
+								wmi_handle,
+								param->pdev_id);
 	ctrl_chain->antCtrlChain = param->antCtrlChain;
 
 	wmi_mtrace(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID, NO_SESSION, 0);
@@ -508,7 +515,8 @@ static QDF_STATUS extract_peer_ratecode_list_ev_tlv(
 	param_buf = (WMI_PEER_RATECODE_LIST_EVENTID_param_tlvs *)evt_buf;
 	ev = (wmi_peer_ratecode_list_event_fixed_param *)param_buf->fixed_param;
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&ev->peer_macaddr, peer_mac);
-	*pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(ev->pdev_id);
+	*pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(wmi_handle,
+								   ev->pdev_id);
 
 	for (i = 0; i < SA_BYTES_IN_DWORD; i++) {
 		rate_cap->ratecount[i] = ((ev->ratecount >> (i*8)) &