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

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

Merge 5e1b7353 on remote branch 

Change-Id: I4f8bcc0f6e0828591f9c1873bb4b00cd34d8025f
parents bead534f 5e1b7353

dp/wifi3.0/dp_rx.c

+70 −10
Original line number Diff line number Diff line
@@ -1199,29 +1199,67 @@ static void dp_rx_fill_gro_info(struct dp_soc *soc, uint8_t *rx_tlv, 
 *

 * @nbuf: pointer to msdu.

 * @mpdu_len: mpdu length

 * @l3_pad_len: L3 padding length by HW

 *

 * Return: returns true if nbuf is last msdu of mpdu else retuns false.

 */

static inline bool dp_rx_adjust_nbuf_len(qdf_nbuf_t nbuf, uint16_t *mpdu_len)

static inline bool dp_rx_adjust_nbuf_len(qdf_nbuf_t nbuf,

					 uint16_t *mpdu_len,

					 uint32_t l3_pad_len)

{

	bool last_nbuf;

	uint32_t pkt_hdr_size;



	if (*mpdu_len > (RX_DATA_BUFFER_SIZE - RX_PKT_TLVS_LEN)) {

	pkt_hdr_size = RX_PKT_TLVS_LEN + l3_pad_len;



	if ((*mpdu_len + pkt_hdr_size) > RX_DATA_BUFFER_SIZE) {

		qdf_nbuf_set_pktlen(nbuf, RX_DATA_BUFFER_SIZE);

		last_nbuf = false;

		*mpdu_len -= (RX_DATA_BUFFER_SIZE - pkt_hdr_size);

	} else {

		qdf_nbuf_set_pktlen(nbuf, (*mpdu_len + RX_PKT_TLVS_LEN));

		qdf_nbuf_set_pktlen(nbuf, (*mpdu_len + pkt_hdr_size));

		last_nbuf = true;

		*mpdu_len = 0;

	}



	*mpdu_len -= (RX_DATA_BUFFER_SIZE - RX_PKT_TLVS_LEN);



	return last_nbuf;

}



/**

 * dp_get_l3_hdr_pad_len() - get L3 header padding length.

 *

 * @soc: DP soc handle

 * @nbuf: pointer to msdu.

 *

 * Return: returns padding length in bytes.

 */

static inline uint32_t dp_get_l3_hdr_pad_len(struct dp_soc *soc,

					     qdf_nbuf_t nbuf)

{

	uint32_t l3_hdr_pad = 0;

	uint8_t *rx_tlv_hdr;

	struct hal_rx_msdu_metadata msdu_metadata;



	while (nbuf) {

		if (!qdf_nbuf_is_rx_chfrag_cont(nbuf)) {

			/* scattered msdu end with continuation is 0 */

			rx_tlv_hdr = qdf_nbuf_data(nbuf);

			hal_rx_msdu_metadata_get(soc->hal_soc,

						 rx_tlv_hdr,

						 &msdu_metadata);

			l3_hdr_pad = msdu_metadata.l3_hdr_pad;

			break;

		}

		nbuf = nbuf->next;

	}



	return l3_hdr_pad;

}



/**

 * dp_rx_sg_create() - create a frag_list for MSDUs which are spread across

 *		     multiple nbufs.

 * @soc: DP SOC handle

 * @nbuf: pointer to the first msdu of an amsdu.

 *

 * This function implements the creation of RX frag_list for cases
@@ -1229,12 +1267,13 @@ static inline bool dp_rx_adjust_nbuf_len(qdf_nbuf_t nbuf, uint16_t *mpdu_len) 
 *

 * Return: returns the head nbuf which contains complete frag_list.

 */

qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf)

qdf_nbuf_t dp_rx_sg_create(struct dp_soc *soc, qdf_nbuf_t nbuf)

{

	qdf_nbuf_t parent, frag_list, next = NULL;

	uint16_t frag_list_len = 0;

	uint16_t mpdu_len;

	bool last_nbuf;

	uint32_t l3_hdr_pad_offset = 0;



	/*

	 * Use msdu len got from REO entry descriptor instead since
@@ -1242,6 +1281,7 @@ qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf) 
	 * from REO descriptor is right for non-raw RX scatter msdu.

	 */

	mpdu_len = QDF_NBUF_CB_RX_PKT_LEN(nbuf);



	/*

	 * this is a case where the complete msdu fits in one single nbuf.

	 * in this case HW sets both start and end bit and we only need to
@@ -1254,6 +1294,8 @@ qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf) 
		return nbuf;

	}



	l3_hdr_pad_offset = dp_get_l3_hdr_pad_len(soc, nbuf);



	/*

	 * This is a case where we have multiple msdus (A-MSDU) spread across

	 * multiple nbufs. here we create a fraglist out of these nbufs.
@@ -1273,7 +1315,24 @@ qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf) 
	 * nbufs will form the frag_list of the parent nbuf.

	 */

	qdf_nbuf_set_rx_chfrag_start(parent, 1);

	last_nbuf = dp_rx_adjust_nbuf_len(parent, &mpdu_len);

	/*

	 * L3 header padding is only needed for the 1st buffer

	 * in a scattered msdu

	 */

	last_nbuf = dp_rx_adjust_nbuf_len(parent, &mpdu_len,

					  l3_hdr_pad_offset);



	/*

	 * HW issue:  MSDU cont bit is set but reported MPDU length can fit

	 * in to single buffer

	 *

	 * Increment error stats and avoid SG list creation

	 */

	if (last_nbuf) {

		qdf_nbuf_pull_head(parent,

				   RX_PKT_TLVS_LEN + l3_hdr_pad_offset);

		return parent;

	}



	/*

	 * this is where we set the length of the fragments which are
@@ -1281,7 +1340,7 @@ qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf) 
	 * till we hit the last_nbuf of the list.

	 */

	do {

		last_nbuf = dp_rx_adjust_nbuf_len(nbuf, &mpdu_len);

		last_nbuf = dp_rx_adjust_nbuf_len(nbuf, &mpdu_len, 0);

		qdf_nbuf_pull_head(nbuf, RX_PKT_TLVS_LEN);

		frag_list_len += qdf_nbuf_len(nbuf);
@@ -1298,7 +1357,8 @@ qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf) 
	qdf_nbuf_append_ext_list(parent, frag_list, frag_list_len);

	parent->next = next;



	qdf_nbuf_pull_head(parent, RX_PKT_TLVS_LEN);

	qdf_nbuf_pull_head(parent,

			   RX_PKT_TLVS_LEN + l3_hdr_pad_offset);

	return parent;

}
@@ -2833,7 +2893,7 @@ uint32_t dp_rx_process(struct dp_intr *int_ctx, hal_ring_handle_t hal_ring_hdl, 
			qdf_nbuf_pull_head(nbuf, RX_PKT_TLVS_LEN);

		} else if (qdf_nbuf_is_rx_chfrag_cont(nbuf)) {

			msdu_len = QDF_NBUF_CB_RX_PKT_LEN(nbuf);

			nbuf = dp_rx_sg_create(nbuf);

			nbuf = dp_rx_sg_create(soc, nbuf);

			next = nbuf->next;



			if (qdf_nbuf_is_raw_frame(nbuf)) {

dp/wifi3.0/dp_rx.h

+2 −1
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ dp_rx_wbm_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, 
/**

 * dp_rx_sg_create() - create a frag_list for MSDUs which are spread across

 *		     multiple nbufs.

 * @soc: core txrx main context

 * @nbuf: pointer to the first msdu of an amsdu.

 *

 * This function implements the creation of RX frag_list for cases
@@ -683,7 +684,7 @@ dp_rx_wbm_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, 
 *

 * Return: returns the head nbuf which contains complete frag_list.

 */

qdf_nbuf_t dp_rx_sg_create(qdf_nbuf_t nbuf);

qdf_nbuf_t dp_rx_sg_create(struct dp_soc *soc, qdf_nbuf_t nbuf);





/*

dp/wifi3.0/dp_rx_err.c

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ dp_rx_reo_err_entry_process(struct dp_soc *soc, 
		rx_tlv_hdr_last = qdf_nbuf_data(tail_nbuf);



		if (qdf_unlikely(head_nbuf != tail_nbuf)) {

			nbuf = dp_rx_sg_create(head_nbuf);

			nbuf = dp_rx_sg_create(soc, head_nbuf);

			qdf_nbuf_set_is_frag(nbuf, 1);

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

		}
@@ -2375,7 +2375,7 @@ dp_rx_wbm_err_process(struct dp_intr *int_ctx, struct dp_soc *soc, 
		 * QCN9000 has this support

		 */

		if (qdf_nbuf_is_rx_chfrag_cont(nbuf)) {

			nbuf = dp_rx_sg_create(nbuf);

			nbuf = dp_rx_sg_create(soc, nbuf);

			next = nbuf->next;

			/*

			 * SG error handling is not done correctly,

target_if/spectral/target_if_spectral.c

+6 −0
Original line number Diff line number Diff line
@@ -5594,6 +5594,12 @@ target_if_spectral_fw_param_event_handler(ol_scn_t scn, uint8_t *data_buf, 
		return qdf_status_to_os_return(QDF_STATUS_E_FAILURE);

	}



	if (event_params.smode >= SPECTRAL_SCAN_MODE_MAX ||

	    event_params.smode < SPECTRAL_SCAN_MODE_NORMAL) {

		spectral_err("Invalid smode %d", event_params.smode);

		return qdf_status_to_os_return(QDF_STATUS_E_FAILURE);

	}



	pdev = wlan_objmgr_get_pdev_by_id(psoc, event_params.pdev_id,

					  WLAN_SPECTRAL_ID);

	if (!pdev) {

umac/thermal/dispatcher/inc/wlan_thermal_public_struct.h

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



/**

 * DOC: declare the thermal public structure

 */

#ifndef _WLAN_THERMAL_PUBLIC_STRUCT_H_

#define _WLAN_THERMAL_PUBLIC_STRUCT_H_



/**

 * enum thermal_throttle_level - firmware offload throttle level

 * @THERMAL_FULLPERF: no any throtting

 * @THERMAL_MITIGATION: throtting tx to do mitigation

 * @THERMAL_SHUTOFF: shut down the tx completely

 * @THERMAL_UNKNOWN: unknown level from target.

 */

enum thermal_throttle_level {

	 THERMAL_FULLPERF,

	 THERMAL_MITIGATION,

	 THERMAL_SHUTOFF,

	 THERMAL_UNKNOWN,

};



enum thermal_stats_request_type {

	thermal_stats_none = 0,

	thermal_stats_init,

	thermal_stats_req,

	thermal_stats_clear,

	thermal_stats_current_all_sensors_temp,

};



/**

 * thermal_throt_level_stats - thermal throttle info from Target

 * @start_temp_level: Start temperature range to capture thermal stats

 * @end_temp_level: End temperature range to capture thermal stats

 * @total_time_ms_lo: Start time for every thermal stats level in msec

 * @total_time_ms_hi: End time for every thermal stats level in msec

 * @num_entry: Thermal stats counter for every time temp level for this range

 */

struct thermal_throt_level_stats {

	uint32_t start_temp_level;

	uint32_t end_temp_level;

	uint32_t total_time_ms_lo;

	uint32_t total_time_ms_hi;

	uint32_t num_entry;

};



#endif /* _WLAN_THERMAL_PUBLIC_STRUCT_H_ */