From: Anilkumar Kolli <akolli@xxxxxxxxxxxxxx>
Copy CE and htc service configs for all pipes.
Signed-off-by: Anilkumar Kolli <akolli@xxxxxxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
---
drivers/net/wireless/ath/ath11k/ahb.c | 9 ++++-----
drivers/net/wireless/ath/ath11k/qmi.h | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index f80173b8afc6..e7e3e64c07aa 100644
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -635,11 +635,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)
diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index df0685564e21..3f7db642d869 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -66,9 +66,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;
--
2.7.4
