evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath10k: Add wmi service ready event for HL1.0 fw"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-30 07:04:49 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2a5e60ec70
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/wireless/ath/ath10k/wmi-tlv.c
View file

@ -937,7 +937,12 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar,
ev = tb[WMI_TLV_TAG_STRUCT_SERVICE_READY_EVENT]; ev = tb[WMI_TLV_TAG_STRUCT_SERVICE_READY_EVENT];
reg = tb[WMI_TLV_TAG_STRUCT_HAL_REG_CAPABILITIES]; reg = tb[WMI_TLV_TAG_STRUCT_HAL_REG_CAPABILITIES];
if (QCA_REV_WCN3990(ar)) {
svc_bmap = (__le32 *)(skb->data +
WMI_TLV_TAG_STRUCT_HL_1_0_SVC_OFFSET);
} else {
svc_bmap = tb[WMI_TLV_TAG_ARRAY_UINT32]; svc_bmap = tb[WMI_TLV_TAG_ARRAY_UINT32];
}
mem_reqs = tb[WMI_TLV_TAG_ARRAY_STRUCT]; mem_reqs = tb[WMI_TLV_TAG_ARRAY_STRUCT];
if (!ev || !reg || !svc_bmap || !mem_reqs) { if (!ev || !reg || !svc_bmap || !mem_reqs) {

9
drivers/net/wireless/ath/ath10k/wmi-tlv.h
View file

@ -889,6 +889,7 @@ enum wmi_tlv_tag {
WMI_TLV_TAG_STRUCT_SAP_OFL_DEL_STA_EVENT, WMI_TLV_TAG_STRUCT_SAP_OFL_DEL_STA_EVENT,
WMI_TLV_TAG_STRUCT_APFIND_CMD_PARAM, WMI_TLV_TAG_STRUCT_APFIND_CMD_PARAM,
WMI_TLV_TAG_STRUCT_APFIND_EVENT_HDR, WMI_TLV_TAG_STRUCT_APFIND_EVENT_HDR,
WMI_TLV_TAG_STRUCT_HL_1_0_SVC_OFFSET = 176,
WMI_TLV_TAG_MAX WMI_TLV_TAG_MAX
}; };
@ -1358,6 +1359,14 @@ struct wmi_tlv_svc_rdy_ev {
__le32 max_num_scan_chans; __le32 max_num_scan_chans;
__le32 hw_bd_id; /* 0 means hw_bd_info is invalid */ __le32 hw_bd_id; /* 0 means hw_bd_info is invalid */
struct wmi_tlv_hw_bd_info hw_bd_info[5]; struct wmi_tlv_hw_bd_info hw_bd_info[5];
#ifdef CONFIG_ATH10K_SNOC
__le32 max_supported_macs;
__le32 wmi_fw_sub_feat_caps;
__le32 num_dbs_hw_modes;
__le32 txrx_chainmask;
__le32 default_dbs_hw_mode_index;
__le32 num_msdu_desc;
#endif
} __packed; } __packed;
struct wmi_tlv_rdy_ev { struct wmi_tlv_rdy_ev {