Commit ff5fa958 authored by Jeff Johnson's avatar Jeff Johnson Committed by Kalle Valo

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

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

No functional changes, compile tested only.
Signed-off-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240504-ath12k_dp_rxdma_ring_sel_config_wcn7850-ret-v1-1-44d2843a2857@quicinc.com
parent a6efa4ea
...@@ -907,8 +907,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab, ...@@ -907,8 +907,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,
monitor_mode = ATH12K_DP_RX_MONITOR_MODE; monitor_mode = ATH12K_DP_RX_MONITOR_MODE;
ring_mask = ab->hw_params->ring_mask->rx_mon_dest[grp_id]; ring_mask = ab->hw_params->ring_mask->rx_mon_dest[grp_id];
for (i = 0; i < ab->num_radios; i++) { for (i = 0; i < ab->num_radios; i++) {
for (j = 0; j < 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_rxmda_per_pdev + j; int id = i * ab->hw_params->num_rxdma_per_pdev + j;
if (ring_mask & BIT(id)) { if (ring_mask & BIT(id)) {
work_done = work_done =
...@@ -928,8 +928,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab, ...@@ -928,8 +928,8 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,
monitor_mode = ATH12K_DP_TX_MONITOR_MODE; monitor_mode = ATH12K_DP_TX_MONITOR_MODE;
ring_mask = ab->hw_params->ring_mask->tx_mon_dest[grp_id]; ring_mask = ab->hw_params->ring_mask->tx_mon_dest[grp_id];
for (i = 0; i < ab->num_radios; i++) { for (i = 0; i < ab->num_radios; i++) {
for (j = 0; j < 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_rxmda_per_pdev + j; int id = i * ab->hw_params->num_rxdma_per_pdev + j;
if (ring_mask & BIT(id)) { if (ring_mask & BIT(id)) {
work_done = work_done =
...@@ -1017,7 +1017,7 @@ static void ath12k_dp_service_mon_ring(struct timer_list *t) ...@@ -1017,7 +1017,7 @@ static void ath12k_dp_service_mon_ring(struct timer_list *t)
struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer); struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer);
int i; 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++)
ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET, ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET,
ATH12K_DP_RX_MONITOR_MODE); ATH12K_DP_RX_MONITOR_MODE);
......
...@@ -485,7 +485,7 @@ static void ath12k_dp_rx_pdev_srng_free(struct ath12k *ar) ...@@ -485,7 +485,7 @@ static void ath12k_dp_rx_pdev_srng_free(struct ath12k *ar)
struct ath12k_base *ab = ar->ab; struct ath12k_base *ab = ar->ab;
int i; 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++)
ath12k_dp_srng_cleanup(ab, &dp->rxdma_mon_dst_ring[i]); ath12k_dp_srng_cleanup(ab, &dp->rxdma_mon_dst_ring[i]);
} }
...@@ -530,7 +530,7 @@ static int ath12k_dp_rx_pdev_srng_alloc(struct ath12k *ar) ...@@ -530,7 +530,7 @@ static int ath12k_dp_rx_pdev_srng_alloc(struct ath12k *ar)
int ret; int ret;
u32 mac_id = dp->mac_id; u32 mac_id = dp->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++) {
ret = ath12k_dp_srng_setup(ar->ab, ret = ath12k_dp_srng_setup(ar->ab,
&dp->rxdma_mon_dst_ring[i], &dp->rxdma_mon_dst_ring[i],
HAL_RXDMA_MONITOR_DST, HAL_RXDMA_MONITOR_DST,
...@@ -3938,7 +3938,7 @@ void ath12k_dp_rx_free(struct ath12k_base *ab) ...@@ -3938,7 +3938,7 @@ void ath12k_dp_rx_free(struct ath12k_base *ab)
ath12k_dp_srng_cleanup(ab, &dp->rx_refill_buf_ring.refill_buf_ring); ath12k_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) if (ab->hw_params->rx_mac_buf_ring)
ath12k_dp_srng_cleanup(ab, &dp->rx_mac_buf_ring[i]); ath12k_dp_srng_cleanup(ab, &dp->rx_mac_buf_ring[i]);
} }
...@@ -4030,7 +4030,7 @@ int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab) ...@@ -4030,7 +4030,7 @@ int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab)
* and modify the rx_desc struct * and modify the rx_desc struct
*/ */
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; ring_id = dp->rx_mac_buf_ring[i].ring_id;
ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, i, ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, i,
HAL_RXDMA_BUF, HAL_RXDMA_BUF,
...@@ -4057,7 +4057,7 @@ int ath12k_dp_rx_htt_setup(struct ath12k_base *ab) ...@@ -4057,7 +4057,7 @@ int ath12k_dp_rx_htt_setup(struct ath12k_base *ab)
} }
if (ab->hw_params->rx_mac_buf_ring) { 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; ring_id = dp->rx_mac_buf_ring[i].ring_id;
ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,
i, HAL_RXDMA_BUF); i, HAL_RXDMA_BUF);
...@@ -4118,7 +4118,7 @@ int ath12k_dp_rx_alloc(struct ath12k_base *ab) ...@@ -4118,7 +4118,7 @@ int ath12k_dp_rx_alloc(struct ath12k_base *ab)
} }
if (ab->hw_params->rx_mac_buf_ring) { 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++) {
ret = ath12k_dp_srng_setup(ab, ret = ath12k_dp_srng_setup(ab,
&dp->rx_mac_buf_ring[i], &dp->rx_mac_buf_ring[i],
HAL_RXDMA_BUF, 1, HAL_RXDMA_BUF, 1,
...@@ -4178,7 +4178,7 @@ int ath12k_dp_rx_pdev_alloc(struct ath12k_base *ab, int mac_id) ...@@ -4178,7 +4178,7 @@ int ath12k_dp_rx_pdev_alloc(struct ath12k_base *ab, int mac_id)
return 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->rxdma_mon_dst_ring[i].ring_id; ring_id = dp->rxdma_mon_dst_ring[i].ring_id;
ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,
mac_id + i, mac_id + i,
......
...@@ -865,7 +865,7 @@ int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask) ...@@ -865,7 +865,7 @@ int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask)
int ret; int ret;
int i; 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 = ath12k_htc_alloc_skb(ab, len); skb = ath12k_htc_alloc_skb(ab, len);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
......
...@@ -884,7 +884,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = { ...@@ -884,7 +884,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.hal_params = &ath12k_hw_hal_params_qcn9274, .hal_params = &ath12k_hw_hal_params_qcn9274,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.num_rxdma_dst_ring = 0, .num_rxdma_dst_ring = 0,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
...@@ -956,7 +956,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = { ...@@ -956,7 +956,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.hal_params = &ath12k_hw_hal_params_wcn7850, .hal_params = &ath12k_hw_hal_params_wcn7850,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 2, .num_rxdma_per_pdev = 2,
.num_rxdma_dst_ring = 1, .num_rxdma_dst_ring = 1,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
...@@ -1029,7 +1029,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = { ...@@ -1029,7 +1029,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.hal_params = &ath12k_hw_hal_params_qcn9274, .hal_params = &ath12k_hw_hal_params_qcn9274,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.num_rxdma_dst_ring = 0, .num_rxdma_dst_ring = 0,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
......
...@@ -174,7 +174,7 @@ struct ath12k_hw_params { ...@@ -174,7 +174,7 @@ struct ath12k_hw_params {
const struct ath12k_hw_hal_params *hal_params; const struct ath12k_hw_hal_params *hal_params;
bool rxdma1_enable:1; bool rxdma1_enable:1;
int num_rxmda_per_pdev; int num_rxdma_per_pdev;
int num_rxdma_dst_ring; int num_rxdma_dst_ring;
bool rx_mac_buf_ring:1; bool rx_mac_buf_ring:1;
bool vdev_start_delay:1; bool vdev_start_delay:1;
......
...@@ -5693,7 +5693,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk ...@@ -5693,7 +5693,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk
* event. Otherwise, it goes to fallback. * event. Otherwise, it goes to fallback.
*/ */
if (ab->hw_params->single_pdev_only && 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)
goto mem_free; goto mem_free;
else else
goto fallback; goto fallback;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment