Skip to content

L
linux
Commit a6efa4ea authored by Jeff Johnson's avatar Jeff Johnson Committed by Kalle Valo
Browse files
Options

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: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240504-ath11k-num_rxmda_per_pdev-v1-1-7f97bced8495@quicinc.com
parent 2db7a82f
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
drivers/net/wireless/ath/ath11k/core.c
View file @ a6efa4ea
...@@ -62,7 +62,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -62,7 +62,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = false, .single_pdev_only = false,
.rxdma1_enable = true, .rxdma1_enable = true,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
.htt_peer_map_v2 = true, .htt_peer_map_v2 = true,
...@@ -148,7 +148,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -148,7 +148,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = false, .single_pdev_only = false,
.rxdma1_enable = true, .rxdma1_enable = true,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
.htt_peer_map_v2 = true, .htt_peer_map_v2 = true,
...@@ -232,7 +232,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -232,7 +232,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = true, .single_pdev_only = true,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 2, .num_rxdma_per_pdev = 2,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
.htt_peer_map_v2 = false, .htt_peer_map_v2 = false,
...@@ -320,7 +320,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -320,7 +320,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.svc_to_ce_map_len = 18, .svc_to_ce_map_len = 18,
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.rxdma1_enable = true, .rxdma1_enable = true,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
.htt_peer_map_v2 = true, .htt_peer_map_v2 = true,
...@@ -404,7 +404,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -404,7 +404,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = true, .single_pdev_only = true,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 2, .num_rxdma_per_pdev = 2,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
.htt_peer_map_v2 = false, .htt_peer_map_v2 = false,
...@@ -492,7 +492,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -492,7 +492,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.svc_to_ce_map_len = 14, .svc_to_ce_map_len = 14,
.single_pdev_only = true, .single_pdev_only = true,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 2, .num_rxdma_per_pdev = 2,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
.htt_peer_map_v2 = false, .htt_peer_map_v2 = false,
...@@ -580,7 +580,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -580,7 +580,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = true, .single_pdev_only = true,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 1, .num_rxdma_per_pdev = 1,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
.htt_peer_map_v2 = false, .htt_peer_map_v2 = false,
...@@ -673,7 +673,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -673,7 +673,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq5018, .ce_ie_addr = &ath11k_ce_ie_addr_ipq5018,
.ce_remap = &ath11k_ce_remap_ipq5018, .ce_remap = &ath11k_ce_remap_ipq5018,
.rxdma1_enable = true, .rxdma1_enable = true,
.num_rxmda_per_pdev = RXDMA_PER_PDEV_5018, .num_rxdma_per_pdev = RXDMA_PER_PDEV_5018,
.rx_mac_buf_ring = false, .rx_mac_buf_ring = false,
.vdev_start_delay = false, .vdev_start_delay = false,
.htt_peer_map_v2 = true, .htt_peer_map_v2 = true,
...@@ -744,7 +744,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { ...@@ -744,7 +744,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
.ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074,
.single_pdev_only = true, .single_pdev_only = true,
.rxdma1_enable = false, .rxdma1_enable = false,
.num_rxmda_per_pdev = 2, .num_rxdma_per_pdev = 2,
.rx_mac_buf_ring = true, .rx_mac_buf_ring = true,
.vdev_start_delay = true, .vdev_start_delay = true,
.htt_peer_map_v2 = false, .htt_peer_map_v2 = false,
...@@ -1801,7 +1801,7 @@ static int ath11k_core_start(struct ath11k_base *ab) ...@@ -1801,7 +1801,7 @@ static int ath11k_core_start(struct ath11k_base *ab)
} }
/* put hardware to DBS mode */ /* 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); ret = ath11k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS);
if (ret) { if (ret) {
ath11k_err(ab, "failed to send dbs mode: %d\n", ret); ath11k_err(ab, "failed to send dbs mode: %d\n", ret);
......
drivers/net/wireless/ath/ath11k/debugfs.c
View file @ a6efa4ea
...@@ -668,7 +668,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file, ...@@ -668,7 +668,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file,
ar->debug.rx_filter = tlv_filter.rx_filter; 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; 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, ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,
HAL_RXDMA_MONITOR_STATUS, HAL_RXDMA_MONITOR_STATUS,
...@@ -1112,7 +1112,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file, ...@@ -1112,7 +1112,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,
} }
/* Clear rx filter set for monitor mode and rx status */ /* 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; 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, ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,
HAL_RXDMA_MONITOR_STATUS, HAL_RXDMA_MONITOR_STATUS,
...@@ -1171,7 +1171,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file, ...@@ -1171,7 +1171,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,
HTT_RX_FP_DATA_FILTER_FLASG3; 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; 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, ret = ath11k_dp_tx_htt_rx_filter_setup(ab, ring_id,
ar->dp.mac_id + i, ar->dp.mac_id + i,
......
drivers/net/wireless/ath/ath11k/dp.c
View file @ a6efa4ea
// SPDX-License-Identifier: BSD-3-Clause-Clear // SPDX-License-Identifier: BSD-3-Clause-Clear
/* /*
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * 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> #include <crypto/hash.h>
...@@ -830,8 +830,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, ...@@ -830,8 +830,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,
if (ab->hw_params.ring_mask->rx_mon_status[grp_id]) { if (ab->hw_params.ring_mask->rx_mon_status[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 (ab->hw_params.ring_mask->rx_mon_status[grp_id] & if (ab->hw_params.ring_mask->rx_mon_status[grp_id] &
BIT(id)) { BIT(id)) {
...@@ -853,8 +853,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, ...@@ -853,8 +853,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,
ath11k_dp_process_reo_status(ab); ath11k_dp_process_reo_status(ab);
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 (ab->hw_params.ring_mask->rxdma2host[grp_id] & BIT(id)) { if (ab->hw_params.ring_mask->rxdma2host[grp_id] & BIT(id)) {
work_done = ath11k_dp_process_rxdma_err(ab, id, budget); work_done = ath11k_dp_process_rxdma_err(ab, id, budget);
...@@ -913,7 +913,7 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab) ...@@ -913,7 +913,7 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab)
spin_lock_init(&dp->rx_refill_buf_ring.idr_lock); spin_lock_init(&dp->rx_refill_buf_ring.idr_lock);
atomic_set(&dp->num_tx_pending, 0); atomic_set(&dp->num_tx_pending, 0);
init_waitqueue_head(&dp->tx_empty_waitq); 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); idr_init(&dp->rx_mon_status_refill_ring[j].bufs_idr);
spin_lock_init(&dp->rx_mon_status_refill_ring[j].idr_lock); spin_lock_init(&dp->rx_mon_status_refill_ring[j].idr_lock);
} }
......
drivers/net/wireless/ath/ath11k/dp_rx.c
View file @ a6efa4ea
...@@ -311,7 +311,7 @@ static void ath11k_dp_service_mon_ring(struct timer_list *t) ...@@ -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); struct ath11k_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++)
ath11k_dp_rx_process_mon_rings(ab, i, NULL, DP_MON_SERVICE_BUDGET); ath11k_dp_rx_process_mon_rings(ab, i, NULL, DP_MON_SERVICE_BUDGET);
mod_timer(&ab->mon_reap_timer, jiffies + mod_timer(&ab->mon_reap_timer, jiffies +
...@@ -324,7 +324,7 @@ static int ath11k_dp_purge_mon_ring(struct ath11k_base *ab) ...@@ -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); unsigned long timeout = jiffies + msecs_to_jiffies(DP_MON_PURGE_TIMEOUT_MS);
do { 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, reaped += ath11k_dp_rx_process_mon_rings(ab, i,
NULL, NULL,
DP_MON_SERVICE_BUDGET); DP_MON_SERVICE_BUDGET);
...@@ -468,7 +468,7 @@ static int ath11k_dp_rxdma_pdev_buf_free(struct ath11k *ar) ...@@ -468,7 +468,7 @@ static int ath11k_dp_rxdma_pdev_buf_free(struct ath11k *ar)
rx_ring = &dp->rxdma_mon_buf_ring; rx_ring = &dp->rxdma_mon_buf_ring;
ath11k_dp_rxdma_buf_ring_free(ar, rx_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]; rx_ring = &dp->rx_mon_status_refill_ring[i];
ath11k_dp_rxdma_buf_ring_free(ar, rx_ring); ath11k_dp_rxdma_buf_ring_free(ar, rx_ring);
} }
...@@ -506,7 +506,7 @@ static int ath11k_dp_rxdma_pdev_buf_setup(struct ath11k *ar) ...@@ -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); 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]; rx_ring = &dp->rx_mon_status_refill_ring[i];
ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_MONITOR_STATUS); 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) ...@@ -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); 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) if (ab->hw_params.rx_mac_buf_ring)
ath11k_dp_srng_cleanup(ab, &dp->rx_mac_buf_ring[i]); 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) ...@@ -585,7 +585,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)
} }
if (ar->ab->hw_params.rx_mac_buf_ring) { 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, ret = ath11k_dp_srng_setup(ar->ab,
&dp->rx_mac_buf_ring[i], &dp->rx_mac_buf_ring[i],
HAL_RXDMA_BUF, 1, HAL_RXDMA_BUF, 1,
...@@ -598,7 +598,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar) ...@@ -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], ret = ath11k_dp_srng_setup(ar->ab, &dp->rxdma_err_dst_ring[i],
HAL_RXDMA_DST, 0, dp->mac_id + i, HAL_RXDMA_DST, 0, dp->mac_id + i,
DP_RXDMA_ERR_DST_RING_SIZE); DP_RXDMA_ERR_DST_RING_SIZE);
...@@ -608,7 +608,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar) ...@@ -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; srng = &dp->rx_mon_status_refill_ring[i].refill_buf_ring;
ret = ath11k_dp_srng_setup(ar->ab, ret = ath11k_dp_srng_setup(ar->ab,
srng, srng,
...@@ -4455,7 +4455,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) ...@@ -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) { 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 = ath11k_dp_tx_htt_srng_setup(ab, ring_id, ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,
mac_id + i, HAL_RXDMA_BUF); mac_id + i, HAL_RXDMA_BUF);
...@@ -4467,7 +4467,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) ...@@ -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; ring_id = dp->rxdma_err_dst_ring[i].ring_id;
ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id, ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,
mac_id + i, HAL_RXDMA_DST); mac_id + i, HAL_RXDMA_DST);
...@@ -4507,7 +4507,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) ...@@ -4507,7 +4507,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)
} }
config_refill_ring: 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; 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, ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id, mac_id + i,
HAL_RXDMA_MONITOR_STATUS); HAL_RXDMA_MONITOR_STATUS);
......
drivers/net/wireless/ath/ath11k/dp_tx.c
View file @ a6efa4ea
...@@ -1035,7 +1035,7 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *ar, u32 mask) ...@@ -1035,7 +1035,7 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *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 = ath11k_htc_alloc_skb(ab, len); skb = ath11k_htc_alloc_skb(ab, len);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
...@@ -1218,7 +1218,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset) ...@@ -1218,7 +1218,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)
&tlv_filter); &tlv_filter);
} else if (!reset) { } else if (!reset) {
/* set in monitor mode only */ /* 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; ring_id = dp->rx_mac_buf_ring[i].ring_id;
ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id,
dp->mac_id + i, dp->mac_id + i,
...@@ -1231,7 +1231,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset) ...@@ -1231,7 +1231,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)
if (ret) if (ret)
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->rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; ring_id = dp->rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;
if (!reset) { if (!reset) {
tlv_filter.rx_filter = tlv_filter.rx_filter =
......
drivers/net/wireless/ath/ath11k/hw.h
View file @ a6efa4ea
/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* SPDX-License-Identifier: BSD-3-Clause-Clear */
/* /*
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * 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 #ifndef ATH11K_HW_H
...@@ -167,7 +167,7 @@ struct ath11k_hw_params { ...@@ -167,7 +167,7 @@ struct ath11k_hw_params {
bool single_pdev_only; bool single_pdev_only;
bool rxdma1_enable; bool rxdma1_enable;
int num_rxmda_per_pdev; int num_rxdma_per_pdev;
bool rx_mac_buf_ring; bool rx_mac_buf_ring;
bool vdev_start_delay; bool vdev_start_delay;
bool htt_peer_map_v2; bool htt_peer_map_v2;
......
drivers/net/wireless/ath/ath11k/mac.c
View file @ a6efa4ea
...@@ -6108,7 +6108,7 @@ static int ath11k_mac_config_mon_status_default(struct ath11k *ar, bool enable) ...@@ -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); 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; 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, ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id,
ar->dp.mac_id + i, ar->dp.mac_id + i,
......
drivers/net/wireless/ath/ath11k/reg.c
View file @ a6efa4ea
// SPDX-License-Identifier: BSD-3-Clause-Clear // SPDX-License-Identifier: BSD-3-Clause-Clear
/* /*
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * 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> #include <linux/rtnetlink.h>
...@@ -878,7 +878,7 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab, ...@@ -878,7 +878,7 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
ath11k_reg_reset_info(reg_info); ath11k_reg_reset_info(reg_info);
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)
return 0; return 0;
goto fallback; goto fallback;
} }
......
drivers/net/wireless/ath/ath11k/wmi.c
View file @ a6efa4ea
...@@ -9082,7 +9082,7 @@ int ath11k_wmi_attach(struct ath11k_base *ab) ...@@ -9082,7 +9082,7 @@ int ath11k_wmi_attach(struct ath11k_base *ab)
ab->wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_MAX; ab->wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_MAX;
/* It's overwritten when service_ext_ready is handled */ /* 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; ab->wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_SINGLE;
/* TODO: Init remaining wmi soc resources required */ /* TODO: Init remaining wmi soc resources required */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7