Merge tag 'LA.UM.9.12.1.r1-00300-SMxx50.QSSI12.0' of... (4eaf2072) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5456,7 +5456,8 @@ static QDF_STATUS dp_vdev_attach_wifi3(struct cdp_soc_t *cdp_soc,
		qdf_spin_unlock_bh(&pdev->vdev_list_lock);
		pdev->vdev_count++;

		if (wlan_op_mode_sta != vdev->opmode)
		if (wlan_op_mode_sta != vdev->opmode &&
		wlan_op_mode_ndi != vdev->opmode)
		vdev->ap_bridge_enabled = true;
		else
		vdev->ap_bridge_enabled = false;

drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_rx.c

+70 −10

Original line number	Diff line number	Diff line
		@@ -1059,29 +1059,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
		@@ -1089,12 +1127,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
		@@ -1102,6 +1141,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
		@@ -1114,6 +1154,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.
		@@ -1133,7 +1175,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
		@@ -1141,7 +1200,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);

		@@ -1158,7 +1217,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;
		}

		@@ -2466,7 +2526,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)) {

drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_rx.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -622,6 +622,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
		@@ -629,7 +630,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_rx_desc_pool_alloc() - create a pool of software rx_descs

drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_rx_err.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,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);
		}

drivers/staging/qca-wifi-host-cmn/hal/wifi3.0/hal_srng.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -663,7 +663,7 @@ static void hal_reg_write_enqueue(struct hal_soc *hal_soc,
		uint32_t write_idx;

		if (srng->reg_write_in_progress) {
		hal_verbose_debug("Already in progress srng ring id 0x%x addr 0x%x val %u",
		hal_verbose_debug("Already in progress srng ring id 0x%x addr 0x%pK val %u",
		srng->ring_id, addr, value);
		qdf_atomic_inc(&hal_soc->stats.wstats.coalesces);
		srng->wstats.coalesces++;
		@@ -715,7 +715,7 @@ static void hal_reg_write_enqueue(struct hal_soc *hal_soc,
		srng->reg_write_in_progress = true;
		qdf_atomic_inc(&hal_soc->active_work_cnt);

		hal_verbose_debug("write_idx %u srng ring id 0x%x addr 0x%x val %u",
		hal_verbose_debug("write_idx %u srng ring id 0x%x addr 0x%pK val %u",
		write_idx, srng->ring_id, addr, value);

		qdf_queue_work(hal_soc->qdf_dev, hal_soc->reg_write_wq,