openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath10k: fix HTT op backwards compatibility for QCA6174 

Commit 8348db2984 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION") broke QCA6174
receive side as the HTT ids from ATH10K_FW_HTT_OP_VERSION_MAIN don't have
HTT_TLV_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND set. Fix this by adding a backwards
compatibility code which sets HTT op version if it's not set by the firmware
image.

Fixes: 8348db2984 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION")
Reported-by: Michal Kazior <michal.kazior@tieto.com>
Tested-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo 2015-03-30 14:14:28 +03:00
parent 23d6660d7f
commit dc3632a1ad
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/ath/ath10k/core.c
View File

@ -998,6 +998,29 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
return -EINVAL; return -EINVAL;
} }
/* Backwards compatibility for firmwares without
* ATH10K_FW_IE_HTT_OP_VERSION.
*/
if (ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_UNSET) {
switch (ar->wmi.op_version) {
case ATH10K_FW_WMI_OP_VERSION_MAIN:
ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_MAIN;
break;
case ATH10K_FW_WMI_OP_VERSION_10_1:
case ATH10K_FW_WMI_OP_VERSION_10_2:
case ATH10K_FW_WMI_OP_VERSION_10_2_4:
ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_1;
break;
case ATH10K_FW_WMI_OP_VERSION_TLV:
ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
break;
case ATH10K_FW_WMI_OP_VERSION_UNSET:
case ATH10K_FW_WMI_OP_VERSION_MAX:
WARN_ON(1);
return -EINVAL;
}
}
return 0; return 0;
} }

2
drivers/net/wireless/ath/ath10k/htt.c
View File

@ -156,11 +156,11 @@ int ath10k_htt_init(struct ath10k *ar)
ar->htt.t2h_msg_types_max = HTT_TLV_T2H_NUM_MSGS; ar->htt.t2h_msg_types_max = HTT_TLV_T2H_NUM_MSGS;
break; break;
case ATH10K_FW_HTT_OP_VERSION_MAIN: case ATH10K_FW_HTT_OP_VERSION_MAIN:
case ATH10K_FW_HTT_OP_VERSION_UNSET:
ar->htt.t2h_msg_types = htt_main_t2h_msg_types; ar->htt.t2h_msg_types = htt_main_t2h_msg_types;
ar->htt.t2h_msg_types_max = HTT_MAIN_T2H_NUM_MSGS; ar->htt.t2h_msg_types_max = HTT_MAIN_T2H_NUM_MSGS;
break; break;
case ATH10K_FW_HTT_OP_VERSION_MAX: case ATH10K_FW_HTT_OP_VERSION_MAX:
case ATH10K_FW_HTT_OP_VERSION_UNSET:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }