samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Update code with peer_extended_stats instead of rdk_stats

Browse Source 
With new configuration changes for enable_peer_extended stats, update
code to peer_extended_stats naming for clean codebase.

Change-Id: I97a7ee331042232098382683fefebd05e6b099c3
CRs-Fixed: 3149920
This commit is contained in:
Neha Bisht
2022-03-14 10:58:00 +05:30
committed by Madan Koyyalamudi
parent 67df961d63
commit 6064df8467
11 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dp/inc/cdp_txrx_cmn.h
View File

@@ -2435,14 +2435,14 @@ cdp_peer_flush_rate_stats(ol_txrx_soc_handle soc, uint8_t pdev_id,
} }
/** /**
* cdp_peer_get_rdkstats_ctx() - get RDK stats context * cdp_peer_get_peerstats_ctx() - get peer stats context
* @soc: opaque soc handle * @soc: opaque soc handle
* @vdev_id: id of vdev handle * @vdev_id: id of vdev handle
* @mac: peer mac address * @mac: peer mac address
*/ */
static inline void static inline void
*cdp_peer_get_rdkstats_ctx(ol_txrx_soc_handle soc, uint8_t vdev_id, *cdp_peer_get_peerstats_ctx(ol_txrx_soc_handle soc, uint8_t vdev_id,
uint8_t *mac_addr) uint8_t *mac_addr)
{ {
if (!soc || !soc->ops) { if (!soc || !soc->ops) {
dp_cdp_debug("Invalid Instance:"); dp_cdp_debug("Invalid Instance:");
@@ -2451,12 +2451,12 @@ static inline void
} }
if (!soc->ops->cmn_drv_ops || if (!soc->ops->cmn_drv_ops ||
!soc->ops->cmn_drv_ops->txrx_peer_get_rdkstats_ctx) !soc->ops->cmn_drv_ops->txrx_peer_get_peerstats_ctx)
return NULL; return NULL;
return soc->ops->cmn_drv_ops->txrx_peer_get_rdkstats_ctx(soc, return soc->ops->cmn_drv_ops->txrx_peer_get_peerstats_ctx(soc,
vdev_id, vdev_id,
mac_addr); mac_addr);
} }
/** /**

6
dp/inc/cdp_txrx_ops.h
View File

@@ -566,9 +566,9 @@ struct cdp_cmn_ops {
QDF_STATUS (*txrx_peer_flush_rate_stats)(struct cdp_soc_t *soc, QDF_STATUS (*txrx_peer_flush_rate_stats)(struct cdp_soc_t *soc,
uint8_t pdev_id, uint8_t pdev_id,
void *buf); void *buf);
void* (*txrx_peer_get_rdkstats_ctx)(struct cdp_soc_t *soc, void* (*txrx_peer_get_peerstats_ctx)(struct cdp_soc_t *soc,
uint8_t vdev_id, uint8_t vdev_id,
uint8_t *mac_addr); uint8_t *mac_addr);
QDF_STATUS (*txrx_flush_rate_stats_request)(struct cdp_soc_t *soc, QDF_STATUS (*txrx_flush_rate_stats_request)(struct cdp_soc_t *soc,
uint8_t pdev_id); uint8_t pdev_id);

2
dp/wifi3.0/dp_internal.h
View File

@@ -233,7 +233,7 @@ static inline QDF_STATUS dp_monitor_peer_detach(struct dp_soc *soc,
} }
static inline struct cdp_peer_rate_stats_ctx* static inline struct cdp_peer_rate_stats_ctx*
dp_monitor_peer_get_rdkstats_ctx(struct dp_soc *soc, struct dp_peer *peer) dp_monitor_peer_get_peerstats_ctx(struct dp_soc *soc, struct dp_peer *peer)
{ {
return NULL; return NULL;
} }

20
dp/wifi3.0/dp_main.c
View File

@@ -10248,7 +10248,7 @@ dp_set_psoc_param(struct cdp_soc_t *cdp_soc,
switch (param) { switch (param) {
case CDP_ENABLE_RATE_STATS: case CDP_ENABLE_RATE_STATS:
soc->rdkstats_enabled = val.cdp_psoc_param_en_rate_stats; soc->peerstats_enabled = val.cdp_psoc_param_en_rate_stats;
break; break;
case CDP_SET_NSS_CFG: case CDP_SET_NSS_CFG:
wlan_cfg_set_dp_soc_nss_cfg(wlan_cfg_ctx, wlan_cfg_set_dp_soc_nss_cfg(wlan_cfg_ctx,
@@ -12021,7 +12021,7 @@ dp_peer_flush_rate_stats_req(struct dp_soc *soc, struct dp_peer *peer,
dp_wdi_event_handler( dp_wdi_event_handler(
WDI_EVENT_FLUSH_RATE_STATS_REQ, WDI_EVENT_FLUSH_RATE_STATS_REQ,
soc, dp_monitor_peer_get_rdkstats_ctx(soc, peer), soc, dp_monitor_peer_get_peerstats_ctx(soc, peer),
peer->peer_id, peer->peer_id,
WDI_NO_VAL, peer->vdev->pdev->pdev_id); WDI_NO_VAL, peer->vdev->pdev->pdev_id);
} }
@@ -12057,13 +12057,13 @@ dp_flush_rate_stats_req(struct cdp_soc_t *soc_hdl,
} }
#endif #endif
static void *dp_peer_get_rdkstats_ctx(struct cdp_soc_t *soc_hdl, static void *dp_peer_get_peerstats_ctx(struct cdp_soc_t *soc_hdl,
uint8_t vdev_id, uint8_t vdev_id,
uint8_t *mac_addr) uint8_t *mac_addr)
{ {
struct dp_soc *soc = (struct dp_soc *)soc_hdl; struct dp_soc *soc = (struct dp_soc *)soc_hdl;
struct dp_peer *peer; struct dp_peer *peer;
void *rdkstats_ctx = NULL; void *peerstats_ctx = NULL;
if (mac_addr) { if (mac_addr) {
peer = dp_peer_find_hash_find(soc, mac_addr, peer = dp_peer_find_hash_find(soc, mac_addr,
@@ -12073,13 +12073,13 @@ static void *dp_peer_get_rdkstats_ctx(struct cdp_soc_t *soc_hdl,
return NULL; return NULL;
if (!IS_MLO_DP_MLD_PEER(peer)) if (!IS_MLO_DP_MLD_PEER(peer))
rdkstats_ctx = dp_monitor_peer_get_rdkstats_ctx(soc, peerstats_ctx = dp_monitor_peer_get_peerstats_ctx(soc,
peer); peer);
dp_peer_unref_delete(peer, DP_MOD_ID_CDP); dp_peer_unref_delete(peer, DP_MOD_ID_CDP);
} }
return rdkstats_ctx; return peerstats_ctx;
} }
#if defined(FEATURE_PERPKT_INFO) && WDI_EVENT_ENABLE #if defined(FEATURE_PERPKT_INFO) && WDI_EVENT_ENABLE
@@ -12495,7 +12495,7 @@ static struct cdp_cmn_ops dp_ops_cmn = {
.get_rate_stats_ctx = dp_soc_get_rate_stats_ctx, .get_rate_stats_ctx = dp_soc_get_rate_stats_ctx,
.txrx_peer_flush_rate_stats = dp_peer_flush_rate_stats, .txrx_peer_flush_rate_stats = dp_peer_flush_rate_stats,
.txrx_flush_rate_stats_request = dp_flush_rate_stats_req, .txrx_flush_rate_stats_request = dp_flush_rate_stats_req,
.txrx_peer_get_rdkstats_ctx = dp_peer_get_rdkstats_ctx, .txrx_peer_get_peerstats_ctx = dp_peer_get_peerstats_ctx,
.set_pdev_pcp_tid_map = dp_set_pdev_pcp_tid_map_wifi3, .set_pdev_pcp_tid_map = dp_set_pdev_pcp_tid_map_wifi3,
.set_vdev_pcp_tid_map = dp_set_vdev_pcp_tid_map_wifi3, .set_vdev_pcp_tid_map = dp_set_vdev_pcp_tid_map_wifi3,

6
dp/wifi3.0/dp_tx.c
View File

@@ -4296,8 +4296,8 @@ static inline void dp_tx_sojourn_stats_process(struct dp_pdev *pdev,
link_peer_soc = primary_link_peer->vdev->pdev->soc; link_peer_soc = primary_link_peer->vdev->pdev->soc;
sojourn_stats->cookie = (void *) sojourn_stats->cookie = (void *)
dp_monitor_peer_get_rdkstats_ctx(link_peer_soc, dp_monitor_peer_get_peerstats_ctx(link_peer_soc,
primary_link_peer); primary_link_peer);
delta_ms = qdf_ktime_to_ms(qdf_ktime_real_get()) - delta_ms = qdf_ktime_to_ms(qdf_ktime_real_get()) -
txdesc_ts; txdesc_ts;
@@ -4706,7 +4706,7 @@ void dp_tx_comp_process_tx_status(struct dp_soc *soc,
ts, ts->tid); ts, ts->tid);
#ifdef QCA_SUPPORT_RDK_STATS #ifdef QCA_SUPPORT_RDK_STATS
if (soc->rdkstats_enabled) if (soc->peerstats_enabled)
dp_tx_sojourn_stats_process(vdev->pdev, txrx_peer, ts->tid, dp_tx_sojourn_stats_process(vdev->pdev, txrx_peer, ts->tid,
tx_desc->timestamp, tx_desc->timestamp,
ts->ppdu_id); ts->ppdu_id);

4
dp/wifi3.0/dp_tx.h
View File

@@ -1022,7 +1022,7 @@ bool dp_tx_desc_set_ktimestamp(struct dp_vdev *vdev,
if (qdf_unlikely(vdev->pdev->delay_stats_flag) || if (qdf_unlikely(vdev->pdev->delay_stats_flag) ||
qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_enabled) || qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_enabled) ||
qdf_unlikely(dp_tx_pkt_tracepoints_enabled()) || qdf_unlikely(dp_tx_pkt_tracepoints_enabled()) ||
qdf_unlikely(vdev->pdev->soc->rdkstats_enabled) || qdf_unlikely(vdev->pdev->soc->peerstats_enabled) ||
qdf_unlikely(dp_is_vdev_tx_delay_stats_enabled(vdev))) { qdf_unlikely(dp_is_vdev_tx_delay_stats_enabled(vdev))) {
tx_desc->timestamp = qdf_ktime_to_ms(qdf_ktime_real_get()); tx_desc->timestamp = qdf_ktime_to_ms(qdf_ktime_real_get());
return true; return true;
@@ -1037,7 +1037,7 @@ bool dp_tx_desc_set_ktimestamp(struct dp_vdev *vdev,
if (qdf_unlikely(vdev->pdev->delay_stats_flag) || if (qdf_unlikely(vdev->pdev->delay_stats_flag) ||
qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_enabled) || qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_enabled) ||
qdf_unlikely(dp_tx_pkt_tracepoints_enabled()) || qdf_unlikely(dp_tx_pkt_tracepoints_enabled()) ||
qdf_unlikely(vdev->pdev->soc->rdkstats_enabled)) { qdf_unlikely(vdev->pdev->soc->peerstats_enabled)) {
tx_desc->timestamp = qdf_ktime_to_ms(qdf_ktime_real_get()); tx_desc->timestamp = qdf_ktime_to_ms(qdf_ktime_real_get());
return true; return true;
} }

6
dp/wifi3.0/dp_types.h
View File

@@ -2213,10 +2213,10 @@ struct dp_soc {
uint8_t da_war_enabled; uint8_t da_war_enabled;
/* number of active ast entries */ /* number of active ast entries */
uint32_t num_ast_entries; uint32_t num_ast_entries;
/* rdk rate statistics context at soc level*/ /* peer extended rate statistics context at soc level*/
struct cdp_soc_rate_stats_ctx *rate_stats_ctx; struct cdp_soc_rate_stats_ctx *rate_stats_ctx;
/* rdk rate statistics control flag */ /* peer extended rate statistics control flag */
bool rdkstats_enabled; bool peerstats_enabled;
/* 8021p PCP-TID map values */ /* 8021p PCP-TID map values */
uint8_t pcp_tid_map[PCP_TID_MAP_MAX]; uint8_t pcp_tid_map[PCP_TID_MAP_MAX];

2
dp/wifi3.0/monitor/1.0/dp_mon_1.0.c
View File

@@ -1164,7 +1164,7 @@ struct dp_mon_ops monitor_ops_1_0 = {
.mon_vdev_detach = dp_mon_vdev_detach, .mon_vdev_detach = dp_mon_vdev_detach,
.mon_peer_attach = dp_mon_peer_attach, .mon_peer_attach = dp_mon_peer_attach,
.mon_peer_detach = dp_mon_peer_detach, .mon_peer_detach = dp_mon_peer_detach,
.mon_peer_get_rdkstats_ctx = dp_mon_peer_get_rdkstats_ctx, .mon_peer_get_peerstats_ctx = dp_mon_peer_get_peerstats_ctx,
.mon_peer_reset_stats = dp_mon_peer_reset_stats, .mon_peer_reset_stats = dp_mon_peer_reset_stats,
.mon_peer_get_stats = dp_mon_peer_get_stats, .mon_peer_get_stats = dp_mon_peer_get_stats,
.mon_invalid_peer_update_pdev_stats = .mon_invalid_peer_update_pdev_stats =

2
dp/wifi3.0/monitor/2.0/dp_mon_2.0.c
View File

@@ -1330,7 +1330,7 @@ struct dp_mon_ops monitor_ops_2_0 = {
.mon_vdev_detach = dp_mon_vdev_detach, .mon_vdev_detach = dp_mon_vdev_detach,
.mon_peer_attach = dp_mon_peer_attach, .mon_peer_attach = dp_mon_peer_attach,
.mon_peer_detach = dp_mon_peer_detach, .mon_peer_detach = dp_mon_peer_detach,
.mon_peer_get_rdkstats_ctx = dp_mon_peer_get_rdkstats_ctx, .mon_peer_get_peerstats_ctx = dp_mon_peer_get_peerstats_ctx,
.mon_peer_reset_stats = dp_mon_peer_reset_stats, .mon_peer_reset_stats = dp_mon_peer_reset_stats,
.mon_peer_get_stats = dp_mon_peer_get_stats, .mon_peer_get_stats = dp_mon_peer_get_stats,
.mon_invalid_peer_update_pdev_stats = .mon_invalid_peer_update_pdev_stats =

22
dp/wifi3.0/monitor/dp_mon.c
View File

@@ -5158,14 +5158,15 @@ void dp_mon_peer_attach_notify(struct dp_peer *peer)
(void *)&peer_cookie, (void *)&peer_cookie,
peer->peer_id, WDI_NO_VAL, pdev->pdev_id); peer->peer_id, WDI_NO_VAL, pdev->pdev_id);
if (soc->rdkstats_enabled) { if (soc->peerstats_enabled) {
if (!peer_cookie.ctx) { if (!peer_cookie.ctx) {
pdev->next_peer_cookie--; pdev->next_peer_cookie--;
qdf_err("Failed to initialize peer rate stats"); qdf_err("Failed to initialize peer rate stats");
mon_peer->rdkstats_ctx = NULL; mon_peer->peerstats_ctx = NULL;
} else { } else {
mon_peer->rdkstats_ctx = (struct cdp_peer_rate_stats_ctx *) mon_peer->peerstats_ctx =
peer_cookie.ctx; (struct cdp_peer_rate_stats_ctx *)
peer_cookie.ctx;
} }
} }
} }
@@ -5190,7 +5191,7 @@ void dp_mon_peer_detach_notify(struct dp_peer *peer)
qdf_mem_copy(peer_cookie.mac_addr, peer->mac_addr.raw, qdf_mem_copy(peer_cookie.mac_addr, peer->mac_addr.raw,
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
peer_cookie.ctx = NULL; peer_cookie.ctx = NULL;
peer_cookie.ctx = (struct cdp_stats_cookie *)mon_peer->rdkstats_ctx; peer_cookie.ctx = (struct cdp_stats_cookie *)mon_peer->peerstats_ctx;
dp_wdi_event_handler(WDI_EVENT_PEER_DESTROY, dp_wdi_event_handler(WDI_EVENT_PEER_DESTROY,
soc, soc,
@@ -5199,19 +5200,19 @@ void dp_mon_peer_detach_notify(struct dp_peer *peer)
WDI_NO_VAL, WDI_NO_VAL,
pdev->pdev_id); pdev->pdev_id);
mon_peer->rdkstats_ctx = NULL; mon_peer->peerstats_ctx = NULL;
} }
#else #else
static inline static inline
void dp_mon_peer_attach_notify(struct dp_peer *peer) void dp_mon_peer_attach_notify(struct dp_peer *peer)
{ {
peer->monitor_peer->rdkstats_ctx = NULL; peer->monitor_peer->peerstats_ctx = NULL;
} }
static inline static inline
void dp_mon_peer_detach_notify(struct dp_peer *peer) void dp_mon_peer_detach_notify(struct dp_peer *peer)
{ {
peer->monitor_peer->rdkstats_ctx = NULL; peer->monitor_peer->peerstats_ctx = NULL;
} }
#endif #endif
@@ -5275,12 +5276,13 @@ void dp_mon_register_intr_ops(struct dp_soc *soc)
} }
#endif #endif
struct cdp_peer_rate_stats_ctx *dp_mon_peer_get_rdkstats_ctx(struct dp_peer *peer) struct cdp_peer_rate_stats_ctx *dp_mon_peer_get_peerstats_ctx(struct
dp_peer *peer)
{ {
struct dp_mon_peer *mon_peer = peer->monitor_peer; struct dp_mon_peer *mon_peer = peer->monitor_peer;
if (mon_peer) if (mon_peer)
return mon_peer->rdkstats_ctx; return mon_peer->peerstats_ctx;
else else
return NULL; return NULL;
} }

