samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

qcacmn: Replace soc level references of set mac config

Przeglądaj źródła 
Replace the WMI command WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID
and event WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID with
WMI_PDEV_SET_MAC_CONFIG_CMDID and
WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID respectively since
the former are obsolete. The new WMI commands and events
additionally carry the pdev id.

Change-Id: I77eab3ead005bbb7f951ce7e077cd661813cb628
CRs-Fixed: 989502
This commit is contained in:
Manishekar Chandrasekaran
2016-04-27 12:52:51 +05:30
zatwierdzone przez Gerrit - the friendly Code Review server
rodzic 0d0cff8182
commit 7e21d109d2
4 zmienionych plików z 18 dodań i 16 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
wmi/inc/wmi_unified_api.h
Wyświetl plik

@@ -769,7 +769,7 @@ QDF_STATUS wmi_unified_pdev_set_pcl_cmd(void *wmi_hdl,
QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
uint32_t hw_mode_index);
QDF_STATUS wmi_unified_soc_set_dual_mac_config_cmd(void *wmi_hdl,
QDF_STATUS wmi_unified_pdev_set_dual_mac_config_cmd(void *wmi_hdl,
struct wmi_dual_mac_config *msg);
QDF_STATUS wmi_unified_enable_arp_ns_offload_cmd(void *wmi_hdl,

2
wmi/inc/wmi_unified_priv.h
Wyświetl plik

@@ -557,7 +557,7 @@ QDF_STATUS (*send_pdev_set_pcl_cmd)(wmi_unified_t wmi_handle,
QDF_STATUS (*send_pdev_set_hw_mode_cmd)(wmi_unified_t wmi_handle,
uint32_t hw_mode_index);
QDF_STATUS (*send_soc_set_dual_mac_config_cmd)(wmi_unified_t wmi_handle,
QDF_STATUS (*send_pdev_set_dual_mac_config_cmd)(wmi_unified_t wmi_handle,
struct wmi_dual_mac_config *msg);
QDF_STATUS (*send_enable_arp_ns_offload_cmd)(wmi_unified_t wmi_handle,

8
wmi/src/wmi_unified_api.c
Wyświetl plik

@@ -3089,7 +3089,7 @@ QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
}
/**
* wmi_unified_soc_set_dual_mac_config_cmd() - Set dual mac config to FW
* wmi_unified_pdev_set_dual_mac_config_cmd() - Set dual mac config to FW
* @wmi_hdl: wmi handle
* @msg: Dual MAC config parameters
*
@@ -3097,13 +3097,13 @@ QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
*
* Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failures.
*/
QDF_STATUS wmi_unified_soc_set_dual_mac_config_cmd(void *wmi_hdl,
QDF_STATUS wmi_unified_pdev_set_dual_mac_config_cmd(void *wmi_hdl,
struct wmi_dual_mac_config *msg)
{
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
if (wmi_handle->ops->send_soc_set_dual_mac_config_cmd)
return wmi_handle->ops->send_soc_set_dual_mac_config_cmd(wmi_handle,
if (wmi_handle->ops->send_pdev_set_dual_mac_config_cmd)
return wmi_handle->ops->send_pdev_set_dual_mac_config_cmd(wmi_handle,
msg);
return QDF_STATUS_E_FAILURE;

22
wmi/src/wmi_unified_tlv.c
Wyświetl plik

@@ -9359,7 +9359,7 @@ QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
}
/**
* send_soc_set_dual_mac_config_cmd_tlv() - Set dual mac config to FW
* send_pdev_set_dual_mac_config_cmd_tlv() - Set dual mac config to FW
* @wmi_handle: wmi handle
* @msg: Dual MAC config parameters
*
@@ -9367,10 +9367,10 @@ QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
*
* Return: QDF_STATUS. 0 on success.
*/
QDF_STATUS send_soc_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
QDF_STATUS send_pdev_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
struct wmi_dual_mac_config *msg)
{
wmi_soc_set_dual_mac_config_cmd_fixed_param *cmd;
wmi_pdev_set_mac_config_cmd_fixed_param *cmd;
wmi_buf_t buf;
uint32_t len;
@@ -9382,19 +9382,21 @@ QDF_STATUS send_soc_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
return QDF_STATUS_E_FAILURE;
}
cmd = (wmi_soc_set_dual_mac_config_cmd_fixed_param *) wmi_buf_data(buf);
cmd = (wmi_pdev_set_mac_config_cmd_fixed_param *) wmi_buf_data(buf);
WMITLV_SET_HDR(&cmd->tlv_header,
WMITLV_TAG_STRUC_wmi_soc_set_dual_mac_config_cmd_fixed_param,
WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_cmd_fixed_param,
WMITLV_GET_STRUCT_TLVLEN(
wmi_soc_set_dual_mac_config_cmd_fixed_param));
wmi_pdev_set_mac_config_cmd_fixed_param));
cmd->pdev_id = WMI_PDEV_ID_SOC;
cmd->concurrent_scan_config_bits = msg->scan_config;
cmd->fw_mode_config_bits = msg->fw_mode_config;
WMI_LOGI("%s: scan_config:%x fw_mode_config:%x",
__func__, msg->scan_config, msg->fw_mode_config);
if (wmi_unified_cmd_send(wmi_handle, buf, len,
WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID)) {
WMI_LOGE("%s: Failed to send WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID",
WMI_PDEV_SET_MAC_CONFIG_CMDID)) {
WMI_LOGE("%s: Failed to send WMI_PDEV_SET_MAC_CONFIG_CMDID",
__func__);
qdf_nbuf_free(buf);
}
@@ -10491,8 +10493,8 @@ struct wmi_ops tlv_ops = {
.send_flush_logs_to_fw_cmd = send_flush_logs_to_fw_cmd_tlv,
.send_pdev_set_pcl_cmd = send_pdev_set_pcl_cmd_tlv,
.send_pdev_set_hw_mode_cmd = send_pdev_set_hw_mode_cmd_tlv,
.send_soc_set_dual_mac_config_cmd =
send_soc_set_dual_mac_config_cmd_tlv,
.send_pdev_set_dual_mac_config_cmd =
send_pdev_set_dual_mac_config_cmd_tlv,
.send_enable_arp_ns_offload_cmd =
send_enable_arp_ns_offload_cmd_tlv,
.send_app_type1_params_in_fw_cmd =