From 6064df846728b578f8e56a0065832c95db2e09ae Mon Sep 17 00:00:00 2001 From: Neha Bisht Date: Mon, 14 Mar 2022 10:58:00 +0530 Subject: [PATCH] qcacmn: Update code with peer_extended_stats instead of rdk_stats 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 --- dp/inc/cdp_txrx_cmn.h | 14 +++++++------- dp/inc/cdp_txrx_ops.h | 6 +++--- dp/wifi3.0/dp_internal.h | 2 +- dp/wifi3.0/dp_main.c | 20 ++++++++++---------- dp/wifi3.0/dp_tx.c | 6 +++--- dp/wifi3.0/dp_tx.h | 4 ++-- dp/wifi3.0/dp_types.h | 6 +++--- dp/wifi3.0/monitor/1.0/dp_mon_1.0.c | 2 +- dp/wifi3.0/monitor/2.0/dp_mon_2.0.c | 2 +- dp/wifi3.0/monitor/dp_mon.c | 22 ++++++++++++---------- dp/wifi3.0/monitor/dp_mon.h | 24 +++++++++++++----------- 11 files changed, 56 insertions(+), 52 deletions(-) diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h index ef07fedae3..08e90f4b54 100644 --- a/dp/inc/cdp_txrx_cmn.h +++ b/dp/inc/cdp_txrx_cmn.h @@ -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 * @vdev_id: id of vdev handle * @mac: peer mac address */ static inline void -*cdp_peer_get_rdkstats_ctx(ol_txrx_soc_handle soc, uint8_t vdev_id, - uint8_t *mac_addr) +*cdp_peer_get_peerstats_ctx(ol_txrx_soc_handle soc, uint8_t vdev_id, + uint8_t *mac_addr) { if (!soc || !soc->ops) { dp_cdp_debug("Invalid Instance:"); @@ -2451,12 +2451,12 @@ static inline void } 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 soc->ops->cmn_drv_ops->txrx_peer_get_rdkstats_ctx(soc, - vdev_id, - mac_addr); + return soc->ops->cmn_drv_ops->txrx_peer_get_peerstats_ctx(soc, + vdev_id, + mac_addr); } /** diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h index 3d7e11d218..227b2d058c 100644 --- a/dp/inc/cdp_txrx_ops.h +++ b/dp/inc/cdp_txrx_ops.h @@ -566,9 +566,9 @@ struct cdp_cmn_ops { QDF_STATUS (*txrx_peer_flush_rate_stats)(struct cdp_soc_t *soc, uint8_t pdev_id, void *buf); - void* (*txrx_peer_get_rdkstats_ctx)(struct cdp_soc_t *soc, - uint8_t vdev_id, - uint8_t *mac_addr); + void* (*txrx_peer_get_peerstats_ctx)(struct cdp_soc_t *soc, + uint8_t vdev_id, + uint8_t *mac_addr); QDF_STATUS (*txrx_flush_rate_stats_request)(struct cdp_soc_t *soc, uint8_t pdev_id); diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h index 83d57ed90d..bb1bc16c4d 100644 --- a/dp/wifi3.0/dp_internal.h +++ b/dp/wifi3.0/dp_internal.h @@ -233,7 +233,7 @@ static inline QDF_STATUS dp_monitor_peer_detach(struct dp_soc *soc, } 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; } diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index f503a097f0..44d2d700aa 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -10248,7 +10248,7 @@ dp_set_psoc_param(struct cdp_soc_t *cdp_soc, switch (param) { 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; case CDP_SET_NSS_CFG: 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( 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, WDI_NO_VAL, peer->vdev->pdev->pdev_id); } @@ -12057,13 +12057,13 @@ dp_flush_rate_stats_req(struct cdp_soc_t *soc_hdl, } #endif -static void *dp_peer_get_rdkstats_ctx(struct cdp_soc_t *soc_hdl, - uint8_t vdev_id, - uint8_t *mac_addr) +static void *dp_peer_get_peerstats_ctx(struct cdp_soc_t *soc_hdl, + uint8_t vdev_id, + uint8_t *mac_addr) { struct dp_soc *soc = (struct dp_soc *)soc_hdl; struct dp_peer *peer; - void *rdkstats_ctx = NULL; + void *peerstats_ctx = NULL; if (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; if (!IS_MLO_DP_MLD_PEER(peer)) - rdkstats_ctx = dp_monitor_peer_get_rdkstats_ctx(soc, - peer); + peerstats_ctx = dp_monitor_peer_get_peerstats_ctx(soc, + peer); dp_peer_unref_delete(peer, DP_MOD_ID_CDP); } - return rdkstats_ctx; + return peerstats_ctx; } #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, .txrx_peer_flush_rate_stats = dp_peer_flush_rate_stats, .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_vdev_pcp_tid_map = dp_set_vdev_pcp_tid_map_wifi3, diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 5f4f06e3bb..7ac1830b4f 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -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; sojourn_stats->cookie = (void *) - dp_monitor_peer_get_rdkstats_ctx(link_peer_soc, - primary_link_peer); + dp_monitor_peer_get_peerstats_ctx(link_peer_soc, + primary_link_peer); delta_ms = qdf_ktime_to_ms(qdf_ktime_real_get()) - txdesc_ts; @@ -4706,7 +4706,7 @@ void dp_tx_comp_process_tx_status(struct dp_soc *soc, ts, ts->tid); #ifdef QCA_SUPPORT_RDK_STATS - if (soc->rdkstats_enabled) + if (soc->peerstats_enabled) dp_tx_sojourn_stats_process(vdev->pdev, txrx_peer, ts->tid, tx_desc->timestamp, ts->ppdu_id); diff --git a/dp/wifi3.0/dp_tx.h b/dp/wifi3.0/dp_tx.h index aa30595bb1..937c62a2cb 100644 --- a/dp/wifi3.0/dp_tx.h +++ b/dp/wifi3.0/dp_tx.h @@ -1022,7 +1022,7 @@ bool dp_tx_desc_set_ktimestamp(struct dp_vdev *vdev, if (qdf_unlikely(vdev->pdev->delay_stats_flag) || qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_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))) { tx_desc->timestamp = qdf_ktime_to_ms(qdf_ktime_real_get()); return true; @@ -1037,7 +1037,7 @@ bool dp_tx_desc_set_ktimestamp(struct dp_vdev *vdev, if (qdf_unlikely(vdev->pdev->delay_stats_flag) || qdf_unlikely(vdev->pdev->soc->wlan_cfg_ctx->pext_stats_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()); return true; } diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h index 37b8dab5a2..99b86521a5 100644 --- a/dp/wifi3.0/dp_types.h +++ b/dp/wifi3.0/dp_types.h @@ -2213,10 +2213,10 @@ struct dp_soc { uint8_t da_war_enabled; /* number of active 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; - /* rdk rate statistics control flag */ - bool rdkstats_enabled; + /* peer extended rate statistics control flag */ + bool peerstats_enabled; /* 8021p PCP-TID map values */ uint8_t pcp_tid_map[PCP_TID_MAP_MAX]; diff --git a/dp/wifi3.0/monitor/1.0/dp_mon_1.0.c b/dp/wifi3.0/monitor/1.0/dp_mon_1.0.c index 35f66c5a8e..9e3689cfc6 100644 --- a/dp/wifi3.0/monitor/1.0/dp_mon_1.0.c +++ b/dp/wifi3.0/monitor/1.0/dp_mon_1.0.c @@ -1164,7 +1164,7 @@ struct dp_mon_ops monitor_ops_1_0 = { .mon_vdev_detach = dp_mon_vdev_detach, .mon_peer_attach = dp_mon_peer_attach, .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_get_stats = dp_mon_peer_get_stats, .mon_invalid_peer_update_pdev_stats = diff --git a/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c b/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c index 3476db3dcf..dc5e5adde9 100644 --- a/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c +++ b/dp/wifi3.0/monitor/2.0/dp_mon_2.0.c @@ -1330,7 +1330,7 @@ struct dp_mon_ops monitor_ops_2_0 = { .mon_vdev_detach = dp_mon_vdev_detach, .mon_peer_attach = dp_mon_peer_attach, .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_get_stats = dp_mon_peer_get_stats, .mon_invalid_peer_update_pdev_stats = diff --git a/dp/wifi3.0/monitor/dp_mon.c b/dp/wifi3.0/monitor/dp_mon.c index fd4f7da9f0..b5e4f988c5 100644 --- a/dp/wifi3.0/monitor/dp_mon.c +++ b/dp/wifi3.0/monitor/dp_mon.c @@ -5158,14 +5158,15 @@ void dp_mon_peer_attach_notify(struct dp_peer *peer) (void *)&peer_cookie, peer->peer_id, WDI_NO_VAL, pdev->pdev_id); - if (soc->rdkstats_enabled) { + if (soc->peerstats_enabled) { if (!peer_cookie.ctx) { pdev->next_peer_cookie--; qdf_err("Failed to initialize peer rate stats"); - mon_peer->rdkstats_ctx = NULL; + mon_peer->peerstats_ctx = NULL; } else { - mon_peer->rdkstats_ctx = (struct cdp_peer_rate_stats_ctx *) - peer_cookie.ctx; + mon_peer->peerstats_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_MAC_ADDR_SIZE); 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, soc, @@ -5199,19 +5200,19 @@ void dp_mon_peer_detach_notify(struct dp_peer *peer) WDI_NO_VAL, pdev->pdev_id); - mon_peer->rdkstats_ctx = NULL; + mon_peer->peerstats_ctx = NULL; } #else static inline void dp_mon_peer_attach_notify(struct dp_peer *peer) { - peer->monitor_peer->rdkstats_ctx = NULL; + peer->monitor_peer->peerstats_ctx = NULL; } static inline void dp_mon_peer_detach_notify(struct dp_peer *peer) { - peer->monitor_peer->rdkstats_ctx = NULL; + peer->monitor_peer->peerstats_ctx = NULL; } #endif @@ -5275,12 +5276,13 @@ void dp_mon_register_intr_ops(struct dp_soc *soc) } #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; if (mon_peer) - return mon_peer->rdkstats_ctx; + return mon_peer->peerstats_ctx; else return NULL; } diff --git a/dp/wifi3.0/monitor/dp_mon.h b/dp/wifi3.0/monitor/dp_mon.h index 7b4454db8a..5cb244bff6 100644 --- a/dp/wifi3.0/monitor/dp_mon.h +++ b/dp/wifi3.0/monitor/dp_mon.h @@ -194,12 +194,13 @@ QDF_STATUS dp_mon_peer_attach(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 * - * 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 /* @@ -545,7 +546,8 @@ struct dp_mon_ops { QDF_STATUS (*mon_vdev_detach)(struct dp_vdev *vdev); QDF_STATUS (*mon_peer_attach)(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_get_stats)(struct dp_peer *peer, void *arg, enum cdp_stat_update_type type); @@ -849,8 +851,8 @@ struct dp_mon_peer { /* Monitor peer stats */ struct dp_mon_peer_stats stats; - /* rdk statistics context */ - struct cdp_peer_rate_stats_ctx *rdkstats_ctx; + /* peer extended statistics context */ + struct cdp_peer_rate_stats_ctx *peerstats_ctx; }; 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 * @peer: Datapath peer handle * - * Return: RDK stats context + * Return: peer stats context */ 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_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; 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"); return NULL; } - return monitor_ops->mon_peer_get_rdkstats_ctx(peer); + return monitor_ops->mon_peer_get_peerstats_ctx(peer); } /*