Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 174fa507 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3529ba79 on remote branch 

Change-Id: I933ac6e5464eaaabcec3ebf7a740262db9e65c34
parents 4fbee731 3529ba79

dp/inc/cdp_txrx_stats_struct.h

+2 −0
Original line number Diff line number Diff line
@@ -365,7 +365,9 @@ enum WDI_EVENT { 
	WDI_EVENT_PEER_QOS_STATS,

	WDI_EVENT_PKT_CAPTURE_TX_DATA,

	WDI_EVENT_PKT_CAPTURE_RX_DATA,

	WDI_EVENT_PKT_CAPTURE_RX_DATA_NO_PEER,

	WDI_EVENT_PKT_CAPTURE_OFFLOAD_TX_DATA,

	WDI_EVENT_PKT_CAPTURE_PPDU_STATS,

	/* End of new event items */

	WDI_EVENT_LAST

};

dp/wifi3.0/dp_htt.c

+48 −0
Original line number Diff line number Diff line
@@ -4094,6 +4094,45 @@ static struct ppdu_info *dp_htt_process_tlv(struct dp_pdev *pdev, 
}

#endif /* FEATURE_PERPKT_INFO */



#ifdef WLAN_FEATURE_PKT_CAPTURE_V2

static void dp_htt_process_stats_tlv(struct dp_soc *soc,

				     qdf_nbuf_t htt_t2h_msg)

{

	uint32_t length;

	uint8_t tlv_type;

	uint32_t tlv_length, tlv_expected_size;

	uint8_t *tlv_buf;



	uint32_t *msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg);



	length = HTT_T2H_PPDU_STATS_PAYLOAD_SIZE_GET(*msg_word);



	msg_word = msg_word + 4;



	while (length > 0) {

		tlv_buf = (uint8_t *)msg_word;

		tlv_type = HTT_STATS_TLV_TAG_GET(*msg_word);

		tlv_length = HTT_STATS_TLV_LENGTH_GET(*msg_word);



		if (tlv_length == 0)

			break;



		tlv_length += HTT_TLV_HDR_LEN;



		if (tlv_type == HTT_PPDU_STATS_FOR_SMU_TLV) {

			tlv_expected_size = sizeof(htt_ppdu_stats_for_smu_tlv);



			if (tlv_length >= tlv_expected_size)

				dp_wdi_event_handler(

					WDI_EVENT_PKT_CAPTURE_PPDU_STATS,

					soc, msg_word, HTT_INVALID_VDEV,

					WDI_NO_VAL, 0);

		}

		msg_word = (uint32_t *)((uint8_t *)tlv_buf + tlv_length);

		length -= (tlv_length);

	}

}

#endif

/**

 * dp_txrx_ppdu_stats_handler() - Function to process HTT PPDU stats from FW

 * @soc: DP SOC handle
@@ -4140,6 +4179,15 @@ static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc, 


	return free_buf;

}

#elif defined(WLAN_FEATURE_PKT_CAPTURE_V2)

static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc,

				       uint8_t pdev_id, qdf_nbuf_t htt_t2h_msg)

{

	if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))

		dp_htt_process_stats_tlv(soc, htt_t2h_msg);



	return true;

}

#else

static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc,

				       uint8_t pdev_id, qdf_nbuf_t htt_t2h_msg)

dp/wifi3.0/dp_rx.c

+7 −24
Original line number Diff line number Diff line
@@ -2250,6 +2250,7 @@ void dp_rx_deliver_to_pkt_capture(struct dp_soc *soc, struct dp_pdev *pdev, 
				  uint16_t peer_id, uint32_t is_offload,

				  qdf_nbuf_t netbuf)

{

	if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))

		dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA, soc, netbuf,

				     peer_id, is_offload, pdev->pdev_id);

}
@@ -2257,28 +2258,10 @@ void dp_rx_deliver_to_pkt_capture(struct dp_soc *soc, struct dp_pdev *pdev, 
void dp_rx_deliver_to_pkt_capture_no_peer(struct dp_soc *soc, qdf_nbuf_t nbuf,

					  uint32_t is_offload)

{

	uint16_t msdu_len = 0;

	uint16_t peer_id, vdev_id;

	uint32_t pkt_len = 0;

	uint8_t *rx_tlv_hdr;

	struct hal_rx_msdu_metadata msdu_metadata;



	peer_id = QDF_NBUF_CB_RX_PEER_ID(nbuf);

	vdev_id = QDF_NBUF_CB_RX_VDEV_ID(nbuf);

	rx_tlv_hdr = qdf_nbuf_data(nbuf);

	hal_rx_msdu_metadata_get(soc->hal_soc, rx_tlv_hdr, &msdu_metadata);

	msdu_len = QDF_NBUF_CB_RX_PKT_LEN(nbuf);

	pkt_len = msdu_len + msdu_metadata.l3_hdr_pad +

		  RX_PKT_TLVS_LEN;



	qdf_nbuf_set_pktlen(nbuf, pkt_len);

	dp_rx_skip_tlvs(nbuf, msdu_metadata.l3_hdr_pad);



	dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA, soc, nbuf,

			     HTT_INVALID_VDEV, is_offload, 0);



	qdf_nbuf_push_head(nbuf, msdu_metadata.l3_hdr_pad +

			   RX_PKT_TLVS_LEN);

	if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))

		dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA_NO_PEER,

				     soc, nbuf, HTT_INVALID_VDEV,

				     is_offload, 0);

}



#endif

dp/wifi3.0/dp_rx.h

+17 −0
Original line number Diff line number Diff line
@@ -1158,6 +1158,23 @@ dp_rx_update_protocol_tag(struct dp_soc *soc, struct dp_vdev *vdev, 
			  bool is_reo_exception, bool is_update_stats)

{

}



/**

 * dp_rx_err_cce_drop() - Reads CCE metadata from the RX MSDU end TLV

 *                        and returns whether cce metadata matches

 * @soc: core txrx main context

 * @vdev: vdev on which the packet is received

 * @nbuf: QDF pkt buffer on which the protocol tag should be set

 * @rx_tlv_hdr: rBbase address where the RX TLVs starts

 * Return: bool

 */

