Commit 7cd7392a authored by Alok Singh's avatar Alok Singh Committed by Jeff Johnson
Browse files

wifi: ath12k: Remove Wi-Fi 7 header dependencies from common ath12k module 



Remove all remaining Wi-Fi 7 header dependencies from dp_mon.c to
finalize separation of Wi-Fi 7 specific monitor mode functionality.

Remove these includes from dp_mon.c:
- wifi7/hal_desc.h
- wifi7/hal_qcn9274.h
- wifi7/dp_rx.h

Relocate hal_mon_buf_ring from wifi7/hal_desc.h to hal.h.

Relocate HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID and HAL_RX_FCS_LEN
macros from wifi7/hal_rx.h to hal.h or dp_rx.h as appropriate.

Move the following functions to the new file wifi7/dp_mon.c
and add the ath12k_wifi7 prefix:
- ath12k_dp_mon_rx_merg_msdus()
- ath12k_dp_mon_update_radiotap()
- ath12k_dp_mon_rx_deliver_msdu()
- ath12k_dp_mon_get_buf_len()
- ath12k_dp_mon_rx_deliver()

Export several helper functions needed by the ath12k_wifi7 module.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.5-01651-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarAlok Singh <quic_aloksing@quicinc.com>
Reviewed-by: default avatarVasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Reviewed-by: default avatarBaochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20251110103713.3484779-13-quic_aloksing@quicinc.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 965aea91

drivers/net/wireless/ath/ath12k/dp_mon.c

+14 −96
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 


#include "dp_mon.h"

#include "debug.h"

#include "wifi7/hal_qcn9274.h"

#include "wifi7/dp_rx.h"

#include "dp_tx.h"

#include "peer.h"
@@ -205,7 +203,7 @@ static void ath12k_dp_mon_rx_msdus_set_payload(struct ath12k_base *ab, 
	skb_pull(head_msdu, total_offset);

}



static struct sk_buff *

struct sk_buff *

ath12k_dp_mon_rx_merg_msdus(struct ath12k_pdev_dp *dp_pdev,

			    struct dp_mon_mpdu *mon_mpdu,

			    struct hal_rx_mon_ppdu_info *ppdu_info,
@@ -333,6 +331,7 @@ ath12k_dp_mon_rx_merg_msdus(struct ath12k_pdev_dp *dp_pdev, 
	}

	return NULL;

}

EXPORT_SYMBOL(ath12k_dp_mon_rx_merg_msdus);



static void

ath12k_dp_mon_rx_update_radiotap_he(struct hal_rx_mon_ppdu_info *rx_status,
@@ -382,7 +381,7 @@ ath12k_dp_mon_rx_update_radiotap_he_mu(struct hal_rx_mon_ppdu_info *rx_status, 
	rtap_buf[rtap_len] = rx_status->he_RU[3];

}



static void ath12k_dp_mon_update_radiotap(struct ath12k_pdev_dp *dp_pdev,

void ath12k_dp_mon_update_radiotap(struct ath12k_pdev_dp *dp_pdev,

				   struct hal_rx_mon_ppdu_info *ppduinfo,

				   struct sk_buff *mon_skb,

				   struct ieee80211_rx_status *rxs)
@@ -487,8 +486,9 @@ static void ath12k_dp_mon_update_radiotap(struct ath12k_pdev_dp *dp_pdev, 


	rxs->mactime = ppduinfo->tsft;

}

EXPORT_SYMBOL(ath12k_dp_mon_update_radiotap);



static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev,

void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev,

				   struct napi_struct *napi,

				   struct sk_buff *msdu,

				   struct ieee80211_rx_status *status,
@@ -521,7 +521,7 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev, 
		status->flag |= RX_FLAG_RADIOTAP_HE;

	}



	ath12k_wifi7_dp_extract_rx_desc_data(dp->hal, &rx_info, rx_desc, rx_desc);

	ath12k_dp_extract_rx_desc_data(dp->hal, &rx_info, rx_desc, rx_desc);



	rcu_read_lock();

	spin_lock_bh(&dp->dp_lock);
@@ -581,62 +581,7 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev, 


	ieee80211_rx_napi(ath12k_pdev_dp_to_hw(dp_pdev), pubsta, msdu, napi);

}



int ath12k_dp_mon_rx_deliver(struct ath12k_pdev_dp *dp_pdev,

			     struct dp_mon_mpdu *mon_mpdu,

			     struct hal_rx_mon_ppdu_info *ppduinfo,

			     struct napi_struct *napi)

{

	struct sk_buff *mon_skb, *skb_next, *header;

	struct ieee80211_rx_status *rxs = &dp_pdev->rx_status;

	u8 decap = DP_RX_DECAP_TYPE_RAW;



	mon_skb = ath12k_dp_mon_rx_merg_msdus(dp_pdev, mon_mpdu, ppduinfo, rxs);

	if (!mon_skb)

		goto mon_deliver_fail;



	header = mon_skb;

	rxs->flag = 0;



	if (mon_mpdu->err_bitmap & HAL_RX_MPDU_ERR_FCS)

		rxs->flag = RX_FLAG_FAILED_FCS_CRC;



	do {

		skb_next = mon_skb->next;

		if (!skb_next)

			rxs->flag &= ~RX_FLAG_AMSDU_MORE;

		else

			rxs->flag |= RX_FLAG_AMSDU_MORE;



		if (mon_skb == header) {

			header = NULL;

			rxs->flag &= ~RX_FLAG_ALLOW_SAME_PN;

		} else {

			rxs->flag |= RX_FLAG_ALLOW_SAME_PN;

		}

		rxs->flag |= RX_FLAG_ONLY_MONITOR;



		if (!(rxs->flag & RX_FLAG_ONLY_MONITOR))

			decap = mon_mpdu->decap_format;



		ath12k_dp_mon_update_radiotap(dp_pdev, ppduinfo, mon_skb, rxs);

		ath12k_dp_mon_rx_deliver_msdu(dp_pdev, napi, mon_skb, rxs, decap);

		mon_skb = skb_next;

	} while (mon_skb);

	rxs->flag = 0;



	return 0;



mon_deliver_fail:

	mon_skb = mon_mpdu->head;

	while (mon_skb) {

		skb_next = mon_skb->next;

		dev_kfree_skb_any(mon_skb);

		mon_skb = skb_next;

	}

	return -EINVAL;

}

EXPORT_SYMBOL(ath12k_dp_mon_rx_deliver);

EXPORT_SYMBOL(ath12k_dp_mon_rx_deliver_msdu);



int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len)

{
@@ -657,33 +602,6 @@ int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len) 
}

EXPORT_SYMBOL(ath12k_dp_pkt_set_pktlen);



/* Hardware fill buffer with 128 bytes aligned. So need to reap it

 * with 128 bytes aligned.

 */

#define RXDMA_DATA_DMA_BLOCK_SIZE 128



void

ath12k_dp_mon_get_buf_len(struct hal_rx_msdu_desc_info *info,

			  bool *is_frag, u32 *total_len,

			  u32 *frag_len, u32 *msdu_cnt)

{

	if (info->msdu_flags & RX_MSDU_DESC_INFO0_MSDU_CONTINUATION) {

		*is_frag = true;

		*frag_len = (RX_MON_STATUS_BASE_BUF_SIZE -

			     sizeof(struct hal_rx_desc)) &

			     ~(RXDMA_DATA_DMA_BLOCK_SIZE - 1);

		*total_len += *frag_len;

	} else {

		if (*is_frag)

			*frag_len = info->msdu_len - *total_len;

		else

			*frag_len = info->msdu_len;



		*msdu_cnt -= 1;

	}

}

EXPORT_SYMBOL(ath12k_dp_mon_get_buf_len);



int

ath12k_dp_mon_parse_status_buf(struct ath12k_pdev_dp *dp_pdev,

			       struct ath12k_mon_data *pmon,

drivers/net/wireless/ath/ath12k/dp_mon.h

+19 −8
Original line number Diff line number Diff line
@@ -96,21 +96,32 @@ ath12k_dp_mon_rx_update_peer_mu_stats(struct ath12k_base *ab, 
void ath12k_dp_mon_rx_update_peer_su_stats(struct ath12k_dp_link_peer *peer,

					   struct hal_rx_mon_ppdu_info *ppdu_info);

int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len);

int ath12k_dp_mon_rx_deliver(struct ath12k_pdev_dp *dp_pdev,

			     struct dp_mon_mpdu *mon_mpdu,

			     struct hal_rx_mon_ppdu_info *ppduinfo,

			     struct napi_struct *napi);

struct sk_buff

*ath12k_dp_rx_alloc_mon_status_buf(struct ath12k_base *ab,

				   struct dp_rxdma_mon_ring *rx_ring,

				   int *buf_id);

void

ath12k_dp_mon_get_buf_len(struct hal_rx_msdu_desc_info *info,

			  bool *is_frag, u32 *total_len,

			  u32 *frag_len, u32 *msdu_cnt);

u32 ath12k_dp_mon_comp_ppduid(u32 msdu_ppdu_id, u32 *ppdu_id);

int

ath12k_dp_mon_parse_status_buf(struct ath12k_pdev_dp *dp_pdev,

			       struct ath12k_mon_data *pmon,

			       const struct dp_mon_packet_info *packet_info);

void ath12k_dp_mon_update_radiotap(struct ath12k_pdev_dp *dp_pdev,

				   struct hal_rx_mon_ppdu_info *ppduinfo,

				   struct sk_buff *mon_skb,

				   struct ieee80211_rx_status *rxs);

void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev,

				   struct napi_struct *napi,

				   struct sk_buff *msdu,

				   struct ieee80211_rx_status *status,

				   u8 decap);

void ath12k_dp_mon_rx_deliver_msdu(struct ath12k_pdev_dp *dp_pdev,

				   struct napi_struct *napi,

				   struct sk_buff *msdu,

				   struct ieee80211_rx_status *status,

				   u8 decap);

struct sk_buff *

ath12k_dp_mon_rx_merg_msdus(struct ath12k_pdev_dp *dp_pdev,

			    struct dp_mon_mpdu *mon_mpdu,

			    struct hal_rx_mon_ppdu_info *ppdu_info,

			    struct ieee80211_rx_status *rxs);

#endif

drivers/net/wireless/ath/ath12k/dp_rx.h

+9 −0
Original line number Diff line number Diff line
@@ -165,6 +165,15 @@ static inline void ath12k_dp_clean_up_skb_list(struct sk_buff_head *skb_list) 
		dev_kfree_skb_any(skb);

}



static inline

void ath12k_dp_extract_rx_desc_data(struct ath12k_hal *hal,

				    struct hal_rx_desc_data *rx_info,

				    struct hal_rx_desc *rx_desc,

				    struct hal_rx_desc *ldesc)

{

	hal->ops->extract_rx_desc_data(rx_info, rx_desc, ldesc);

}



