ath10k: simplify pktlog htt event processing

It is expected that all pktlog events for 10.4 firmware based solutions
should come through CE8 where as in case of 10.2 firmware based solutions,
it should come through one of the HTT events (HTT_T2H_MSG_TYPE_PKTLOG).

But from experiments with 10.4 based solutions, it is observed that pktlog
event for ATH_PKTLOG_TYPE_TX_MSDU_ID is coming through HTT pktlog event.
Currently, we always parse with 10.2 pktlog header which will lead to
pktlog decoding issues (payload length mismatch exceptions)

For trace points, it is required to provide only the payload size. So
fixing this by simplifying the payload size calculation without the use of
ath10k pktlog headers.

While there, remove the unused ath10k pktlog headers.

Signed-off-by: Ashok Raj Nagarajan <arnagara@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 8bae023946b6d65250c70857381a6837083c11a7..5ec7ac14424dc8b0207d816487471d65a6906c5e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -2308,12 +2308,10 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                ath10k_htt_rx_delba(ar, resp);
                break;
        case HTT_T2H_MSG_TYPE_PKTLOG: {
-               struct ath10k_pktlog_hdr *hdr =
-                       (struct ath10k_pktlog_hdr *)resp->pktlog_msg.payload;
-
                trace_ath10k_htt_pktlog(ar, resp->pktlog_msg.payload,
-                                       sizeof(*hdr) +
-                                       __le16_to_cpu(hdr->size));
+                                       skb->len -
+                                       offsetof(struct htt_resp,
+                                                pktlog_msg.payload));
                break;
        }
        case HTT_T2H_MSG_TYPE_RX_FLUSH: {

diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index f31d3ce42470d7d2767f4556272d33cb36093968..427b720477741e41360b1d1e916eb23e6200be00 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -296,25 +296,6 @@ enum ath10k_mcast2ucast_mode {
        ATH10K_MCAST2UCAST_ENABLED = 1,
 };
 
-struct ath10k_pktlog_hdr {
-       __le16 flags;
-       __le16 missed_cnt;
-       __le16 log_type;
-       __le16 size;
-       __le32 timestamp;
-       u8 payload[0];
-} __packed;
-
-struct ath10k_pktlog_10_4_hdr {
-       __le16 flags;
-       __le16 missed_cnt;
-       __le16 log_type;
-       __le16 size;
-       __le32 timestamp;
-       __le32 type_specific_data;
-       u8 payload[0];
-} __packed;
-
 enum ath10k_hw_rate_ofdm {
        ATH10K_HW_RATE_OFDM_48M = 0,
        ATH10K_HW_RATE_OFDM_24M,