wifi: ath12k: Move HAL Rx wrapper APIs to dp_rx.h

Move HAL Rx APIs from dp_rx.c to dp_rx.h to facilitate the separation of
common and hardware-specific code that are dependent on these HAL Rx ops
in upcoming patches.

Move the following wrapper APIs to dp_rx.h

ath12k_dp_rx_h_enctype
ath12k_dp_rx_h_mesh_ctl_present
ath12k_dp_rx_h_seq_ctrl_valid
ath12k_dp_rx_h_fc_valid
ath12k_dp_rx_h_more_frags
ath12k_dp_rx_h_frag_no
ath12k_dp_rx_h_seq_no
ath12k_dp_rx_h_msdu_done
ath12k_dp_rx_h_l4_cksum_fail
ath12k_dp_rx_h_ip_cksum_fail
ath12k_dp_rx_h_is_decrypted
ath12k_dp_rx_h_msdu_len
ath12k_dp_rx_h_sgi
ath12k_dp_rx_h_rate_mcs
ath12k_dp_rx_h_rx_bw
ath12k_dp_rx_h_freq
ath12k_dp_rx_h_pkt_type
ath12k_dp_rx_h_nss
ath12k_dp_rx_h_tid
ath12k_dp_rx_h_peer_id
ath12k_dp_rx_h_first_msdu
ath12k_dp_rx_h_last_msdu
ath12k_dp_rx_desc_end_tlv_copy
ath12k_dp_rxdesc_set_msdu_len
ath12k_dp_rx_h_is_da_mcbc
ath12k_dp_rxdesc_mac_addr2_valid
ath12k_dp_rxdesc_get_mpdu_start_addr2
ath12k_dp_rx_desc_get_dot11_hdr
ath12k_dp_rx_desc_get_crypto_header
ath12k_dp_rx_get_msdu_src_link

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: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20250828173553.3341351-5-quic_rdeuri@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 4f6b71a18dc4dcf63183caeb159f313a68074a9a..acd20417b6508fc6dec2811f0ec69456bb0c8700 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -21,243 +21,6 @@
 
 #define ATH12K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ)
 
