From: Satha Rao <skotesh...@marvell.com>
This patch set enables aging on CNF105 variant of CN10K platform.
Enables aging statistics while dumping/reset SQ statistics.
Signed-off-by: Satha Rao <skotesh...@marvell.com>
---
drivers/common/cnxk/roc_errata.h | 3 +--
drivers/common/cnxk/roc_nix_debug.c | 19 +++++++++----------
drivers/common/cnxk/roc_nix_stats.c | 2 ++
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/common/cnxk/roc_errata.h b/drivers/common/cnxk/roc_errata.h
index 8dc372f956..d3b32f1786 100644
--- a/drivers/common/cnxk/roc_errata.h
+++ b/drivers/common/cnxk/roc_errata.h
@@ -30,8 +30,7 @@ roc_errata_npa_has_no_fc_stype_ststp(void)
static inline bool
roc_errata_nix_has_no_drop_aging(void)
{
- return (roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0() ||
- roc_model_is_cnf10kb_a0());
+ return (roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0());
}
/* Errata IPBUNIXRX-40130 */
diff --git a/drivers/common/cnxk/roc_nix_debug.c
b/drivers/common/cnxk/roc_nix_debug.c
index efac7e5b14..bd7a5d3dc2 100644
--- a/drivers/common/cnxk/roc_nix_debug.c
+++ b/drivers/common/cnxk/roc_nix_debug.c
@@ -472,22 +472,21 @@ nix_lf_sq_dump(__io struct nix_cn10k_sq_ctx_s *ctx,
uint32_t *sqb_aura_p)
nix_dump("W7: smenq_next_sqb \t\t0x%" PRIx64 "", ctx->smenq_next_sqb);
nix_dump("W8: head_sqb \t\t\t0x%" PRIx64 "", ctx->head_sqb);
- nix_dump("W9: vfi_lso_vld \t\t%d\nW9: vfi_lso_vlan1_ins_ena\t%d",
- ctx->vfi_lso_vld, ctx->vfi_lso_vlan1_ins_ena);
+ nix_dump("W9: vfi_lso_vld \t\t%d\nW9: vfi_lso_vlan1_ins_ena\t%d",
ctx->vfi_lso_vld,
+ ctx->vfi_lso_vlan1_ins_ena);
nix_dump("W9: vfi_lso_vlan0_ins_ena\t%d\nW9: vfi_lso_mps\t\t\t%d",
ctx->vfi_lso_vlan0_ins_ena, ctx->vfi_lso_mps);
- nix_dump("W9: vfi_lso_sb \t\t\t%d\nW9: vfi_lso_sizem1\t\t%d",
- ctx->vfi_lso_sb, ctx->vfi_lso_sizem1);
+ nix_dump("W9: vfi_lso_sb \t\t\t%d\nW9: vfi_lso_sizem1\t\t%d",
ctx->vfi_lso_sb,
+ ctx->vfi_lso_sizem1);
nix_dump("W9: vfi_lso_total\t\t%d", ctx->vfi_lso_total);
- nix_dump("W10: scm_lso_rem \t\t0x%" PRIx64 "",
- (uint64_t)ctx->scm_lso_rem);
+ nix_dump("W10: scm_lso_rem \t\t0x%" PRIx64 "",
(uint64_t)ctx->scm_lso_rem);
nix_dump("W11: octs \t\t\t0x%" PRIx64 "", (uint64_t)ctx->octs);
nix_dump("W12: pkts \t\t\t0x%" PRIx64 "", (uint64_t)ctx->pkts);
- nix_dump("W14: dropped_octs \t\t0x%" PRIx64 "",
- (uint64_t)ctx->drop_octs);
- nix_dump("W15: dropped_pkts \t\t0x%" PRIx64 "",
- (uint64_t)ctx->drop_pkts);
+ nix_dump("W13: aged_drop_pkts \t\t\t0x%" PRIx64 "",
(uint64_t)ctx->aged_drop_pkts);
+ nix_dump("W13: aged_drop_octs \t\t\t0x%" PRIx64 "",
(uint64_t)ctx->aged_drop_octs);
+ nix_dump("W14: dropped_octs \t\t0x%" PRIx64 "",
(uint64_t)ctx->drop_octs);
+ nix_dump("W15: dropped_pkts \t\t0x%" PRIx64 "",
(uint64_t)ctx->drop_pkts);
*sqb_aura_p = ctx->sqb_aura;
}
diff --git a/drivers/common/cnxk/roc_nix_stats.c
b/drivers/common/cnxk/roc_nix_stats.c
index 8fd5c711c3..2e5071e1bb 100644
--- a/drivers/common/cnxk/roc_nix_stats.c
+++ b/drivers/common/cnxk/roc_nix_stats.c
@@ -238,6 +238,8 @@ nix_stat_tx_queue_reset(struct nix *nix, uint16_t qid)
aq->sq_mask.pkts = ~(aq->sq_mask.pkts);
aq->sq_mask.drop_octs = ~(aq->sq_mask.drop_octs);
aq->sq_mask.drop_pkts = ~(aq->sq_mask.drop_pkts);
+ aq->sq_mask.aged_drop_octs = ~(aq->sq_mask.aged_drop_octs);
+ aq->sq_mask.aged_drop_pkts = ~(aq->sq_mask.aged_drop_pkts);
}
rc = mbox_process(mbox);
--
2.25.1
