ath11k: define max_radios in hw_params

IPQ6018 needs different value for max_radios so make it configurable via hw_params.

No functional changes. Compile tested only.

Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1592316055-24958-4-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 92d7925ad0f49e39cd76a53cac6587da15978f6a..67822508327c6716f38c1d97fb221fb7ce68a6c4 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -26,6 +26,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                        .board_size = IPQ8074_MAX_BOARD_DATA_SZ,
                        .cal_size =  IPQ8074_MAX_CAL_DATA_SZ,
                },
+               .max_radios = 3,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index 791d971784ce0651ec4d7c739c24e6e1eeae652f..5680b99a4f5c1a46e8a9731acbb137ad2b178b3e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -3820,7 +3820,7 @@ int ath11k_dp_rx_process_wbm_err(struct ath11k_base *ab,
        int total_num_buffs_reaped = 0;
        int ret, i;
 
-       for (i = 0; i < MAX_RADIOS; i++)
+       for (i = 0; i < ab->num_radios; i++)
                __skb_queue_head_init(&msdu_list[i]);
 
        srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id];

diff --git a/drivers/net/wireless/ath/ath11k/htc.c b/drivers/net/wireless/ath/ath11k/htc.c
index ad13c648b679e363ea7fc233ae75afb4c8eed2c1..bc0026c1e4a695fe8d58d33d8b5c697b74d44e31 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/htc.c
+++ b/drivers/net/wireless/ath/ath11k/htc.c
@@ -748,7 +748,7 @@ int ath11k_htc_init(struct ath11k_base *ab)
                htc->wmi_ep_count = 3;
                break;
        default:
-               htc->wmi_ep_count = 3;
+               htc->wmi_ep_count = ab->hw_params.max_radios;
                break;
        }
 

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index f95ad31d3d6c88be71ecbc7cb520aff02c0b20cd..ba897d186cf5bcd7b322a2ccb712153348fbb254 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -107,6 +107,7 @@ enum ath11k_bus {
 struct ath11k_hw_params {
        const char *name;
        u16 hw_rev;
+       u8 max_radios;
        struct {
                const char *dir;
                size_t board_size;

diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 7c9dc91cc48a95bf4b7bc4bf5035b13c381f7758..0ba80e6f397951fb088b7db6ec1f59faab70664d 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -699,7 +699,7 @@ void ath11k_reg_free(struct ath11k_base *ab)
 {
        int i;
 
-       for (i = 0; i < MAX_RADIOS; i++) {
+       for (i = 0; i < ab->hw_params.max_radios; i++) {
                kfree(ab->default_regd[i]);
                kfree(ab->new_regd[i]);
        }

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 8e3437a65673692a7bc7a13aa8d4efc67bae2f53..cd1bdb2a75c9d1c4832598a6c57eb763bccf8dbd 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -6682,7 +6682,7 @@ int ath11k_wmi_connect(struct ath11k_base *ab)
        u8 wmi_ep_count;
 
        wmi_ep_count = ab->htc.wmi_ep_count;
-       if (wmi_ep_count > MAX_RADIOS)
+       if (wmi_ep_count > ab->hw_params.max_radios)
                return -1;
 
        for (i = 0; i < wmi_ep_count; i++)
@@ -6704,7 +6704,7 @@ int ath11k_wmi_pdev_attach(struct ath11k_base *ab,
 {
        struct ath11k_pdev_wmi *wmi_handle;
 
-       if (pdev_id >= MAX_RADIOS)
+       if (pdev_id >= ab->hw_params.max_radios)
                return -EINVAL;
 
        wmi_handle = &ab->wmi_ab.wmi[pdev_id];