-static enum hal_encrypt_type ath12k_dp_rx_h_enctype(struct ath12k_base *ab,
-                                                   struct hal_rx_desc *desc)
-{
-       if (!ab->hal_rx_ops->rx_desc_encrypt_valid(desc))
-               return HAL_ENCRYPT_TYPE_OPEN;
-
-       return ab->hal_rx_ops->rx_desc_get_encrypt_type(desc);
-}
-
-u8 ath12k_dp_rx_h_decap_type(struct ath12k_base *ab,
-                            struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_decap_type(desc);
-}
-
-static u8 ath12k_dp_rx_h_mesh_ctl_present(struct ath12k_base *ab,
-                                         struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mesh_ctl(desc);
-}
-
-static bool ath12k_dp_rx_h_seq_ctrl_valid(struct ath12k_base *ab,
-                                         struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_seq_ctl_vld(desc);
-}
-
-static bool ath12k_dp_rx_h_fc_valid(struct ath12k_base *ab,
-                                   struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_fc_valid(desc);
-}
-
-static bool ath12k_dp_rx_h_more_frags(struct ath12k_base *ab,
-                                     struct sk_buff *skb)
-{
-       struct ieee80211_hdr *hdr;
-
-       hdr = (struct ieee80211_hdr *)(skb->data + ab->hal.hal_desc_sz);
-       return ieee80211_has_morefrags(hdr->frame_control);
-}
-
-static u16 ath12k_dp_rx_h_frag_no(struct ath12k_base *ab,
-                                 struct sk_buff *skb)
-{
-       struct ieee80211_hdr *hdr;
-
-       hdr = (struct ieee80211_hdr *)(skb->data + ab->hal.hal_desc_sz);
-       return le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
-}
-
-static u16 ath12k_dp_rx_h_seq_no(struct ath12k_base *ab,
-                                struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_start_seq_no(desc);
-}
-
-static bool ath12k_dp_rx_h_msdu_done(struct ath12k_base *ab,
-                                    struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->dp_rx_h_msdu_done(desc);
-}
-
-static bool ath12k_dp_rx_h_l4_cksum_fail(struct ath12k_base *ab,
-                                        struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->dp_rx_h_l4_cksum_fail(desc);
-}
-
-static bool ath12k_dp_rx_h_ip_cksum_fail(struct ath12k_base *ab,
-                                        struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->dp_rx_h_ip_cksum_fail(desc);
-}
-
-static bool ath12k_dp_rx_h_is_decrypted(struct ath12k_base *ab,
-                                       struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->dp_rx_h_is_decrypted(desc);
-}
-
-u32 ath12k_dp_rx_h_mpdu_err(struct ath12k_base *ab,
-                           struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->dp_rx_h_mpdu_err(desc);
-}
-
-static u16 ath12k_dp_rx_h_msdu_len(struct ath12k_base *ab,
-                                  struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_len(desc);
-}
-
-static u8 ath12k_dp_rx_h_sgi(struct ath12k_base *ab,
-                            struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_sgi(desc);
-}
-
-static u8 ath12k_dp_rx_h_rate_mcs(struct ath12k_base *ab,
-                                 struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_rate_mcs(desc);
-}
-
-static u8 ath12k_dp_rx_h_rx_bw(struct ath12k_base *ab,
-                              struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_rx_bw(desc);
-}
-
-static u32 ath12k_dp_rx_h_freq(struct ath12k_base *ab,
-                              struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_freq(desc);
-}
-
-static u8 ath12k_dp_rx_h_pkt_type(struct ath12k_base *ab,
-                                 struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_pkt_type(desc);
-}
-
-static u8 ath12k_dp_rx_h_nss(struct ath12k_base *ab,
-                            struct hal_rx_desc *desc)
-{
-       return hweight8(ab->hal_rx_ops->rx_desc_get_msdu_nss(desc));
-}
-
-static u8 ath12k_dp_rx_h_tid(struct ath12k_base *ab,
-                            struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_tid(desc);
-}
-
-static u16 ath12k_dp_rx_h_peer_id(struct ath12k_base *ab,
-                                 struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_peer_id(desc);
-}
-
-u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab,
-                       struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_l3_pad_bytes(desc);
-}
-
-static bool ath12k_dp_rx_h_first_msdu(struct ath12k_base *ab,
-                                     struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_first_msdu(desc);
-}
-
-static bool ath12k_dp_rx_h_last_msdu(struct ath12k_base *ab,
-                                    struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_last_msdu(desc);
-}
-
-static void ath12k_dp_rx_desc_end_tlv_copy(struct ath12k_base *ab,
-                                          struct hal_rx_desc *fdesc,
-                                          struct hal_rx_desc *ldesc)
-{
-       ab->hal_rx_ops->rx_desc_copy_end_tlv(fdesc, ldesc);
-}
-
-static void ath12k_dp_rxdesc_set_msdu_len(struct ath12k_base *ab,
-                                         struct hal_rx_desc *desc,
-                                         u16 len)
-{
-       ab->hal_rx_ops->rx_desc_set_msdu_len(desc, len);
-}
-
-u32 ath12k_dp_rxdesc_get_ppduid(struct ath12k_base *ab,
-                               struct hal_rx_desc *rx_desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_mpdu_ppdu_id(rx_desc);
-}
-
-bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,
-                                struct hal_rx_desc *rx_desc)
-{
-       u32 tlv_tag;
-
-       tlv_tag = ab->hal_rx_ops->rx_desc_get_mpdu_start_tag(rx_desc);
-
-       return tlv_tag == HAL_RX_MPDU_START;
-}
-
-static bool ath12k_dp_rx_h_is_da_mcbc(struct ath12k_base *ab,
-                                     struct hal_rx_desc *desc)
-{
-       return (ath12k_dp_rx_h_first_msdu(ab, desc) &&
-               ab->hal_rx_ops->rx_desc_is_da_mcbc(desc));
-}
-
-static bool ath12k_dp_rxdesc_mac_addr2_valid(struct ath12k_base *ab,
-                                            struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_mac_addr2_valid(desc);
-}
-
-static u8 *ath12k_dp_rxdesc_get_mpdu_start_addr2(struct ath12k_base *ab,
-                                                struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_mpdu_start_addr2(desc);
-}
-
-static void ath12k_dp_rx_desc_get_dot11_hdr(struct ath12k_base *ab,
-                                           struct hal_rx_desc *desc,
-                                           struct ieee80211_hdr *hdr)
-{
-       ab->hal_rx_ops->rx_desc_get_dot11_hdr(desc, hdr);
-}
-
-static void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab,
-                                               struct hal_rx_desc *desc,
-                                               u8 *crypto_hdr,
-                                               enum hal_encrypt_type enctype)
-{
-       ab->hal_rx_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype);
-}
-
-static inline u8 ath12k_dp_rx_get_msdu_src_link(struct ath12k_base *ab,
-                                               struct hal_rx_desc *desc)
-{
-       return ab->hal_rx_ops->rx_desc_get_msdu_src_link_id(desc);
-}
-
-static void ath12k_dp_clean_up_skb_list(struct sk_buff_head *skb_list)
-{
-       struct sk_buff *skb;
-
-       while ((skb = __skb_dequeue(skb_list)))
-               dev_kfree_skb_any(skb);
-}
-
 static size_t ath12k_dp_list_cut_nodes(struct list_head *list,
                                       struct list_head *head,
                                       size_t count)

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.h b/drivers/net/wireless/ath/ath12k/dp_rx.h
index e971a314bd2d9ea073cca7e1470da13a5476d6b8..61861c63ecbf78366e1388a450059fe75a2cee55 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-2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 #ifndef ATH12K_DP_RX_H
 #define ATH12K_DP_RX_H
