wifi: ath12k: Move HAL CE status and set link desc addr APIs to wifi7 directory

Move the hardware specific HAL APIs to hal.c file
inside wifi7 directory. These APIs will be called
through the hal_ops mechanism, which are registered
separately by qcn and wcn

Handling following APIs:
ath12k_wifi7_hal_ce_dst_status_get_length
ath12k_wifi7_hal_set_link_desc_addr

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Pavankumar Nandeshwar <quic_pnandesh@quicinc.com>
Signed-off-by: Ripan Deuri <quic_rdeuri@quicinc.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20251009111045.1763001-12-quic_rdeuri@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/ce.c b/drivers/net/wireless/ath/ath12k/ce.c
index ae8fda8689ab66cbf0c189eb409ee776f5e1ee45..490e49f50264592bad16fc5b41543ed420aff1c0 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/ce.c
+++ b/drivers/net/wireless/ath/ath12k/ce.c
@@ -132,7 +132,7 @@ static int ath12k_ce_completed_recv_next(struct ath12k_ce_pipe *pipe,
                goto err;
        }
 
-       *nbytes = ath12k_hal_ce_dst_status_get_length(desc);
+       *nbytes = ath12k_hal_ce_dst_status_get_length(&ab->hal, desc);
 
        *skb = pipe->dest_ring->skb[sw_index];
        pipe->dest_ring->skb[sw_index] = NULL;

diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 6429ff72aa04cf5988866ba2217a2a12eda1dc40..495e03498187366087a32e59535d23f82a635524 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -661,7 +661,7 @@ static int ath12k_dp_scatter_idle_link_desc_setup(struct ath12k_base *ab,
                paddr = link_desc_banks[i].paddr;
                while (n_entries) {
                        cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i);
-                       ath12k_hal_set_link_desc_addr(scatter_buf, cookie,
+                       ath12k_hal_set_link_desc_addr(dp->hal, scatter_buf, cookie,
                                                      paddr, rbm);
                        n_entries--;
                        paddr += HAL_LINK_DESC_SIZE;
@@ -868,7 +868,8 @@ int ath12k_dp_link_desc_setup(struct ath12k_base *ab,
                while (n_entries &&
                       (desc = ath12k_hal_srng_src_get_next_entry(ab, srng))) {
                        cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i);
-                       ath12k_hal_set_link_desc_addr(desc, cookie, paddr, rbm);
+                       ath12k_hal_set_link_desc_addr(dp->hal, desc, cookie, paddr,
+                                                     rbm);
                        n_entries--;
                        paddr += HAL_LINK_DESC_SIZE;
                }

diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c
index 490a483b8c306ccce4376ba3da5ed1a5e350de4c..5c13eaf9c19e72dfc28cc6bc492a49b2ac1d6c08 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal.c
+++ b/drivers/net/wireless/ath/ath12k/hal.c
@@ -205,27 +205,17 @@ void ath12k_hal_ce_dst_set_desc(struct ath12k_hal *hal,
        hal->hal_ops->ce_dst_set_desc(desc, paddr);
 }
 
-u32 ath12k_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc)
+u32 ath12k_hal_ce_dst_status_get_length(struct ath12k_hal *hal,
+                                       struct hal_ce_srng_dst_status_desc *desc)
 {
-       u32 len;
-
-       len = le32_get_bits(desc->flags, HAL_CE_DST_STATUS_DESC_FLAGS_LEN);
-       desc->flags &= ~cpu_to_le32(HAL_CE_DST_STATUS_DESC_FLAGS_LEN);
-
-       return len;
+       return hal->hal_ops->ce_dst_status_get_length(desc);
 }
 
-void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie,
-                                  dma_addr_t paddr,
-                                  enum hal_rx_buf_return_buf_manager rbm)
+void ath12k_hal_set_link_desc_addr(struct ath12k_hal *hal,
+                                  struct hal_wbm_link_desc *desc, u32 cookie,
+                                  dma_addr_t paddr, int rbm)
 {
-       desc->buf_addr_info.info0 = le32_encode_bits((paddr & HAL_ADDR_LSB_REG_MASK),
-                                                    BUFFER_ADDR_INFO0_ADDR);
-       desc->buf_addr_info.info1 =
-                       le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT),
-                                        BUFFER_ADDR_INFO1_ADDR) |
-                       le32_encode_bits(rbm, BUFFER_ADDR_INFO1_RET_BUF_MGR) |
-                       le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE);
+       hal->hal_ops->set_link_desc_addr(desc, cookie, paddr, rbm);
 }
 
 void *ath12k_hal_srng_dst_peek(struct ath12k_base *ab, struct hal_srng *srng)

diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 74f05aa1fc6d9e46d809a83329ee6d9efcdf55fb..b739ebba588bb8cc26e2e82dcf6c976e451d8c13 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -1713,6 +1713,10 @@ struct hal_ops {
                                u8 byte_swap_data);
        void (*ce_dst_set_desc)(struct hal_ce_srng_dest_desc *desc,
                                dma_addr_t paddr);
+       u32 (*ce_dst_status_get_length)(struct hal_ce_srng_dst_status_desc *desc);
+       void (*set_link_desc_addr)(struct hal_wbm_link_desc *desc, u32 cookie,
+                                  dma_addr_t paddr,
+                                  enum hal_rx_buf_return_buf_manager rbm);
 };
 
 u32 ath12k_wifi7_hal_reo_qdesc_size(u32 ba_window_size, u8 tid);
@@ -1732,9 +1736,6 @@ dma_addr_t ath12k_hal_srng_get_tp_addr(struct ath12k_base *ab,
                                       struct hal_srng *srng);
 dma_addr_t ath12k_hal_srng_get_hp_addr(struct ath12k_base *ab,
                                       struct hal_srng *srng);
-void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie,
-                                  dma_addr_t paddr,
-                                  enum hal_rx_buf_return_buf_manager rbm);
 u32 ath12k_hal_ce_get_desc_size(struct ath12k_hal *hal, enum hal_ce_desc type);
 void ath12k_hal_ce_dst_set_desc(struct ath12k_hal *hal,
                                struct hal_ce_srng_dest_desc *desc,
@@ -1743,7 +1744,6 @@ void ath12k_hal_ce_src_set_desc(struct ath12k_hal *hal,
                                struct hal_ce_srng_src_desc *desc,
                                dma_addr_t paddr, u32 len, u32 id,
                                u8 byte_swap_data);
-u32 ath12k_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc);
 int ath12k_hal_srng_get_entrysize(struct ath12k_base *ab, u32 ring_type);
 int ath12k_hal_srng_get_max_entries(struct ath12k_base *ab, u32 ring_type);
 void ath12k_hal_srng_get_params(struct ath12k_base *ab, struct hal_srng *srng,
@@ -1782,4 +1782,10 @@ void ath12k_hal_srng_shadow_config(struct ath12k_base *ab);
 void ath12k_hal_srng_shadow_update_hp_tp(struct ath12k_base *ab,
                                         struct hal_srng *srng);
 void ath12k_hal_reo_shared_qaddr_cache_clear(struct ath12k_base *ab);
+void ath12k_hal_set_link_desc_addr(struct ath12k_hal *hal,
+                                  struct hal_wbm_link_desc *desc, u32 cookie,
+                                  dma_addr_t paddr, int rbm);
+u32
+ath12k_hal_ce_dst_status_get_length(struct ath12k_hal *hal,
+                                   struct hal_ce_srng_dst_status_desc *desc);
 #endif

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp.c b/drivers/net/wireless/ath/ath12k/wifi7/dp.c
index e691d0ca0d75ce7ec948529db01d294992c136ca..06d3690ff0c63259d47a44eed0ff9342fa45fcc6 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp.c
@@ -12,6 +12,7 @@
 #include "dp_rx.h"
 #include "dp.h"
 #include "dp_tx.h"
+#include "hal.h"
 
 static int ath12k_wifi7_dp_service_srng(struct ath12k_dp *dp,
                                        struct ath12k_ext_irq_grp *irq_grp,

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal.c b/drivers/net/wireless/ath/ath12k/wifi7/hal.c
index 06a6af8c9c8a7bbe556e4be039b1705fcdc06605..c9e853a32378c698b20e7c8668f8115145a63e4e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal.c
@@ -457,3 +457,26 @@ void ath12k_wifi7_hal_ce_dst_set_desc(struct hal_ce_srng_dest_desc *desc,
                le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT),
                                 HAL_CE_DEST_DESC_ADDR_INFO_ADDR_HI);
 }
