wifi: ath11k: fix misspelling of "dma" in num_rxmda_per_pdev

The ath11k_hw_params member num_rxmda_per_pdev contains a misspelling
of "dma" so fix it.

No functional changes, compile tested only.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240504-ath11k-num_rxmda_per_pdev-v1-1-7f97bced8495@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 3cc817a3b4a4047600591804bbc57aa45cba866f..d4ef556852c2c3bea21096f45290fb3ecbe679bf 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -62,7 +62,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = false,
                .rxdma1_enable = true,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
                .htt_peer_map_v2 = true,
@@ -148,7 +148,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = false,
                .rxdma1_enable = true,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
                .htt_peer_map_v2 = true,
@@ -232,7 +232,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = true,
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 2,
+               .num_rxdma_per_pdev = 2,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
                .htt_peer_map_v2 = false,
@@ -320,7 +320,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .svc_to_ce_map_len = 18,
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .rxdma1_enable = true,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
                .htt_peer_map_v2 = true,
@@ -404,7 +404,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = true,
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 2,
+               .num_rxdma_per_pdev = 2,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
                .htt_peer_map_v2 = false,
@@ -492,7 +492,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .svc_to_ce_map_len = 14,
                .single_pdev_only = true,
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 2,
+               .num_rxdma_per_pdev = 2,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
                .htt_peer_map_v2 = false,
@@ -580,7 +580,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = true,
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 1,
+               .num_rxdma_per_pdev = 1,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
                .htt_peer_map_v2 = false,
@@ -673,7 +673,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq5018,
                .ce_remap = &ath11k_ce_remap_ipq5018,
                .rxdma1_enable = true,
-               .num_rxmda_per_pdev = RXDMA_PER_PDEV_5018,
+               .num_rxdma_per_pdev = RXDMA_PER_PDEV_5018,
                .rx_mac_buf_ring = false,
                .vdev_start_delay = false,
                .htt_peer_map_v2 = true,
@@ -744,7 +744,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
                .single_pdev_only = true,
                .rxdma1_enable = false,
-               .num_rxmda_per_pdev = 2,
+               .num_rxdma_per_pdev = 2,
                .rx_mac_buf_ring = true,
                .vdev_start_delay = true,
                .htt_peer_map_v2 = false,
@@ -1801,7 +1801,7 @@ static int ath11k_core_start(struct ath11k_base *ab)
        }
 
        /* put hardware to DBS mode */