void ath12k_dp_rx_h_undecap(struct ath12k_pdev_dp *dp_pdev, struct sk_buff *msdu,

			    struct hal_rx_desc *rx_desc,

			    enum hal_encrypt_type enctype,

drivers/net/wireless/ath/ath12k/hal.h

+28 −0
Original line number Diff line number Diff line
@@ -73,6 +73,16 @@ struct ath12k_base; 
#define HAL_RX_MAX_NSS         8

#define HAL_RX_MAX_NUM_LEGACY_RATES 12



#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID		BIT(30)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VER		BIT(31)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_NSS		GENMASK(2, 0)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_MCS		GENMASK(6, 3)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_LDPC		BIT(7)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_DCM		BIT(8)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_START	GENMASK(15, 9)

#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_SIZE		GENMASK(18, 16)

#define HAL_RX_FCS_LEN                          4



enum hal_srng_ring_id {

	HAL_SRNG_RING_ID_REO2SW0 = 0,

	HAL_SRNG_RING_ID_REO2SW1,
@@ -597,6 +607,24 @@ struct hal_rx_msdu_desc_info { 
	u16 msdu_len; /* 14 bits for length */

};



/* hal_mon_buf_ring

 *	Producer : SW

 *	Consumer : Monitor

 *

 * paddr_lo

 *	Lower 32-bit physical address of the buffer pointer from the source ring.

 * paddr_hi

 *	bit range 7-0 : upper 8 bit of the physical address.

 *	bit range 31-8 : reserved.

 * cookie

 *	Consumer: RxMon/TxMon 64 bit cookie of the buffers.

 */

struct hal_mon_buf_ring {

	__le32 paddr_lo;

	__le32 paddr_hi;

	__le64 cookie;

};



struct hal_rx_mon_ppdu_info {

	u32 ppdu_id;

	u32 last_ppdu_id;

drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c

+91 −8
Original line number Diff line number Diff line
@@ -31,6 +31,32 @@ ath12k_wifi7_dp_mon_rx_memset_ppdu_info(struct hal_rx_mon_ppdu_info *ppdu_info) 
	ppdu_info->peer_id = HAL_INVALID_PEERID;

}



/* Hardware fill buffer with 128 bytes aligned. So need to reap it

 * with 128 bytes aligned.

 */

#define RXDMA_DATA_DMA_BLOCK_SIZE 128



static void

ath12k_wifi7_dp_mon_get_buf_len(struct hal_rx_msdu_desc_info *info,

				bool *is_frag, u32 *total_len,

				u32 *frag_len, u32 *msdu_cnt)

{

	if (info->msdu_flags & RX_MSDU_DESC_INFO0_MSDU_CONTINUATION) {

		*is_frag = true;

		*frag_len = (RX_MON_STATUS_BASE_BUF_SIZE -

			     sizeof(struct hal_rx_desc)) &

			     ~(RXDMA_DATA_DMA_BLOCK_SIZE - 1);

		*total_len += *frag_len;

	} else {

		if (*is_frag)

			*frag_len = info->msdu_len - *total_len;

		else

			*frag_len = info->msdu_len;



		*msdu_cnt -= 1;

	}

}



static void

ath12k_wifi7_dp_mon_rx_handle_ofdma_info(const struct hal_rx_ppdu_end_user_stats *ppdu_end_user,

					 struct hal_rx_user_status *rx_user_status)
@@ -2373,6 +2399,62 @@ ath12k_wifi7_dp_mon_tx_status_get_num_user(u16 tlv_tag, 
	return tlv_status;

}



static int

ath12k_wifi7_dp_mon_rx_deliver(struct ath12k_pdev_dp *dp_pdev,

			       struct dp_mon_mpdu *mon_mpdu,

			       struct hal_rx_mon_ppdu_info *ppduinfo,

			       struct napi_struct *napi)

{

	struct sk_buff *mon_skb, *skb_next, *header;

	struct ieee80211_rx_status *rxs = &dp_pdev->rx_status;

	u8 decap = DP_RX_DECAP_TYPE_RAW;



	mon_skb = ath12k_dp_mon_rx_merg_msdus(dp_pdev, mon_mpdu, ppduinfo, rxs);

	if (!mon_skb)

		goto mon_deliver_fail;



	header = mon_skb;

	rxs->flag = 0;



	if (mon_mpdu->err_bitmap & HAL_RX_MPDU_ERR_FCS)

		rxs->flag = RX_FLAG_FAILED_FCS_CRC;



	do {

		skb_next = mon_skb->next;

		if (!skb_next)

			rxs->flag &= ~RX_FLAG_AMSDU_MORE;

		else

			rxs->flag |= RX_FLAG_AMSDU_MORE;



		if (mon_skb == header) {

			header = NULL;

			rxs->flag &= ~RX_FLAG_ALLOW_SAME_PN;

		} else {

			rxs->flag |= RX_FLAG_ALLOW_SAME_PN;

		}

		rxs->flag |= RX_FLAG_ONLY_MONITOR;



		if (!(rxs->flag & RX_FLAG_ONLY_MONITOR))

			decap = mon_mpdu->decap_format;



		ath12k_dp_mon_update_radiotap(dp_pdev, ppduinfo, mon_skb, rxs);

		ath12k_dp_mon_rx_deliver_msdu(dp_pdev, napi, mon_skb, rxs, decap);

		mon_skb = skb_next;

	} while (mon_skb);

	rxs->flag = 0;



	return 0;



mon_deliver_fail:

	mon_skb = mon_mpdu->head;

	while (mon_skb) {

		skb_next = mon_skb->next;

		dev_kfree_skb_any(mon_skb);

		mon_skb = skb_next;

	}

	return -EINVAL;

}



static void

ath12k_wifi7_dp_mon_tx_process_ppdu_info(struct ath12k_pdev_dp *dp_pdev,

					 struct napi_struct *napi,
@@ -2385,7 +2467,7 @@ ath12k_wifi7_dp_mon_tx_process_ppdu_info(struct ath12k_pdev_dp *dp_pdev, 
		list_del(&mon_mpdu->list);



		if (mon_mpdu->head)

			ath12k_dp_mon_rx_deliver(dp_pdev, mon_mpdu,

			ath12k_wifi7_dp_mon_rx_deliver(dp_pdev, mon_mpdu,

						       &tx_ppdu_info->rx_status, napi);



		kfree(mon_mpdu);
@@ -2606,7 +2688,7 @@ ath12k_wifi7_dp_rx_mon_mpdu_pop(struct ath12k *ar, int mac_id, 
				pmon->mon_last_linkdesc_paddr = paddr;

				is_first_msdu = false;

			}

			ath12k_dp_mon_get_buf_len(&msdu_list.msdu_info[i],

			ath12k_wifi7_dp_mon_get_buf_len(&msdu_list.msdu_info[i],

							&is_frag, &total_len,

							&frag_len, &msdu_cnt);

			rx_buf_size = rx_pkt_offset + l2_hdr_offset + frag_len;
@@ -2748,7 +2830,7 @@ ath12k_wifi7_dp_rx_mon_dest_process(struct ath12k *ar, int mac_id, 
			tmp_mpdu->tail = tail_msdu;

			tmp_mpdu->err_bitmap = pmon->err_bitmap;

			tmp_mpdu->decap_format = pmon->decap_format;

			ath12k_dp_mon_rx_deliver(&ar->dp, tmp_mpdu,

			ath12k_wifi7_dp_mon_rx_deliver(&ar->dp, tmp_mpdu,

						       &pmon->mon_ppdu_info, napi);

			rx_mon_stats->dest_mpdu_done++;

			kfree(tmp_mpdu);
@@ -2883,7 +2965,8 @@ ath12k_wifi7_dp_mon_rx_parse_mon_status(struct ath12k_pdev_dp *dp_pdev, 
		list_del(&mon_mpdu->list);



		if (mon_mpdu->head && mon_mpdu->tail)

			ath12k_dp_mon_rx_deliver(dp_pdev, mon_mpdu, ppdu_info, napi);

			ath12k_wifi7_dp_mon_rx_deliver(dp_pdev, mon_mpdu,

						       ppdu_info, napi);



		kfree(mon_mpdu);

	}