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

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

Merge 233121e3 on remote branch 

Change-Id: I6568da680ee1e7b041d453d551964c6d52ee1cc2
parents ae3b3e55 233121e3

dp/inc/cdp_txrx_cmn.h

+29 −0
Original line number Diff line number Diff line
@@ -2730,4 +2730,33 @@ cdp_drain_txrx(ol_txrx_soc_handle soc) 


	return soc->ops->cmn_drv_ops->txrx_drain(soc);

}



#ifdef WLAN_FEATURE_PKT_CAPTURE_V2

/**

 * cdp_set_pkt_capture_mode() - set pkt capture mode in dp ctx

 * @soc: opaque soc handle

 * @val: value to be set

 */

static inline void

cdp_set_pkt_capture_mode(ol_txrx_soc_handle soc, bool val)

{

	if (!soc || !soc->ops) {

		QDF_TRACE(QDF_MODULE_ID_CDP, QDF_TRACE_LEVEL_DEBUG,

			  "%s: Invalid Instance", __func__);

		QDF_BUG(0);

		return;

	}



	if (!soc->ops->cmn_drv_ops ||

	    !soc->ops->cmn_drv_ops->set_pkt_capture_mode)

		return;



	soc->ops->cmn_drv_ops->set_pkt_capture_mode(soc, val);

}

#else

static inline void

cdp_set_pkt_capture_mode(ol_txrx_soc_handle soc, bool val)

{

}

#endif

#endif /* _CDP_TXRX_CMN_H_ */

dp/inc/cdp_txrx_ops.h

+3 −0
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ struct cdp_cmn_ops { 
					  ol_osif_peer_handle osif_peer);

#endif /* QCA_SUPPORT_WDS_EXTENDED */

	void (*txrx_drain)(ol_txrx_soc_handle soc);

#ifdef WLAN_FEATURE_PKT_CAPTURE_V2

	void (*set_pkt_capture_mode)(struct cdp_soc_t *soc, bool val);

#endif

};



struct cdp_ctrl_ops {

dp/inc/cdp_txrx_stats_struct.h

+2 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,8 @@ struct cdp_tx_stats { 
	uint32_t num_ppdu_cookie_valid;

	uint32_t no_ack_count[QDF_PROTO_SUBTYPE_MAX];

	struct cdp_pkt_info tx_success_twt;

	/* mpdu retry count in case of successful transmission */

	uint32_t mpdu_success_with_retries;

};



/* struct cdp_rx_stats - rx Level Stats

dp/wifi3.0/dp_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -871,6 +871,8 @@ static inline void dp_update_vdev_stats(struct dp_soc *soc, 
	tgtobj->tx.dropped.fw_reason3 +=

			srcobj->stats.tx.dropped.fw_reason3;

	tgtobj->tx.dropped.age_out += srcobj->stats.tx.dropped.age_out;

	tgtobj->tx.mpdu_success_with_retries +=

			srcobj->stats.tx.mpdu_success_with_retries;

	tgtobj->rx.err.mic_err += srcobj->stats.rx.err.mic_err;

	if (srcobj->stats.rx.rssi != 0)

		tgtobj->rx.rssi = srcobj->stats.rx.rssi;

dp/wifi3.0/dp_main.c

+19 −6
Original line number Diff line number Diff line
@@ -10495,27 +10495,27 @@ static void dp_display_srng_info(struct cdp_soc_t *soc_hdl) 
	dp_info("SRNG HP-TP data:");

	for (i = 0; i < soc->num_tcl_data_rings; i++) {

		hal_get_sw_hptp(hal_soc, soc->tcl_data_ring[i].hal_srng,

				&hp, &tp);

				&tp, &hp);

		dp_info("TCL DATA ring[%d]: hp=0x%x, tp=0x%x", i, hp, tp);



		hal_get_sw_hptp(hal_soc, soc->tx_comp_ring[i].hal_srng,

				&hp, &tp);

				&tp, &hp);

		dp_info("TX comp ring[%d]: hp=0x%x, tp=0x%x", i, hp, tp);

	}



	for (i = 0; i < soc->num_reo_dest_rings; i++) {

		hal_get_sw_hptp(hal_soc, soc->reo_dest_ring[i].hal_srng,

				&hp, &tp);

				&tp, &hp);

		dp_info("REO DST ring[%d]: hp=0x%x, tp=0x%x", i, hp, tp);

	}



	hal_get_sw_hptp(hal_soc, soc->reo_exception_ring.hal_srng, &hp, &tp);

	hal_get_sw_hptp(hal_soc, soc->reo_exception_ring.hal_srng, &tp, &hp);

	dp_info("REO exception ring: hp=0x%x, tp=0x%x", hp, tp);



	hal_get_sw_hptp(hal_soc, soc->rx_rel_ring.hal_srng, &hp, &tp);

	hal_get_sw_hptp(hal_soc, soc->rx_rel_ring.hal_srng, &tp, &hp);

	dp_info("WBM RX release ring: hp=0x%x, tp=0x%x", hp, tp);



	hal_get_sw_hptp(hal_soc, soc->wbm_desc_rel_ring.hal_srng, &hp, &tp);

	hal_get_sw_hptp(hal_soc, soc->wbm_desc_rel_ring.hal_srng, &tp, &hp);

	dp_info("WBM desc release ring: hp=0x%x, tp=0x%x", hp, tp);

}
@@ -11294,6 +11294,16 @@ static void dp_drain_txrx(struct cdp_soc_t *soc_handle) 
}

#endif



#ifdef WLAN_FEATURE_PKT_CAPTURE_V2

static void

dp_set_pkt_capture_mode(struct cdp_soc_t *soc_handle, bool val)

{

	struct dp_soc *soc = (struct dp_soc *)soc_handle;



	soc->wlan_cfg_ctx->pkt_capture_mode = val;

}

#endif



static struct cdp_cmn_ops dp_ops_cmn = {

	.txrx_soc_attach_target = dp_soc_attach_target_wifi3,

	.txrx_vdev_attach = dp_vdev_attach_wifi3,
@@ -11396,6 +11406,9 @@ static struct cdp_cmn_ops dp_ops_cmn = { 
#if defined(FEATURE_RUNTIME_PM) || defined(DP_POWER_SAVE)

	.txrx_drain = dp_drain_txrx,

#endif

#ifdef WLAN_FEATURE_PKT_CAPTURE_V2

	.set_pkt_capture_mode = dp_set_pkt_capture_mode,

#endif

};



static struct cdp_ctrl_ops dp_ops_ctrl = {