-       if (ab->hw_params.single_pdev_only && ab->hw_params.num_rxmda_per_pdev > 1) {
+       if (ab->hw_params.single_pdev_only && ab->hw_params.num_rxdma_per_pdev > 1) {
                ret = ath11k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS);
                if (ret) {
                        ath11k_err(ab, "failed to send dbs mode: %d\n", ret);

diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index 414a5ce279f785489bf8a79cbeb9855a1d9cacdb..57281a135dd7fa6b8610636f47873c8bba21053c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -668,7 +668,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file,
 
        ar->debug.rx_filter = tlv_filter.rx_filter;
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,
                                                       HAL_RXDMA_MONITOR_STATUS,
@@ -1112,7 +1112,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,
        }
 
        /* Clear rx filter set for monitor mode and rx status */
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,
                                                       HAL_RXDMA_MONITOR_STATUS,
@@ -1171,7 +1171,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,
                                               HTT_RX_FP_DATA_FILTER_FLASG3;
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                ret = ath11k_dp_tx_htt_rx_filter_setup(ab, ring_id,
                                                       ar->dp.mac_id + i,

diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c
index 1a62407e5a9f23ec882a5c28c869904a055f8d21..fbf666d0ecf1dc36677357d149f19b1320a9605d 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp.c
+++ b/drivers/net/wireless/ath/ath11k/dp.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <crypto/hash.h>
@@ -830,8 +830,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,
 
        if (ab->hw_params.ring_mask->rx_mon_status[grp_id]) {
                for (i = 0; i < ab->num_radios; i++) {
-                       for (j = 0; j < ab->hw_params.num_rxmda_per_pdev; j++) {
-                               int id = i * ab->hw_params.num_rxmda_per_pdev + j;
+                       for (j = 0; j < ab->hw_params.num_rxdma_per_pdev; j++) {
+                               int id = i * ab->hw_params.num_rxdma_per_pdev + j;
 
                                if (ab->hw_params.ring_mask->rx_mon_status[grp_id] &
                                        BIT(id)) {
@@ -853,8 +853,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,
                ath11k_dp_process_reo_status(ab);
 
        for (i = 0; i < ab->num_radios; i++) {
-               for (j = 0; j < ab->hw_params.num_rxmda_per_pdev; j++) {
-                       int id = i * ab->hw_params.num_rxmda_per_pdev + j;
+               for (j = 0; j < ab->hw_params.num_rxdma_per_pdev; j++) {
+                       int id = i * ab->hw_params.num_rxdma_per_pdev + j;
 
                        if (ab->hw_params.ring_mask->rxdma2host[grp_id] & BIT(id)) {
                                work_done = ath11k_dp_process_rxdma_err(ab, id, budget);
@@ -913,7 +913,7 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab)
                spin_lock_init(&dp->rx_refill_buf_ring.idr_lock);
                atomic_set(&dp->num_tx_pending, 0);
                init_waitqueue_head(&dp->tx_empty_waitq);
-               for (j = 0; j < ab->hw_params.num_rxmda_per_pdev; j++) {
+               for (j = 0; j < ab->hw_params.num_rxdma_per_pdev; j++) {
                        idr_init(&dp->rx_mon_status_refill_ring[j].bufs_idr);
                        spin_lock_init(&dp->rx_mon_status_refill_ring[j].idr_lock);
                }

diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index 8a860a17d7e48e65658633c16eecd175d9e4e5d0..198fb359a688c5248768e2db5e6a5a76a387c665 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -311,7 +311,7 @@ static void ath11k_dp_service_mon_ring(struct timer_list *t)
        struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer);
        int i;
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++)
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++)
                ath11k_dp_rx_process_mon_rings(ab, i, NULL, DP_MON_SERVICE_BUDGET);
 
        mod_timer(&ab->mon_reap_timer, jiffies +
@@ -324,7 +324,7 @@ static int ath11k_dp_purge_mon_ring(struct ath11k_base *ab)
        unsigned long timeout = jiffies + msecs_to_jiffies(DP_MON_PURGE_TIMEOUT_MS);
 
        do {
-               for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++)
+               for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++)
                        reaped += ath11k_dp_rx_process_mon_rings(ab, i,
                                                                 NULL,
                                                                 DP_MON_SERVICE_BUDGET);
@@ -468,7 +468,7 @@ static int ath11k_dp_rxdma_pdev_buf_free(struct ath11k *ar)
        rx_ring = &dp->rxdma_mon_buf_ring;
        ath11k_dp_rxdma_buf_ring_free(ar, rx_ring);
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                rx_ring = &dp->rx_mon_status_refill_ring[i];
                ath11k_dp_rxdma_buf_ring_free(ar, rx_ring);
        }
@@ -506,7 +506,7 @@ static int ath11k_dp_rxdma_pdev_buf_setup(struct ath11k *ar)
                ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_MONITOR_BUF);
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                rx_ring = &dp->rx_mon_status_refill_ring[i];
                ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_MONITOR_STATUS);
        }
@@ -522,7 +522,7 @@ static void ath11k_dp_rx_pdev_srng_free(struct ath11k *ar)
 
        ath11k_dp_srng_cleanup(ab, &dp->rx_refill_buf_ring.refill_buf_ring);
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                if (ab->hw_params.rx_mac_buf_ring)
                        ath11k_dp_srng_cleanup(ab, &dp->rx_mac_buf_ring[i]);
 
@@ -585,7 +585,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)
        }
 
        if (ar->ab->hw_params.rx_mac_buf_ring) {
-               for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+               for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                        ret = ath11k_dp_srng_setup(ar->ab,
                                                   &dp->rx_mac_buf_ring[i],
                                                   HAL_RXDMA_BUF, 1,
@@ -598,7 +598,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)
                }
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ret = ath11k_dp_srng_setup(ar->ab, &dp->rxdma_err_dst_ring[i],
                                           HAL_RXDMA_DST, 0, dp->mac_id + i,
                                           DP_RXDMA_ERR_DST_RING_SIZE);
@@ -608,7 +608,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)
                }
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                srng = &dp->rx_mon_status_refill_ring[i].refill_buf_ring;
                ret = ath11k_dp_srng_setup(ar->ab,
                                           srng,
@@ -4455,7 +4455,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)
        }
 
        if (ab->hw_params.rx_mac_buf_ring) {
-               for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+               for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                        ring_id = dp->rx_mac_buf_ring[i].ring_id;
                        ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,
                                                          mac_id + i, HAL_RXDMA_BUF);