static inline bool

dp_rx_err_cce_drop(struct dp_soc *soc, struct dp_vdev *vdev,

		   qdf_nbuf_t nbuf, uint8_t *rx_tlv_hdr)

{

	return false;

}



#endif /* WLAN_SUPPORT_RX_PROTOCOL_TYPE_TAG */



#ifndef WLAN_SUPPORT_RX_FLOW_TAG

dp/wifi3.0/dp_rx_err.c

+28 −0
Original line number Diff line number Diff line
@@ -779,6 +779,16 @@ dp_rx_chain_msdus(struct dp_soc *soc, qdf_nbuf_t nbuf, 
	return mpdu_done;

}



#ifdef WLAN_SKIP_BAR_UPDATE

static

void dp_rx_err_handle_bar(struct dp_soc *soc,

			  struct dp_peer *peer,

			  qdf_nbuf_t nbuf)

{

	dp_info_rl("BAR update to H.W is skipped");

	DP_STATS_INC(soc, rx.err.bar_handle_fail_count, 1);

}

#else

static

void dp_rx_err_handle_bar(struct dp_soc *soc,

			  struct dp_peer *peer,
@@ -828,6 +838,7 @@ void dp_rx_err_handle_bar(struct dp_soc *soc, 
		DP_STATS_INC(soc, rx.err.ssn_update_count, 1);

	}

}

#endif



/**

 * dp_rx_bar_frame_handle() - Function to handle err BAR frames
@@ -1283,6 +1294,23 @@ dp_rx_null_q_desc_handle(struct dp_soc *soc, qdf_nbuf_t nbuf, 
			/* IEEE80211_SEQ_MAX indicates invalid start_seq */

	}



	/*

	 * Drop packets in this path if cce_match is found. Packets will come

	 * in following path depending on whether tidQ is setup.

	 * 1. If tidQ is setup: WIFILI_HAL_RX_WBM_REO_PSH_RSN_ROUTE and

	 * cce_match = 1

	 *    Packets with WIFILI_HAL_RX_WBM_REO_PSH_RSN_ROUTE are already

	 *    dropped.

	 * 2. If tidQ is not setup: WIFILI_HAL_RX_WBM_REO_PSH_RSN_ERROR and

	 * cce_match = 1

	 *    These packets need to be dropped and should not get delivered

	 *    to stack.

	 */

	if (qdf_unlikely(dp_rx_err_cce_drop(soc, vdev, nbuf, rx_tlv_hdr))) {

		qdf_nbuf_free(nbuf);

		return QDF_STATUS_E_FAILURE;

	}



	if (qdf_unlikely(vdev->rx_decap_type == htt_cmn_pkt_type_raw)) {

		qdf_nbuf_set_next(nbuf, NULL);

		dp_rx_deliver_raw(vdev, nbuf, peer);