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

Merge "ath10k: Refactor wmi init cmd for WCN3990"

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

14
drivers/net/wireless/ath/ath10k/core.c
View file

@ -1560,10 +1560,22 @@ static void ath10k_core_restart(struct work_struct *work)
mutex_unlock(&ar->conf_mutex);
}
/* WAR: WCN3990 fw loading is done by PIL, assign WMI/HTT version */
static inline void init_fw_param(struct ath10k *ar,
struct ath10k_fw_file *fw_file)
{
if (QCA_REV_WCN3990(ar)) {
fw_file->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_HL_1_0;
fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
}
}
static int ath10k_core_init_firmware_features(struct ath10k *ar)
{
struct ath10k_fw_file *fw_file = &ar->normal_mode_fw.fw_file;
init_fw_param(ar, &ar->normal_mode_fw.fw_file);
if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, fw_file->fw_features) &&
!test_bit(ATH10K_FW_FEATURE_WMI_10X, fw_file->fw_features)) {
ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");
@ -1666,6 +1678,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;
break;
case ATH10K_FW_WMI_OP_VERSION_TLV:
case ATH10K_FW_WMI_OP_VERSION_HL_1_0:
ar->max_num_peers = TARGET_TLV_NUM_PEERS;
ar->max_num_stations = TARGET_TLV_NUM_STATIONS;
ar->max_num_vdevs = TARGET_TLV_NUM_VDEVS;
@ -1712,6 +1725,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_10_1;
break;
case ATH10K_FW_WMI_OP_VERSION_TLV:
case ATH10K_FW_WMI_OP_VERSION_HL_1_0:
fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
break;
case ATH10K_FW_WMI_OP_VERSION_10_4:

6
drivers/net/wireless/ath/ath10k/hw.h
View file

@ -184,6 +184,7 @@ enum ath10k_fw_wmi_op_version {
ATH10K_FW_WMI_OP_VERSION_TLV = 4,
ATH10K_FW_WMI_OP_VERSION_10_2_4 = 5,
ATH10K_FW_WMI_OP_VERSION_10_4 = 6,
ATH10K_FW_WMI_OP_VERSION_HL_1_0 = 7,
/* keep last */
ATH10K_FW_WMI_OP_VERSION_MAX,
@ -525,6 +526,11 @@ ath10k_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw,
#define TARGET_TLV_NUM_MSDU_DESC (1024 + 32)
#define TARGET_TLV_NUM_WOW_PATTERNS 22
/* Target specific defines for WMI-HL-1.0 firmware */
#define TARGET_HL_10_TLV_NUM_PEERS 14
#define TARGET_HL_10_TLV_AST_SKID_LIMIT 6
#define TARGET_HL_10_TLV_NUM_WDS_ENTRIES 2
/* Diagnostic Window */
#define CE_DIAG_PIPE 7

1
drivers/net/wireless/ath/ath10k/mac.c
View file

@ -7959,6 +7959,7 @@ int ath10k_mac_register(struct ath10k *ar)
ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
break;
case ATH10K_FW_WMI_OP_VERSION_TLV:
case ATH10K_FW_WMI_OP_VERSION_HL_1_0:
if (test_bit(WMI_SERVICE_ADAPTIVE_OCS, ar->wmi.svc_map)) {
ar->hw->wiphy->iface_combinations =
ath10k_tlv_qcs_if_comb;

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

@ -1400,7 +1400,18 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
cmd->num_host_mem_chunks = __cpu_to_le32(ar->wmi.num_mem_chunks);
cfg->num_vdevs = __cpu_to_le32(TARGET_TLV_NUM_VDEVS);
cfg->num_peers = __cpu_to_le32(TARGET_TLV_NUM_PEERS);
if (QCA_REV_WCN3990(ar)) {
cfg->num_peers = __cpu_to_le32(TARGET_HL_10_TLV_NUM_PEERS);
cfg->ast_skid_limit =
__cpu_to_le32(TARGET_HL_10_TLV_AST_SKID_LIMIT);
cfg->num_wds_entries =
__cpu_to_le32(TARGET_HL_10_TLV_NUM_WDS_ENTRIES);
} else {
cfg->num_peers = __cpu_to_le32(TARGET_TLV_NUM_PEERS);
cfg->ast_skid_limit = __cpu_to_le32(0x10);
cfg->num_wds_entries = __cpu_to_le32(0x20);
}
if (test_bit(WMI_SERVICE_RX_FULL_REORDER, ar->wmi.svc_map)) {
cfg->num_offload_peers = __cpu_to_le32(TARGET_TLV_NUM_VDEVS);
@ -1412,7 +1423,6 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
cfg->num_peer_keys = __cpu_to_le32(2);
cfg->num_tids = __cpu_to_le32(TARGET_TLV_NUM_TIDS);
cfg->ast_skid_limit = __cpu_to_le32(0x10);
cfg->tx_chain_mask = __cpu_to_le32(0x7);
cfg->rx_chain_mask = __cpu_to_le32(0x7);
cfg->rx_timeout_pri[0] = __cpu_to_le32(0x64);
@ -1428,7 +1438,6 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
cfg->num_mcast_table_elems = __cpu_to_le32(0);
cfg->mcast2ucast_mode = __cpu_to_le32(0);
cfg->tx_dbg_log_size = __cpu_to_le32(0x400);
cfg->num_wds_entries = __cpu_to_le32(0x20);
cfg->dma_burst_size = __cpu_to_le32(0);
cfg->mac_aggr_delim = __cpu_to_le32(0);
cfg->rx_skip_defrag_timeout_dup_detection_check = __cpu_to_le32(0);
@ -3562,7 +3571,78 @@ static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
.pmf = WMI_TLV_PEER_PMF,
};
/************/
static const struct wmi_ops wmi_hl_1_0_ops = {
.rx = ath10k_wmi_tlv_op_rx,
.map_svc = wmi_hl_1_0_svc_map,
.pull_scan = ath10k_wmi_tlv_op_pull_scan_ev,
.pull_mgmt_rx = ath10k_wmi_tlv_op_pull_mgmt_rx_ev,
.pull_ch_info = ath10k_wmi_tlv_op_pull_ch_info_ev,
.pull_vdev_start = ath10k_wmi_tlv_op_pull_vdev_start_ev,
.pull_peer_kick = ath10k_wmi_tlv_op_pull_peer_kick_ev,
.pull_swba = ath10k_wmi_tlv_op_pull_swba_ev,
.pull_phyerr_hdr = ath10k_wmi_tlv_op_pull_phyerr_ev_hdr,
.pull_phyerr = ath10k_wmi_op_pull_phyerr_ev,
.pull_svc_rdy = ath10k_wmi_tlv_op_pull_svc_rdy_ev,
.pull_rdy = ath10k_wmi_tlv_op_pull_rdy_ev,
.pull_fw_stats = ath10k_wmi_tlv_op_pull_fw_stats,
.pull_roam_ev = ath10k_wmi_tlv_op_pull_roam_ev,
.pull_wow_event = ath10k_wmi_tlv_op_pull_wow_ev,
.get_txbf_conf_scheme = ath10k_wmi_tlv_txbf_conf_scheme,
.gen_pdev_suspend = ath10k_wmi_tlv_op_gen_pdev_suspend,
.gen_pdev_resume = ath10k_wmi_tlv_op_gen_pdev_resume,
.gen_pdev_set_rd = ath10k_wmi_tlv_op_gen_pdev_set_rd,
.gen_pdev_set_param = ath10k_wmi_tlv_op_gen_pdev_set_param,
.gen_init = ath10k_wmi_tlv_op_gen_init,
.gen_start_scan = ath10k_wmi_tlv_op_gen_start_scan,
.gen_stop_scan = ath10k_wmi_tlv_op_gen_stop_scan,
.gen_vdev_create = ath10k_wmi_tlv_op_gen_vdev_create,
.gen_vdev_delete = ath10k_wmi_tlv_op_gen_vdev_delete,
.gen_vdev_start = ath10k_wmi_tlv_op_gen_vdev_start,
.gen_vdev_stop = ath10k_wmi_tlv_op_gen_vdev_stop,
.gen_vdev_up = ath10k_wmi_tlv_op_gen_vdev_up,
.gen_vdev_down = ath10k_wmi_tlv_op_gen_vdev_down,
.gen_vdev_set_param = ath10k_wmi_tlv_op_gen_vdev_set_param,
.gen_vdev_install_key = ath10k_wmi_tlv_op_gen_vdev_install_key,
.gen_vdev_wmm_conf = ath10k_wmi_tlv_op_gen_vdev_wmm_conf,
.gen_peer_create = ath10k_wmi_tlv_op_gen_peer_create,
.gen_peer_delete = ath10k_wmi_tlv_op_gen_peer_delete,
.gen_peer_flush = ath10k_wmi_tlv_op_gen_peer_flush,
.gen_peer_set_param = ath10k_wmi_tlv_op_gen_peer_set_param,
.gen_peer_assoc = ath10k_wmi_tlv_op_gen_peer_assoc,
.gen_set_psmode = ath10k_wmi_tlv_op_gen_set_psmode,
.gen_set_sta_ps = ath10k_wmi_tlv_op_gen_set_sta_ps,
.gen_set_ap_ps = ath10k_wmi_tlv_op_gen_set_ap_ps,
.gen_scan_chan_list = ath10k_wmi_tlv_op_gen_scan_chan_list,
.gen_beacon_dma = ath10k_wmi_tlv_op_gen_beacon_dma,
.gen_pdev_set_wmm = ath10k_wmi_tlv_op_gen_pdev_set_wmm,
.gen_request_stats = ath10k_wmi_tlv_op_gen_request_stats,
.gen_force_fw_hang = ath10k_wmi_tlv_op_gen_force_fw_hang,
.gen_dbglog_cfg = ath10k_wmi_tlv_op_gen_dbglog_cfg,
.gen_pktlog_enable = ath10k_wmi_tlv_op_gen_pktlog_enable,
.gen_bcn_tmpl = ath10k_wmi_tlv_op_gen_bcn_tmpl,
.gen_prb_tmpl = ath10k_wmi_tlv_op_gen_prb_tmpl,
.gen_p2p_go_bcn_ie = ath10k_wmi_tlv_op_gen_p2p_go_bcn_ie,
.gen_vdev_sta_uapsd = ath10k_wmi_tlv_op_gen_vdev_sta_uapsd,
.gen_sta_keepalive = ath10k_wmi_tlv_op_gen_sta_keepalive,
.gen_wow_enable = ath10k_wmi_tlv_op_gen_wow_enable,
.gen_wow_add_wakeup_event = ath10k_wmi_tlv_op_gen_wow_add_wakeup_event,
.gen_wow_host_wakeup_ind = ath10k_wmi_tlv_gen_wow_host_wakeup_ind,
.gen_wow_add_pattern = ath10k_wmi_tlv_op_gen_wow_add_pattern,
.gen_wow_del_pattern = ath10k_wmi_tlv_op_gen_wow_del_pattern,
.gen_update_fw_tdls_state = ath10k_wmi_tlv_op_gen_update_fw_tdls_state,
.gen_tdls_peer_update = ath10k_wmi_tlv_op_gen_tdls_peer_update,
.gen_adaptive_qcs = ath10k_wmi_tlv_op_gen_adaptive_qcs,
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
};
void ath10k_wmi_hl_1_0_attach(struct ath10k *ar)
{
ar->wmi.cmd = &wmi_tlv_cmd_map;
ar->wmi.vdev_param = &wmi_tlv_vdev_param_map;
ar->wmi.pdev_param = &wmi_tlv_pdev_param_map;
ar->wmi.ops = &wmi_hl_1_0_ops;
}
/* TLV init */
/************/

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

@ -966,6 +966,125 @@ enum wmi_tlv_service {
WMI_TLV_SERVICE_SAP_AUTH_OFFLOAD,
};
enum wmi_hl_10_service {
WMI_HL_10_SERVICE_BEACON_OFFLOAD = 0,
WMI_HL_10_SERVICE_SCAN_OFFLOAD,
WMI_HL_10_SERVICE_ROAM_SCAN_OFFLOAD,
WMI_HL_10_SERVICE_BCN_MISS_OFFLOAD,
WMI_HL_10_SERVICE_STA_PWRSAVE,
WMI_HL_10_SERVICE_STA_ADVANCED_PWRSAVE,
WMI_HL_10_SERVICE_AP_UAPSD,
WMI_HL_10_SERVICE_AP_DFS,
WMI_HL_10_SERVICE_11AC,
WMI_HL_10_SERVICE_BLOCKACK,
WMI_HL_10_SERVICE_PHYERR,
WMI_HL_10_SERVICE_BCN_FILTER,
WMI_HL_10_SERVICE_RTT,
WMI_HL_10_SERVICE_WOW,
WMI_HL_10_SERVICE_RATECTRL_CACHE,
WMI_HL_10_SERVICE_IRAM_TIDS,
WMI_HL_10_SERVICE_ARPNS_OFFLOAD,
WMI_HL_10_SERVICE_NLO,
WMI_HL_10_SERVICE_GTK_OFFLOAD,
WMI_HL_10_SERVICE_SCAN_SCH,
WMI_HL_10_SERVICE_CSA_OFFLOAD,
WMI_HL_10_SERVICE_CHATTER,
WMI_HL_10_SERVICE_COEX_FREQAVOID,
WMI_HL_10_SERVICE_PACKET_POWER_SAVE,
WMI_HL_10_SERVICE_FORCE_FW_HANG,
WMI_HL_10_SERVICE_GPIO,
WMI_HL_10_SERVICE_STA_DTIM_PS_MODULATED_DTIM,
WMI_HL_10_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG,
WMI_HL_10_SERVICE_STA_UAPSD_VAR_AUTO_TRIG,
WMI_HL_10_SERVICE_STA_KEEP_ALIVE,
WMI_HL_10_SERVICE_TX_ENCAP,
WMI_HL_10_SERVICE_AP_PS_DETECT_OUT_OF_SYNC,
WMI_HL_10_SERVICE_EARLY_RX,
WMI_HL_10_SERVICE_STA_SMPS,
WMI_HL_10_SERVICE_FWTEST,
WMI_HL_10_SERVICE_STA_WMMAC,
WMI_HL_10_SERVICE_TDLS,
WMI_HL_10_SERVICE_BURST,
WMI_HL_10_SERVICE_MCC_BCN_INTERVAL_CHANGE,
WMI_HL_10_SERVICE_ADAPTIVE_OCS,
WMI_HL_10_SERVICE_BA_SSN_SUPPORT,
WMI_HL_10_SERVICE_FILTER_IPSEC_NATKEEPALIVE,
WMI_HL_10_SERVICE_WLAN_HB,
WMI_HL_10_SERVICE_LTE_ANT_SHARE_SUPPORT,
WMI_HL_10_SERVICE_BATCH_SCAN,
WMI_HL_10_SERVICE_QPOWER,
WMI_HL_10_SERVICE_PLMREQ,
WMI_HL_10_SERVICE_THERMAL_MGMT,
WMI_HL_10_SERVICE_RMC,
WMI_HL_10_SERVICE_MHF_OFFLOAD,
WMI_HL_10_SERVICE_COEX_SAR,
WMI_HL_10_SERVICE_BCN_TXRATE_OVERRIDE,
WMI_HL_10_SERVICE_NAN,
WMI_HL_10_SERVICE_L1SS_STAT,
WMI_HL_10_SERVICE_ESTIMATE_LINKSPEED,
WMI_HL_10_SERVICE_OBSS_SCAN,
WMI_HL_10_SERVICE_TDLS_OFFCHAN,
WMI_HL_10_SERVICE_TDLS_UAPSD_BUFFER_STA,
WMI_HL_10_SERVICE_TDLS_UAPSD_SLEEP_STA,
WMI_HL_10_SERVICE_IBSS_PWRSAVE,
WMI_HL_10_SERVICE_LPASS,
WMI_HL_10_SERVICE_EXTSCAN,
WMI_HL_10_SERVICE_D0WOW,
WMI_HL_10_SERVICE_HSOFFLOAD,
WMI_HL_10_SERVICE_ROAM_HO_OFFLOAD,
WMI_HL_10_SERVICE_RX_FULL_REORDER,
WMI_HL_10_SERVICE_DHCP_OFFLOAD,
WMI_HL_10_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT,
WMI_HL_10_SERVICE_MDNS_OFFLOAD,
WMI_HL_10_SERVICE_SAP_AUTH_OFFLOAD,
WMI_HL_10_SERVICE_DUAL_BAND_SIMULTANEOUS_SUPPORT,
WMI_HL_10_SERVICE_OCB,
WMI_HL_10_SERVICE_AP_ARPNS_OFFLOAD,
WMI_HL_10_SERVICE_PER_BAND_CHAINMASK_SUPPORT,
WMI_HL_10_SERVICE_PACKET_FILTER_OFFLOAD,
WMI_HL_10_SERVICE_MGMT_TX_HTT,
WMI_HL_10_SERVICE_MGMT_TX_WMI,
WMI_HL_10_SERVICE_EXT_MSG,
WMI_HL_10_SERVICE_MAWC,
WMI_HL_10_SERVICE_PEER_ASSOC_CONF,
WMI_HL_10_SERVICE_EGAP,
WMI_HL_10_SERVICE_STA_PMF_OFFLOAD,
WMI_HL_10_SERVICE_UNIFIED_WOW_CAPABILITY,
WMI_HL_10_SERVICE_ENHANCED_PROXY_STA,
WMI_HL_10_SERVICE_ATF,
WMI_HL_10_SERVICE_COEX_GPIO,
WMI_HL_10_SERVICE_AUX_SPECTRAL_INTF,
WMI_HL_10_SERVICE_AUX_CHAN_LOAD_INTF,
WMI_HL_10_SERVICE_BSS_CHANNEL_INFO_64,
WMI_HL_10_SERVICE_ENTERPRISE_MESH,
WMI_HL_10_SERVICE_RESTRT_CHNL_SUPPORT,
WMI_HL_10_SERVICE_BPF_OFFLOAD,
WMI_HL_10_SERVICE_SYNC_DELETE_CMDS,
WMI_HL_10_SERVICE_SMART_ANTENNA_SW_SUPPORT,
WMI_HL_10_SERVICE_SMART_ANTENNA_HW_SUPPORT,
WMI_HL_10_SERVICE_RATECTRL_LIMIT_MAX_MIN_RATES,
WMI_HL_10_SERVICE_NAN_DATA,
WMI_HL_10_SERVICE_NAN_RTT,
WMI_HL_10_SERVICE_11AX,
WMI_HL_10_SERVICE_DEPRECATED_REPLACE,
WMI_HL_10_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE,
WMI_HL_10_SERVICE_ENHANCED_MCAST_FILTER,
WMI_HL_10_SERVICE_PERIODIC_CHAN_STAT_SUPPORT,
WMI_HL_10_SERVICE_MESH_11S,
WMI_HL_10_SERVICE_HALF_RATE_QUARTER_RATE_SUPPORT,
WMI_HL_10_SERVICE_VDEV_RX_FILTER,
WMI_HL_10_SERVICE_P2P_LISTEN_OFFLOAD_SUPPORT,
WMI_HL_10_SERVICE_MARK_FIRST_WAKEUP_PACKET,
WMI_HL_10_SERVICE_MULTIPLE_MCAST_FILTER_SET,
WMI_HL_10_SERVICE_HOST_MANAGED_RX_REORDER,
WMI_HL_10_SERVICE_FLASH_RDWR_SUPPORT,
WMI_HL_10_SERVICE_WLAN_STATS_REPORT,
WMI_HL_10_SERVICE_TX_MSDU_ID_NEW_PARTITION_SUPPORT,
WMI_HL_10_SERVICE_DFS_PHYERR_OFFLOAD,
WMI_HL_10_MAX_SERVICE = 128,
WMI_HL_10_MAX_EXT_SERVICE
};
#define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \
((svc_id) < (len) && \
__le32_to_cpu((wmi_svc_bmap)[(svc_id) / (sizeof(u32))]) & \
@ -977,6 +1096,63 @@ enum wmi_tlv_service {
__set_bit(y, out); \
} while (0)
static inline void
wmi_hl_1_0_svc_map(const __le32 *in, unsigned long *out, size_t len)
{
SVCMAP(WMI_HL_10_SERVICE_BEACON_OFFLOAD,
WMI_SERVICE_BEACON_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_SCAN_OFFLOAD,
WMI_SERVICE_SCAN_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_ROAM_SCAN_OFFLOAD,
WMI_SERVICE_ROAM_SCAN_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_BCN_MISS_OFFLOAD,
WMI_SERVICE_BCN_MISS_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_STA_PWRSAVE,
WMI_SERVICE_STA_PWRSAVE, len);
SVCMAP(WMI_HL_10_SERVICE_STA_ADVANCED_PWRSAVE,
WMI_SERVICE_STA_ADVANCED_PWRSAVE, len);
SVCMAP(WMI_HL_10_SERVICE_AP_UAPSD,
WMI_SERVICE_AP_UAPSD, len);
SVCMAP(WMI_HL_10_SERVICE_AP_DFS,
WMI_SERVICE_AP_DFS, len);
SVCMAP(WMI_HL_10_SERVICE_11AC,
WMI_SERVICE_11AC, len);
SVCMAP(WMI_HL_10_SERVICE_BLOCKACK,
WMI_SERVICE_BLOCKACK, len);
SVCMAP(WMI_HL_10_SERVICE_PHYERR,
WMI_SERVICE_PHYERR, len);
SVCMAP(WMI_HL_10_SERVICE_BCN_FILTER,
WMI_SERVICE_BCN_FILTER, len);
SVCMAP(WMI_HL_10_SERVICE_RTT,
WMI_SERVICE_RTT, len);
SVCMAP(WMI_HL_10_SERVICE_WOW,
WMI_SERVICE_WOW, len);
SVCMAP(WMI_HL_10_SERVICE_RATECTRL_CACHE,
WMI_SERVICE_RATECTRL_CACHE, len);
SVCMAP(WMI_HL_10_SERVICE_IRAM_TIDS,
WMI_SERVICE_IRAM_TIDS, len);
SVCMAP(WMI_HL_10_SERVICE_ARPNS_OFFLOAD,
WMI_SERVICE_ARPNS_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_NLO,
WMI_SERVICE_NLO, len);
SVCMAP(WMI_HL_10_SERVICE_GTK_OFFLOAD,
WMI_SERVICE_GTK_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_SCAN_SCH,
WMI_SERVICE_SCAN_SCH, len);
SVCMAP(WMI_HL_10_SERVICE_CSA_OFFLOAD,
WMI_SERVICE_CSA_OFFLOAD, len);
SVCMAP(WMI_HL_10_SERVICE_CHATTER,
WMI_SERVICE_CHATTER, len);
SVCMAP(WMI_HL_10_SERVICE_COEX_FREQAVOID,
WMI_SERVICE_COEX_FREQAVOID, len);
SVCMAP(WMI_HL_10_SERVICE_PACKET_POWER_SAVE,
WMI_SERVICE_PACKET_POWER_SAVE, len);
SVCMAP(WMI_HL_10_SERVICE_FORCE_FW_HANG,
WMI_SERVICE_FORCE_FW_HANG, len);
SVCMAP(WMI_HL_10_SERVICE_RX_FULL_REORDER,
WMI_SERVICE_RX_FULL_REORDER, len);
}
static inline void
wmi_tlv_svc_map(const __le32 *in, unsigned long *out, size_t len)
{
@ -1641,5 +1817,5 @@ struct wmi_tlv_tx_pause_ev {
} __packed;
void ath10k_wmi_tlv_attach(struct ath10k *ar);
void ath10k_wmi_hl_1_0_attach(struct ath10k *ar);
#endif

3
drivers/net/wireless/ath/ath10k/wmi.c
View file

@ -8196,6 +8196,9 @@ int ath10k_wmi_attach(struct ath10k *ar)
case ATH10K_FW_WMI_OP_VERSION_TLV:
ath10k_wmi_tlv_attach(ar);
break;
case ATH10K_FW_WMI_OP_VERSION_HL_1_0:
ath10k_wmi_hl_1_0_attach(ar);
break;
case ATH10K_FW_WMI_OP_VERSION_UNSET:
case ATH10K_FW_WMI_OP_VERSION_MAX:
ath10k_err(ar, "unsupported WMI op version: %d\n",