@@ -4467,7 +4467,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)
                }
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = dp->rxdma_err_dst_ring[i].ring_id;
                ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,
                                                  mac_id + i, HAL_RXDMA_DST);
@@ -4507,7 +4507,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)
        }
 
 config_refill_ring:
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = dp->rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id, mac_id + i,
                                                  HAL_RXDMA_MONITOR_STATUS);

diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
index 272b1c35f98df2db0afbc9ff90b90796cfd289a9..21819b74170104aedc8c6b670de3cc83da093529 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
@@ -1035,7 +1035,7 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *ar, u32 mask)
        int ret;
        int i;
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                skb = ath11k_htc_alloc_skb(ab, len);
                if (!skb)
                        return -ENOMEM;
@@ -1218,7 +1218,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)
                                                       &tlv_filter);
        } else if (!reset) {
                /* set in monitor mode only */
-               for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+               for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                        ring_id = dp->rx_mac_buf_ring[i].ring_id;
                        ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id,
                                                               dp->mac_id + i,
@@ -1231,7 +1231,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)
        if (ret)
                return ret;
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = dp->rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                if (!reset) {
                        tlv_filter.rx_filter =

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index 14ef4eb48f807dede8da4f43d63547a1795ee75a..300322535766eb722e0fc77c439901a653992108 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause-Clear */
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef ATH11K_HW_H
@@ -167,7 +167,7 @@ struct ath11k_hw_params {
        bool single_pdev_only;
 
        bool rxdma1_enable;
-       int num_rxmda_per_pdev;
+       int num_rxdma_per_pdev;
        bool rx_mac_buf_ring;
        bool vdev_start_delay;
        bool htt_peer_map_v2;

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index a71195344288a081cbfe197259e60c7141cc8944..17b06c0cd06282ca3e0a518e0fcd21b17178e052 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6108,7 +6108,7 @@ static int ath11k_mac_config_mon_status_default(struct ath11k *ar, bool enable)
                        tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar);
        }
 
-       for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {
+       for (i = 0; i < ab->hw_params.num_rxdma_per_pdev; i++) {
                ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
                ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id,
                                                       ar->dp.mac_id + i,

diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 737fcd450d4bdad3c654cd5c38e158f14ef0778a..4c3aefbbabbe77ac998843952e1a89a4ff0f15d4 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 /*
  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #include <linux/rtnetlink.h>
 
@@ -878,7 +878,7 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
                ath11k_reg_reset_info(reg_info);
 
                if (ab->hw_params.single_pdev_only &&
-                   pdev_idx < ab->hw_params.num_rxmda_per_pdev)
+                   pdev_idx < ab->hw_params.num_rxdma_per_pdev)
                        return 0;
                goto fallback;
        }

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 6ff01c45f16591cc4a3de0dcf38a9b764b2dae6a..38f175dd15578a312bce3d457aee1cd7b8acad51 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -9082,7 +9082,7 @@ int ath11k_wmi_attach(struct ath11k_base *ab)
        ab->wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_MAX;
 
        /* It's overwritten when service_ext_ready is handled */
-       if (ab->hw_params.single_pdev_only && ab->hw_params.num_rxmda_per_pdev > 1)
+       if (ab->hw_params.single_pdev_only && ab->hw_params.num_rxdma_per_pdev > 1)
                ab->wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_SINGLE;
 
        /* TODO: Init remaining wmi soc resources required */