wifi: ath12k: avoid explicit mac id argument in Rxdma replenish

Currently all Rxdma replenish callers pass zero for the mac id
argument, so make it as zero implicitly. To optimize the rx
data path per packet, avoid the explicit unnecessary argument
in Rxdma replenish function.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00125-QCAHKSWPL_SILICONZ-1

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231111043934.20485-2-quic_periyasa@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 6893466f61f04756932b1f3b67f6cb073a9fc2d9..0eae4e89e07c741e76d3fb572ac89344e000a027 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <crypto/hash.h>
@@ -961,7 +961,7 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,
                struct ath12k_dp *dp = &ab->dp;
                struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring;
 
-               ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, 0,
+               ath12k_dp_rx_bufs_replenish(ab, rx_ring, 0,
                                            ab->hw_params->hal_params->rx_buf_rbm,
                                            true);
        }

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 9f831e3971f932118bd77ce6a6a8178d8c0ef6ae..c7fc89af05c0feb69d22da9a0b2084b19cbf64d9 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/ieee80211.h>
@@ -256,7 +256,7 @@ static int ath12k_dp_purge_mon_ring(struct ath12k_base *ab)
 }
 
 /* Returns number of Rx buffers replenished */
-int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id,
+int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab,
                                struct dp_rxdma_ring *rx_ring,
                                int req_entries,
                                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,
                        spin_unlock_bh(&rx_ring->idr_lock);
                        if (buf_id < 0)
                                goto fail_dma_unmap;
-                       cookie = u32_encode_bits(mac_id,
-                                                DP_RXDMA_BUF_COOKIE_PDEV_ID) |
-                                u32_encode_bits(buf_id,
+                       cookie = u32_encode_bits(buf_id,
                                                 DP_RXDMA_BUF_COOKIE_BUF_ID);
                }
 
@@ -437,7 +435,7 @@ static int ath12k_dp_rxdma_ring_buf_setup(struct ath12k_base *ab,
        if ((ringtype == HAL_RXDMA_MONITOR_BUF) || (ringtype == HAL_TX_MONITOR_BUF))
                ath12k_dp_mon_buf_replenish(ab, rx_ring, num_entries);
        else
-               ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_entries,
+               ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_entries,
                                            ab->hw_params->hal_params->rx_buf_rbm,
                                            ringtype == HAL_RXDMA_BUF);
        return 0;
@@ -2712,7 +2710,7 @@ try_again:
                goto exit;
 
        /* TODO: Move to implicit BM? */
-       ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped,
+       ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_buffs_reaped,
                                    ab->hw_params->hal_params->rx_buf_rbm, true);
 
        ath12k_dp_rx_process_received_packets(ab, napi, &msdu_list,
@@ -3491,7 +3489,7 @@ exit:
 
        rx_ring = &dp->rx_refill_buf_ring;
 
-       ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, tot_n_bufs_reaped,
+       ath12k_dp_rx_bufs_replenish(ab, rx_ring, tot_n_bufs_reaped,
                                    ab->hw_params->hal_params->rx_buf_rbm, true);
 
        return tot_n_bufs_reaped;
@@ -3805,7 +3803,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
        if (!num_buffs_reaped)
                goto done;
 
-       ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped,
+       ath12k_dp_rx_bufs_replenish(ab, rx_ring, num_buffs_reaped,
                                    ab->hw_params->hal_params->rx_buf_rbm, true);
 
        rcu_read_lock();

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.h b/drivers/net/wireless/ath/ath12k/dp_rx.h
index c955b5c859d14796e8f29bb375ab292ba8aa5ee1..ef1b172e685c9633a3cbbf2d1497d26f17b3c596 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_rx.h
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause-Clear */
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #ifndef ATH12K_DP_RX_H
 #define ATH12K_DP_RX_H
@@ -116,7 +116,7 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
 int ath12k_dp_rx_process(struct ath12k_base *ab, int mac_id,
                         struct napi_struct *napi,
                         int budget);
-int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id,
+int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab,
                                struct dp_rxdma_ring *rx_ring,
                                int req_entries,
                                enum hal_rx_buf_return_buf_manager mgr,