+
+void ath12k_wifi7_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc,
+                                        u32 cookie, dma_addr_t paddr,
+                                        enum hal_rx_buf_return_buf_manager rbm)
+{
+       desc->buf_addr_info.info0 = le32_encode_bits((paddr & HAL_ADDR_LSB_REG_MASK),
+                                                    BUFFER_ADDR_INFO0_ADDR);
+       desc->buf_addr_info.info1 =
+                       le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT),
+                                        BUFFER_ADDR_INFO1_ADDR) |
+                       le32_encode_bits(rbm, BUFFER_ADDR_INFO1_RET_BUF_MGR) |
+                       le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE);
+}
+
+u32 ath12k_wifi7_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc)
+{
+       u32 len;
+
+       len = le32_get_bits(READ_ONCE(desc->flags), HAL_CE_DST_STATUS_DESC_FLAGS_LEN);
+       desc->flags &= ~cpu_to_le32(HAL_CE_DST_STATUS_DESC_FLAGS_LEN);
+
+       return len;
+}

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal.h b/drivers/net/wireless/ath/ath12k/wifi7/hal.h
index b0b591eb5a0a4b453c916b040e34480474c18847..308f80427676867b4dc17227934b8735f23a4cd5 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal.h
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal.h
@@ -28,4 +28,10 @@ void ath12k_wifi7_hal_ce_src_set_desc(struct hal_ce_srng_src_desc *desc,
                                      u32 len, u32 id, u8 byte_swap_data);
 void ath12k_wifi7_hal_ce_dst_set_desc(struct hal_ce_srng_dest_desc *desc,
                                      dma_addr_t paddr);
+void
+ath12k_wifi7_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc,
+                                   u32 cookie, dma_addr_t paddr,
+                                   enum hal_rx_buf_return_buf_manager rbm);
+u32
+ath12k_wifi7_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc);
 #endif

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c
index 113a0424d5eb20832fa47955f88d7773648fe695..b764d5cd8aeb6cf1ace3c17686efa1886e690dcb 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c
@@ -1009,5 +1009,7 @@ const struct hal_ops hal_qcn9274_ops = {
        .ce_get_desc_size = ath12k_wifi7_hal_ce_get_desc_size,
        .ce_src_set_desc = ath12k_wifi7_hal_ce_src_set_desc,
        .ce_dst_set_desc = ath12k_wifi7_hal_ce_dst_set_desc,
+       .ce_dst_status_get_length = ath12k_wifi7_hal_ce_dst_status_get_length,
+       .set_link_desc_addr = ath12k_wifi7_hal_set_link_desc_addr,
 };
 EXPORT_SYMBOL(hal_qcn9274_ops);

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c b/drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c
index 60a21137bd3589ddacdd009659e7697404ce5438..0985f929a4b58bff14360f22248f68d1a029da57 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c
@@ -824,5 +824,7 @@ const struct hal_ops hal_wcn7850_ops = {
        .ce_get_desc_size = ath12k_wifi7_hal_ce_get_desc_size,
        .ce_src_set_desc = ath12k_wifi7_hal_ce_src_set_desc,
        .ce_dst_set_desc = ath12k_wifi7_hal_ce_dst_set_desc,
+       .ce_dst_status_get_length = ath12k_wifi7_hal_ce_dst_status_get_length,
+       .set_link_desc_addr = ath12k_wifi7_hal_set_link_desc_addr,
 };
 EXPORT_SYMBOL(hal_wcn7850_ops);