ath11k: qmi clean up ce and HTC service config update
PATCH 1/2 ath11k: qmi clean up ce and HTC service config update
Copy CE and htc service configs for all pipes.
Signed-off-by Anilkumar Kolli <[email protected]>
--- drivers/net/wireless/ath/ath11k/ahb.c | 9 ++++----- drivers/net/wireless/ath/ath11k/qmi.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +4 -5
@@ -677,11 +677,10 @@ static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab) {struct ath11k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg; - cfg->tgt_ce = (u8 *)target_ce_config_wlan; - cfg->tgt_ce_len =sizeof (target_ce_config_wlan); - - cfg->svc_to_ce_map = (u8 *)target_service_to_ce_map_wlan; - cfg->svc_to_ce_map_len =sizeof (target_service_to_ce_map_wlan); + cfg->tgt_ce_len =ARRAY_SIZE (target_ce_config_wlan) -1 ; + cfg->tgt_ce = target_ce_config_wlan; + cfg->svc_to_ce_map_len =ARRAY_SIZE (target_service_to_ce_map_wlan); + cfg->svc_to_ce_map = target_service_to_ce_map_wlan; }static void ath11k_ahb_free_ext_irq (struct ath11k_base *ab)
drivers/net/wireless/ath/ath11k/qmi.h +2 -2
@@ -64,9 +64,9 @@ struct ath11k_qmi_driver_event { };struct ath11k_qmi_ce_cfg { -const u8 *tgt_ce; +const struct ce_pipe_config *tgt_ce;int tgt_ce_len; -const u8 *svc_to_ce_map; +const struct service_to_pipe *svc_to_ce_map;int svc_to_ce_map_len;const u8 *shadow_reg;int shadow_reg_len;
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/2 ath11k: qmi clean up in ath11k_qmi_wlanfw_wlan_cfg_send()
Use pipe_id id instead of ret in for loop.
Signed-off-by Anilkumar Kolli <[email protected]>
--- drivers/net/wireless/ath/ath11k/ce.h | 9 +++++++-- drivers/net/wireless/ath/ath11k/qmi.c | 28 +++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-)
drivers/net/wireless/ath/ath11k/ce.h +7 -2
@@ -57,7 +57,12 @@struct ath11k_base ; -/* Establish a mapping between a service/direction and a pipe. */ +/* +* Establish a mapping between a service/direction and a pipe. +* Configuration information for a Copy Engine pipe and services. +* Passed from Host to Target through QMI message and must be in +* little endian format. +*/ struct service_to_pipe {__le32 service_id;__le32 pipedir;
@@ -66,7 +71,7 @@ struct service_to_pipe {/* * Configuration information for a Copy Engine pipe. -* Passed from Host to Target during startup (one per CE). +* Passed from Host to Target through QMI message during startup (one per CE). * * NOTE: Structure is shared between Host software and Target firmware! */
drivers/net/wireless/ath/ath11k/qmi.c +13 -15
@@ -2035,7 +2035,7 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)struct ce_pipe_config *ce_cfg;struct service_to_pipe *svc_cfg;struct qmi_txn txn = {}; -int ret =0 ; +int ret =0 , pipe_num; ce_cfg = (struct ce_pipe_config *)ab->qmi.ce_cfg.tgt_ce; svc_cfg = (struct service_to_pipe *)ab->qmi.ce_cfg.svc_to_ce_map;
@@ -2052,24 +2052,22 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab) req->tgt_cfg_valid =1 ;/* This is number of CE configs */ - req->tgt_cfg_len = ((ab->qmi.ce_cfg.tgt_ce_len) / - (sizeof (struct ce_pipe_config ))) -1 ; -for (ret =0 ; ret <= req->tgt_cfg_len ; ret++) { - req->tgt_cfg[ret].pipe_num = ce_cfg[ret].pipenum; - req->tgt_cfg[ret].pipe_dir = ce_cfg[ret].pipedir; - req->tgt_cfg[ret].nentries = ce_cfg[ret].nentries; - req->tgt_cfg[ret].nbytes_max = ce_cfg[ret].nbytes_max; - req->tgt_cfg[ret].flags = ce_cfg[ret].flags; + req->tgt_cfg_len = ab->qmi.ce_cfg.tgt_ce_len; +for (pipe_num =0 ; pipe_num <= req->tgt_cfg_len ; pipe_num++) { + req->tgt_cfg[pipe_num].pipe_num = ce_cfg[pipe_num].pipenum; + req->tgt_cfg[pipe_num].pipe_dir = ce_cfg[pipe_num].pipedir; + req->tgt_cfg[pipe_num].nentries = ce_cfg[pipe_num].nentries; + req->tgt_cfg[pipe_num].nbytes_max = ce_cfg[pipe_num].nbytes_max; + req->tgt_cfg[pipe_num].flags = ce_cfg[pipe_num].flags; } req->svc_cfg_valid =1 ;/* This is number of Service/CE configs */ - req->svc_cfg_len = (ab->qmi.ce_cfg.svc_to_ce_map_len) / - (sizeof (struct service_to_pipe )); -for (ret =0 ; ret < req->svc_cfg_len; ret++) { - req->svc_cfg[ret].service_id = svc_cfg[ret].service_id; - req->svc_cfg[ret].pipe_dir = svc_cfg[ret].pipedir; - req->svc_cfg[ret].pipe_num = svc_cfg[ret].pipenum; + req->svc_cfg_len = ab->qmi.ce_cfg.svc_to_ce_map_len; +for (pipe_num =0 ; pipe_num < req->svc_cfg_len; pipe_num++) { + req->svc_cfg[pipe_num].service_id = svc_cfg[pipe_num].service_id; + req->svc_cfg[pipe_num].pipe_dir = svc_cfg[pipe_num].pipedir; + req->svc_cfg[pipe_num].pipe_num = svc_cfg[pipe_num].pipenum; } req->shadow_reg_valid =0 ; req->shadow_reg_v2_valid =0 ;
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 4 lines · Anilkumar Kolli
Copy CE and htc service configs for all pipes.
Signed-off-by Anilkumar Kolli <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath11k-post-bringup branch of ath.git, thanks.
a6e9c4ddb317 ath11k: qmi clean up ce and HTC service config update b7ba9e95da21 ath11k: qmi clean up in ath11k_qmi_wlanfw_wlan_cfg_send()
Signature · 9 lines
https://patchwork.kernel.org/patch/11217303/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k