@@ -103,6 +103,243 @@ static inline u32 ath12k_he_gi_to_nl80211_he_gi(u8 sgi)
        return ret;
 }
 
+static inline enum hal_encrypt_type ath12k_dp_rx_h_enctype(struct ath12k_base *ab,
+                                                          struct hal_rx_desc *desc)
+{
+       if (!ab->hal_rx_ops->rx_desc_encrypt_valid(desc))
+               return HAL_ENCRYPT_TYPE_OPEN;
+
+       return ab->hal_rx_ops->rx_desc_get_encrypt_type(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_decap_type(struct ath12k_base *ab,
+                                          struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_decap_type(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_mesh_ctl_present(struct ath12k_base *ab,
+                                                struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mesh_ctl(desc);
+}
+
+static inline bool ath12k_dp_rx_h_seq_ctrl_valid(struct ath12k_base *ab,
+                                                struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_seq_ctl_vld(desc);
+}
+
+static inline bool ath12k_dp_rx_h_fc_valid(struct ath12k_base *ab,
+                                          struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_fc_valid(desc);
+}
+
+static inline bool ath12k_dp_rx_h_more_frags(struct ath12k_base *ab,
+                                            struct sk_buff *skb)
+{
+       struct ieee80211_hdr *hdr;
+
+       hdr = (struct ieee80211_hdr *)(skb->data + ab->hal.hal_desc_sz);
+       return ieee80211_has_morefrags(hdr->frame_control);
+}
+
+static inline u16 ath12k_dp_rx_h_frag_no(struct ath12k_base *ab,
+                                        struct sk_buff *skb)
+{
+       struct ieee80211_hdr *hdr;
+
+       hdr = (struct ieee80211_hdr *)(skb->data + ab->hal.hal_desc_sz);
+       return le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
+}
+
+static inline u16 ath12k_dp_rx_h_seq_no(struct ath12k_base *ab,
+                                       struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_start_seq_no(desc);
+}
+
+static inline bool ath12k_dp_rx_h_msdu_done(struct ath12k_base *ab,
+                                           struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->dp_rx_h_msdu_done(desc);
+}
+
+static inline bool ath12k_dp_rx_h_l4_cksum_fail(struct ath12k_base *ab,
+                                               struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->dp_rx_h_l4_cksum_fail(desc);
+}
+
+static inline bool ath12k_dp_rx_h_ip_cksum_fail(struct ath12k_base *ab,
+                                               struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->dp_rx_h_ip_cksum_fail(desc);
+}
+
+static inline bool ath12k_dp_rx_h_is_decrypted(struct ath12k_base *ab,
+                                              struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->dp_rx_h_is_decrypted(desc);
+}
+
+static inline u32 ath12k_dp_rx_h_mpdu_err(struct ath12k_base *ab,
+                                         struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->dp_rx_h_mpdu_err(desc);
+}
+
+static inline u16 ath12k_dp_rx_h_msdu_len(struct ath12k_base *ab,
+                                         struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_len(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_sgi(struct ath12k_base *ab,
+                                   struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_sgi(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_rate_mcs(struct ath12k_base *ab,
+                                        struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_rate_mcs(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_rx_bw(struct ath12k_base *ab,
+                                     struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_rx_bw(desc);
+}
+
+static inline u32 ath12k_dp_rx_h_freq(struct ath12k_base *ab,
+                                     struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_freq(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_pkt_type(struct ath12k_base *ab,
+                                        struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_pkt_type(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_nss(struct ath12k_base *ab,
+                                   struct hal_rx_desc *desc)
+{
+       return hweight8(ab->hal_rx_ops->rx_desc_get_msdu_nss(desc));
+}
+
+static inline u8 ath12k_dp_rx_h_tid(struct ath12k_base *ab,
+                                   struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_tid(desc);
+}
+
+static inline u16 ath12k_dp_rx_h_peer_id(struct ath12k_base *ab,
+                                        struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_peer_id(desc);
+}
+
+static inline u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab,
+                                     struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_l3_pad_bytes(desc);
+}
+
+static inline bool ath12k_dp_rx_h_first_msdu(struct ath12k_base *ab,
+                                            struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_first_msdu(desc);
+}
+
+static inline bool ath12k_dp_rx_h_last_msdu(struct ath12k_base *ab,
+                                           struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_last_msdu(desc);
+}
+
+static inline void ath12k_dp_rx_desc_end_tlv_copy(struct ath12k_base *ab,
+                                                 struct hal_rx_desc *fdesc,
+                                                 struct hal_rx_desc *ldesc)
+{
+       ab->hal_rx_ops->rx_desc_copy_end_tlv(fdesc, ldesc);
+}
+
+static inline void ath12k_dp_rxdesc_set_msdu_len(struct ath12k_base *ab,
+                                                struct hal_rx_desc *desc,
+                                                u16 len)
+{
+       ab->hal_rx_ops->rx_desc_set_msdu_len(desc, len);
+}
+
+static inline u32 ath12k_dp_rxdesc_get_ppduid(struct ath12k_base *ab,
+                                             struct hal_rx_desc *rx_desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_mpdu_ppdu_id(rx_desc);
+}
+
+static inline bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,
+                                              struct hal_rx_desc *rx_desc)
+{
+       u32 tlv_tag;
+
+       tlv_tag = ab->hal_rx_ops->rx_desc_get_mpdu_start_tag(rx_desc);
+
+       return tlv_tag == HAL_RX_MPDU_START;
+}
+
+static inline bool ath12k_dp_rx_h_is_da_mcbc(struct ath12k_base *ab,
+                                            struct hal_rx_desc *desc)
+{
+       return (ath12k_dp_rx_h_first_msdu(ab, desc) &&
+               ab->hal_rx_ops->rx_desc_is_da_mcbc(desc));
+}
+
+static inline bool ath12k_dp_rxdesc_mac_addr2_valid(struct ath12k_base *ab,
+                                                   struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_mac_addr2_valid(desc);
+}
+
+static inline u8 *ath12k_dp_rxdesc_get_mpdu_start_addr2(struct ath12k_base *ab,
+                                                       struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_mpdu_start_addr2(desc);
+}
+
+static inline void ath12k_dp_rx_desc_get_dot11_hdr(struct ath12k_base *ab,
+                                                  struct hal_rx_desc *desc,
+                                                  struct ieee80211_hdr *hdr)
+{
+       ab->hal_rx_ops->rx_desc_get_dot11_hdr(desc, hdr);
+}
+
+static inline void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab,
+                                                      struct hal_rx_desc *desc,
+                                                      u8 *crypto_hdr,
+                                                      enum hal_encrypt_type enctype)
+{
+       ab->hal_rx_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype);
+}
+
+static inline u8 ath12k_dp_rx_get_msdu_src_link(struct ath12k_base *ab,
+                                               struct hal_rx_desc *desc)
+{
+       return ab->hal_rx_ops->rx_desc_get_msdu_src_link_id(desc);
+}
+
+static inline void ath12k_dp_clean_up_skb_list(struct sk_buff_head *skb_list)
+{
+       struct sk_buff *skb;
+
+       while ((skb = __skb_dequeue(skb_list)))
+               dev_kfree_skb_any(skb);
+}
+
 int ath12k_dp_rx_ampdu_start(struct ath12k *ar,
                             struct ieee80211_ampdu_params *params,
                             u8 link_id);