|
1 | 1 | // SPDX-License-Identifier: BSD-3-Clause-Clear
|
2 | 2 | /*
|
3 | 3 | * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
|
4 |
| - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. |
| 4 | + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. |
5 | 5 | */
|
6 | 6 |
|
7 | 7 | #include <linux/ieee80211.h>
|
@@ -256,7 +256,7 @@ static int ath12k_dp_purge_mon_ring(struct ath12k_base *ab)
|
256 | 256 | }
|
257 | 257 |
|
258 | 258 | /* Returns number of Rx buffers replenished */
|
259 |
| -int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id, |
| 259 | +int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, |
260 | 260 | struct dp_rxdma_ring *rx_ring,
|
261 | 261 | int req_entries,
|
262 | 262 | enum hal_rx_buf_return_buf_manager mgr,
|
@@ -337,9 +337,7 @@ int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id,
|
337 | 337 | spin_unlock_bh(&rx_ring->idr_lock);
|
338 | 338 | if (buf_id < 0)
|
339 | 339 | goto fail_dma_unmap;
|
340 |
| - cookie = u32_encode_bits(mac_id, |
341 |
| - DP_RXDMA_BUF_COOKIE_PDEV_ID) | |
342 |
| - u32_encode_bits(buf_id, |
| 340 | + cookie = u32_encode_bits(buf_id, |
343 | 341 | DP_RXDMA_BUF_COOKIE_BUF_ID);
|
344 | 342 | }
|
345 | 343 |
|
@@ -437,7 +435,7 @@ static int ath12k_dp_rxdma_ring_buf_setup(struct ath12k_base *ab,
|
437 | 435 | if ((ringtype == HAL_RXDMA_MONITOR_BUF) || (ringtype == HAL_TX_MONITOR_BUF))
|
438 | 436 | ath12k_dp_mon_buf_replenish(ab, rx_ring, num_entries);
|
439 | 437 | else
|
440 |
| - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_entries, |
| 438 | + ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_entries, |
441 | 439 | ab->hw_params->hal_params->rx_buf_rbm,
|
442 | 440 | ringtype == HAL_RXDMA_BUF);
|
443 | 441 | return 0;
|
@@ -2712,7 +2710,7 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,
|
2712 | 2710 | goto exit;
|
2713 | 2711 |
|
2714 | 2712 | /* TODO: Move to implicit BM? */
|
2715 |
| - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped, |
| 2713 | + ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_buffs_reaped, |
2716 | 2714 | ab->hw_params->hal_params->rx_buf_rbm, true);
|
2717 | 2715 |
|
2718 | 2716 | ath12k_dp_rx_process_received_packets(ab, napi, &msdu_list,
|
@@ -3491,7 +3489,7 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
|
3491 | 3489 |
|
3492 | 3490 | rx_ring = &dp->rx_refill_buf_ring;
|
3493 | 3491 |
|
3494 |
| - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, tot_n_bufs_reaped, |
| 3492 | + ath12k_dp_rx_bufs_replenish(ab, rx_ring, tot_n_bufs_reaped, |
3495 | 3493 | ab->hw_params->hal_params->rx_buf_rbm, true);
|
3496 | 3494 |
|
3497 | 3495 | return tot_n_bufs_reaped;
|
@@ -3805,7 +3803,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
|
3805 | 3803 | if (!num_buffs_reaped)
|
3806 | 3804 | goto done;
|
3807 | 3805 |
|
3808 |
| - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped, |
| 3806 | + ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_buffs_reaped, |
3809 | 3807 | ab->hw_params->hal_params->rx_buf_rbm, true);
|
3810 | 3808 |
|
3811 | 3809 | rcu_read_lock();
|
|
0 commit comments