Hi Anilkumar,
On Tue, Jun 9, 2020 at 3:07 PM Anilkumar Kolli <akolli@xxxxxxxxxxxxxx> wrote:
>
> IPQ6018 does not support mac2, add a new ce service map.
>
> Signed-off-by: Anilkumar Kolli <akolli@xxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath11k/ahb.c | 122 ++++++++++++++++++++++++++++++++--
> 1 file changed, 117 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
> index b080ad8fab0a..25764f719db0 100644
> --- a/drivers/net/wireless/ath/ath11k/ahb.c
> +++ b/drivers/net/wireless/ath/ath11k/ahb.c
> @@ -647,8 +749,15 @@ static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab)
>
> 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;
> + if (ab->hw_params.dev_id == ATH11K_HW_IPQ6018) {
> + cfg->svc_to_ce_map_len =
> + ARRAY_SIZE(target_service_to_ce_map_wlan_ipq6018);
> + cfg->svc_to_ce_map = target_service_to_ce_map_wlan_ipq6018;
> + } else {
> + cfg->svc_to_ce_map_len =
> + ARRAY_SIZE(target_service_to_ce_map_wlan_ipq8074);
> + cfg->svc_to_ce_map = target_service_to_ce_map_wlan_ipq8074;
> + }
You could just have a pointer to this array in the "hw_params"
structure which would reduce this to something like:
cfg->svc_to_ce_map_len = ARRAY_SIZE(ab->hw_params.service_to_ce_map);
cfg->svc_to_ce_map = ab->hw_params.service_to_ce_map;
and make adding future hardware easier.
> }
>
> static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)
> @@ -856,8 +965,11 @@ static int ath11k_ahb_map_service_to_pipe(struct ath11k_base *ab, u16 service_id
> bool ul_set = false, dl_set = false;
> int i;
>
> - for (i = 0; i < ARRAY_SIZE(target_service_to_ce_map_wlan); i++) {
> - entry = &target_service_to_ce_map_wlan[i];
> + for (i = 0; i < ab->qmi.ce_cfg.svc_to_ce_map_len; i++) {
Is this the same "svc_to_ce_map_len" as in the hunk above?
If so the code below could just be:
entry = &ab->qmi.ce_cfg.svc_to_ce_map[i];
> + if (ab->hw_params.dev_id == ATH11K_HW_IPQ6018)
> + entry = &target_service_to_ce_map_wlan_ipq6018[i];
> + else
> + entry = &target_service_to_ce_map_wlan_ipq8074[i];
>
> if (__le32_to_cpu(entry->service_id) != service_id)
> continue;
> --
> 2.7.4
>
Thanks,
--
Julian Calaby
Email: julian.calaby@xxxxxxxxx
Profile: http://www.google.com/profiles/julian.calaby/
