qcacmn: Dump flow pool stats as part of periodic stats display (99468025) · Commits · e / devices / android_kernel_fairphone_FP5

dp/wifi3.0/dp_internal.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -1837,8 +1837,20 @@ void dp_peer_stats_update_protocol_cnt(struct cdp_soc_t *soc,

		#ifdef QCA_LL_TX_FLOW_CONTROL_V2
		void dp_tx_dump_flow_pool_info(struct cdp_soc_t *soc_hdl);

		/**
		* dp_tx_dump_flow_pool_info_compact() - dump flow pool info
		* @soc: DP soc context
		*
		* Return: none
		*/
		void dp_tx_dump_flow_pool_info_compact(struct dp_soc *soc);
		int dp_tx_delete_flow_pool(struct dp_soc soc, struct dp_tx_desc_pool_s pool,
		bool force);
		#else
		static inline void dp_tx_dump_flow_pool_info_compact(struct dp_soc *soc)
		{
		}
		#endif /* QCA_LL_TX_FLOW_CONTROL_V2 */

		#ifdef QCA_OL_DP_SRNG_LOCK_LESS_ACCESS

dp/wifi3.0/dp_main.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -7503,7 +7503,7 @@ QDF_STATUS dp_reset_monitor_mode(struct cdp_soc_t *soc_hdl,
		*
		* Return: outstanding tx
		*/
		static uint32_t dp_get_tx_pending(struct cdp_pdev *pdev_handle)
		static int32_t dp_get_tx_pending(struct cdp_pdev *pdev_handle)
		{
		struct dp_pdev pdev = (struct dp_pdev )pdev_handle;

		@@ -10085,6 +10085,8 @@ static QDF_STATUS dp_txrx_dump_stats(struct cdp_soc_t *psoc, uint16_t value,
		case CDP_DUMP_TX_FLOW_POOL_INFO:
		if (level == QDF_STATS_VERBOSITY_LEVEL_HIGH)
		cdp_dump_flow_pool_info((struct cdp_soc_t *)soc);
		else
		dp_tx_dump_flow_pool_info_compact(soc);
		break;

		case CDP_DP_NAPI_STATS:
		@@ -11559,6 +11561,7 @@ static QDF_STATUS dp_runtime_suspend(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
		struct dp_soc *soc = cdp_soc_t_to_dp_soc(soc_hdl);
		struct dp_pdev *pdev;
		uint8_t i;
		int32_t tx_pending;

		pdev = dp_get_pdev_from_soc_pdev_id_wifi3(soc, pdev_id);
		if (!pdev) {
		@@ -11567,9 +11570,11 @@ static QDF_STATUS dp_runtime_suspend(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
		}

		/* Abort if there are any pending TX packets */
		if (dp_get_tx_pending(dp_pdev_to_cdp_pdev(pdev)) > 0) {
		tx_pending = dp_get_tx_pending(dp_pdev_to_cdp_pdev(pdev));
		if (tx_pending) {
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
		FL("Abort suspend due to pending TX packets"));
		FL("Abort suspend due to pending TX packets %d"),
		tx_pending);

		/* perform a force flush if tx is pending */
		for (i = 0; i < soc->num_tcl_data_rings; i++) {
		@@ -12042,6 +12047,7 @@ static QDF_STATUS dp_bus_suspend(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
		struct dp_pdev *pdev = dp_get_pdev_from_soc_pdev_id_wifi3(soc, pdev_id);
		int timeout = SUSPEND_DRAIN_WAIT;
		int drain_wait_delay = 50; /* 50 ms */
		int32_t tx_pending;

		if (qdf_unlikely(!pdev)) {
		dp_err("pdev is NULL");
		@@ -12049,10 +12055,11 @@ static QDF_STATUS dp_bus_suspend(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
		}

		/* Abort if there are any pending TX packets */
		while (dp_get_tx_pending((struct cdp_pdev *)pdev) > 0) {
		while ((tx_pending = dp_get_tx_pending((struct cdp_pdev *)pdev))) {
		qdf_sleep(drain_wait_delay);
		if (timeout <= 0) {
		dp_err("TX frames are pending, abort suspend");
		dp_info("TX frames are pending %d, abort suspend",
		tx_pending);
		return QDF_STATUS_E_TIMEOUT;
		}
		timeout = timeout - drain_wait_delay;

dp/wifi3.0/dp_stats.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -5956,6 +5956,8 @@ void dp_txrx_path_stats(struct dp_soc *soc)
		pdev->stats.tx.dropped.fw_rem_notx);
		DP_PRINT_STATS("Invalid peer on tx path: %u",
		pdev->soc->stats.tx.tx_invalid_peer.num);
		DP_PRINT_STATS("Tx desc freed in non-completion path: %u",
		pdev->soc->stats.tx.tx_comp_exception);

		DP_PRINT_STATS("Tx packets sent per interrupt:");
		DP_PRINT_STATS("Single Packet: %u",

dp/wifi3.0/dp_tx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4900,6 +4900,7 @@ uint32_t dp_tx_comp_handler(struct dp_intr int_ctx, struct dp_soc soc,
		!tx_desc->flags)) {
		dp_info_rl("Descriptor freed in vdev_detach %d",
		tx_desc_id);
		DP_STATS_INC(soc, tx.tx_comp_exception, 1);
		continue;
		}

dp/wifi3.0/dp_tx_flow_control.c

+43 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -29,6 +29,8 @@
		#include "dp_internal.h"
		#define INVALID_FLOW_ID 0xFF
		#define MAX_INVALID_BIN 3
		#define GLOBAL_FLOW_POOL_STATS_LEN 25
		#define FLOW_POOL_LOG_LEN 50

		#ifdef QCA_AC_BASED_FLOW_CONTROL
		/**
		@@ -222,6 +224,46 @@ void dp_tx_dump_flow_pool_info(struct cdp_soc_t *soc_hdl)
		qdf_spin_unlock_bh(&soc->flow_pool_array_lock);
		}

		void dp_tx_dump_flow_pool_info_compact(struct dp_soc *soc)
		{
		struct dp_txrx_pool_stats *pool_stats = &soc->pool_stats;
		struct dp_tx_desc_pool_s *pool = NULL;
		char *comb_log_str;
		uint32_t comb_log_str_size;
		int bytes_written = 0;
		int i;

		comb_log_str_size = GLOBAL_FLOW_POOL_STATS_LEN +
		(FLOW_POOL_LOG_LEN * MAX_TXDESC_POOLS) + 1;
		comb_log_str = qdf_mem_malloc(comb_log_str_size);
		if (!comb_log_str)
		return;

		bytes_written = qdf_snprintf(&comb_log_str[bytes_written],
		comb_log_str_size, "G:(%d,%d,%d) ",
		pool_stats->pool_map_count,
		pool_stats->pool_unmap_count,
		pool_stats->pkt_drop_no_pool);

		for (i = 0; i < MAX_TXDESC_POOLS; i++) {
		pool = &soc->tx_desc[i];
		if (pool->status > FLOW_POOL_INVALID)
		continue;
		bytes_written += qdf_snprintf(&comb_log_str[bytes_written],
		(bytes_written >= comb_log_str_size) ? 0 :
		comb_log_str_size - bytes_written,
		"\| %d %d: (%d,%d,%d)",
		pool->flow_pool_id, pool->status,
		pool->pool_size, pool->avail_desc,
		pool->pkt_drop_no_desc);
		}

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
		"FLOW_POOL_STATS %s", comb_log_str);

		qdf_mem_free(comb_log_str);
		}

		/**
		* dp_tx_clear_flow_pool_stats() - clear flow pool statistics
		*