24
dp/wifi3.0/monitor/dp_mon.h
View File

@@ -194,12 +194,13 @@ QDF_STATUS dp_mon_peer_attach(struct dp_peer *peer)
QDF_STATUS dp_mon_peer_detach(struct dp_peer *peer); QDF_STATUS dp_mon_peer_detach(struct dp_peer *peer);
/* /*
* dp_mon_peer_get_rdkstats_ctx() - Get rdk stats context from monitor peer * dp_mon_peer_get_peerstats_ctx() - Get peer stats context from monitor peer
* @peer: Datapath peer handle * @peer: Datapath peer handle
* *
* Return: rdkstats_ctx * Return: peerstats_ctx
*/ */
struct cdp_peer_rate_stats_ctx *dp_mon_peer_get_rdkstats_ctx(struct dp_peer *peer); struct cdp_peer_rate_stats_ctx *dp_mon_peer_get_peerstats_ctx(struct
dp_peer *peer);
#ifdef QCA_ENHANCED_STATS_SUPPORT #ifdef QCA_ENHANCED_STATS_SUPPORT
/* /*
@@ -545,7 +546,8 @@ struct dp_mon_ops {
QDF_STATUS (*mon_vdev_detach)(struct dp_vdev *vdev); QDF_STATUS (*mon_vdev_detach)(struct dp_vdev *vdev);
QDF_STATUS (*mon_peer_attach)(struct dp_peer *peer); QDF_STATUS (*mon_peer_attach)(struct dp_peer *peer);
QDF_STATUS (*mon_peer_detach)(struct dp_peer *peer); QDF_STATUS (*mon_peer_detach)(struct dp_peer *peer);
struct cdp_peer_rate_stats_ctx *(*mon_peer_get_rdkstats_ctx)(struct dp_peer *peer); struct cdp_peer_rate_stats_ctx *(*mon_peer_get_peerstats_ctx)(struct
dp_peer *peer);
void (*mon_peer_reset_stats)(struct dp_peer *peer); void (*mon_peer_reset_stats)(struct dp_peer *peer);
void (*mon_peer_get_stats)(struct dp_peer *peer, void *arg, void (*mon_peer_get_stats)(struct dp_peer *peer, void *arg,
enum cdp_stat_update_type type); enum cdp_stat_update_type type);
@@ -849,8 +851,8 @@ struct dp_mon_peer {
/* Monitor peer stats */ /* Monitor peer stats */
struct dp_mon_peer_stats stats; struct dp_mon_peer_stats stats;
/* rdk statistics context */ /* peer extended statistics context */
struct cdp_peer_rate_stats_ctx *rdkstats_ctx; struct cdp_peer_rate_stats_ctx *peerstats_ctx;
}; };
struct dp_mon_pdev { struct dp_mon_pdev {
@@ -1772,14 +1774,14 @@ static inline QDF_STATUS dp_monitor_peer_detach(struct dp_soc *soc,
} }
/* /*
* dp_monitor_peer_get_rdkstats_ctx() - Get RDK stats context from monitor peer * dp_monitor_peer_get_peerstats_ctx() - Get peerstats context from monitor peer
* @soc: Datapath soc handle * @soc: Datapath soc handle
* @peer: Datapath peer handle * @peer: Datapath peer handle
* *
* Return: RDK stats context * Return: peer stats context
*/ */
static inline struct cdp_peer_rate_stats_ctx* static inline struct cdp_peer_rate_stats_ctx*
dp_monitor_peer_get_rdkstats_ctx(struct dp_soc *soc, struct dp_peer *peer) dp_monitor_peer_get_peerstats_ctx(struct dp_soc *soc, struct dp_peer *peer)
{ {
struct dp_mon_ops *monitor_ops; struct dp_mon_ops *monitor_ops;
struct dp_mon_soc *mon_soc = soc->monitor_soc; struct dp_mon_soc *mon_soc = soc->monitor_soc;
@@ -1788,12 +1790,12 @@ dp_monitor_peer_get_rdkstats_ctx(struct dp_soc *soc, struct dp_peer *peer)
return NULL; return NULL;
monitor_ops = mon_soc->mon_ops; monitor_ops = mon_soc->mon_ops;
if (!monitor_ops || !monitor_ops->mon_peer_get_rdkstats_ctx) { if (!monitor_ops || !monitor_ops->mon_peer_get_peerstats_ctx) {
dp_mon_debug("callback not registered"); dp_mon_debug("callback not registered");
return NULL; return NULL;
} }
return monitor_ops->mon_peer_get_rdkstats_ctx(peer); return monitor_ops->mon_peer_get_peerstats_ctx(peer);
} }
/* /*