Commit 443d2ee7 authored by Anilkumar Kolli's avatar Anilkumar Kolli Committed by Kalle Valo
Browse files

ath11k: fix parsing PPDU_CTRL type in pktlog 



PPDU_CTRL type is missing in current pktlog dumps.
PPDU_CTRL is sent on CE5 with len 2560 bytes, current
driver ignores the payload len greter than 2048.
PPDU_CTRL of 2560 bytes is sent in two fragments of len 2028
and 532 bytes, but firmware reports pkt header has length as 2560
for both of the fragments.

Signed-off-by: default avatarAnilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 79c080db

drivers/net/wireless/ath/ath11k/debug.h

+10 −3
Original line number Diff line number Diff line
@@ -68,12 +68,19 @@ struct debug_htt_stats_req { 
	u8 buf[0];

};



#define ATH11K_HTT_STATS_BUF_SIZE (1024 * 512)

struct ath_pktlog_hdr {

	u16 flags;

	u16 missed_cnt;

	u16 log_type;

	u16 size;

	u32 timestamp;

	u32 type_specific_data;

	u8 payload[0];

};



#define ATH11K_HTT_STATS_BUF_SIZE (1024 * 512)

#define ATH11K_FW_STATS_BUF_SIZE (1024 * 1024)



#define ATH11K_HTT_PKTLOG_MAX_SIZE 2048



enum ath11k_pktlog_filter {

	ATH11K_PKTLOG_RX		= 0x000000001,

	ATH11K_PKTLOG_TX		= 0x000000002,

drivers/net/wireless/ath/ath11k/dp_rx.c

+2 −10
Original line number Diff line number Diff line
@@ -1300,18 +1300,10 @@ static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, 
static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb)

{

	struct htt_pktlog_msg *data = (struct htt_pktlog_msg *)skb->data;

	struct ath_pktlog_hdr *hdr = (struct ath_pktlog_hdr *)data;

	struct ath11k *ar;

	u32 len;

	u8 pdev_id;



	len = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE, data->hdr);

	if (len > ATH11K_HTT_PKTLOG_MAX_SIZE) {

		ath11k_warn(ab, "htt pktlog buffer size %d, expected < %d\n",

			    len,

			    ATH11K_HTT_PKTLOG_MAX_SIZE);

		return;

	}



	pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data->hdr);

	ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id);

	if (!ar) {
@@ -1319,7 +1311,7 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb) 
		return;

	}



	trace_ath11k_htt_pktlog(ar, data->payload, len);

	trace_ath11k_htt_pktlog(ar, data->payload, hdr->size);

}



void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab,