浏览代码

qcacmn: Convert host pdev id to target

WMI commands for DBR and CFR are based on pdev id, so need to convert
host pdev id and target pdev id when tx wmi commands or rx wmi events.

Change-Id: I54bf4a28a285e5b4dfdd125aeaabb9968a6d052a
CRs-Fixed: 2634729
Wu Gao 9 年之前
父节点
当前提交
6c92dfdcf0
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      wmi/src/wmi_unified_cfr_tlv.c
  2. 4 4
      wmi/src/wmi_unified_dbr_tlv.c

+ 2 - 2
wmi/src/wmi_unified_cfr_tlv.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * purpose with or without fee is hereby granted, provided that the above
@@ -155,7 +155,7 @@ static QDF_STATUS send_cfr_rcc_cmd_tlv(wmi_unified_t wmi_handle,
 		       WMITLV_TAG_STRUC_wmi_cfr_capture_filter_cmd_fixed_param,
 		       WMITLV_TAG_STRUC_wmi_cfr_capture_filter_cmd_fixed_param,
 		       WMITLV_GET_STRUCT_TLVLEN
 		       WMITLV_GET_STRUCT_TLVLEN
 		       (wmi_cfr_capture_filter_cmd_fixed_param));
 		       (wmi_cfr_capture_filter_cmd_fixed_param));
-	cmd->pdev_id = ops->convert_pdev_id_host_to_target(wmi_handle,
+	cmd->pdev_id = ops->convert_host_pdev_id_to_target(wmi_handle,
 							   rcc->pdev_id);
 							   rcc->pdev_id);
 	WMI_CFR_CAPTURE_INTERVAL_SET(cmd->capture_interval,
 	WMI_CFR_CAPTURE_INTERVAL_SET(cmd->capture_interval,
 				     rcc->capture_interval);
 				     rcc->capture_interval);

+ 4 - 4
wmi/src/wmi_unified_dbr_tlv.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
  * any purpose with or without fee is hereby granted, provided that the
@@ -50,7 +50,7 @@ static QDF_STATUS send_dbr_cfg_cmd_tlv(wmi_unified_t wmi_handle,
 		WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param,
 		WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param,
 		WMITLV_GET_STRUCT_TLVLEN(wmi_dma_ring_cfg_req_fixed_param));
 		WMITLV_GET_STRUCT_TLVLEN(wmi_dma_ring_cfg_req_fixed_param));
 
 
-	cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+	cmd->pdev_id = wmi_handle->ops->convert_host_pdev_id_to_target(
 						wmi_handle,
 						wmi_handle,
 						cfg->pdev_id);
 						cfg->pdev_id);
 	cmd->mod_id = cfg->mod_id;
 	cmd->mod_id = cfg->mod_id;
@@ -100,7 +100,7 @@ static QDF_STATUS extract_scaling_params_service_ready_ext_tlv(
 
 
 	spectral_bin_scaling_params = &param_buf->wmi_bin_scaling_params[idx];
 	spectral_bin_scaling_params = &param_buf->wmi_bin_scaling_params[idx];
 
 
-	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+	param->pdev_id = wmi_handle->ops->convert_target_pdev_id_to_host(
 					wmi_handle,
 					wmi_handle,
 					spectral_bin_scaling_params->pdev_id);
 					spectral_bin_scaling_params->pdev_id);
 	param->low_level_offset = spectral_bin_scaling_params->low_level_offset;
 	param->low_level_offset = spectral_bin_scaling_params->low_level_offset;
@@ -128,7 +128,7 @@ static QDF_STATUS extract_dbr_buf_release_fixed_tlv(wmi_unified_t wmi_handle,
 	if (!ev)
 	if (!ev)
 		return QDF_STATUS_E_INVAL;
 		return QDF_STATUS_E_INVAL;
 
 
-	param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+	param->pdev_id = wmi_handle->ops->convert_target_pdev_id_to_host(
 								wmi_handle,
 								wmi_handle,
 								ev->pdev_id);
 								ev->pdev_id);
 	param->mod_id = ev->mod_id;
 	param->mod_id = ev->mod_id;