Skip to content

Commit b0f60fa

Browse files
SruChallakuba-moo
SruChalla
authored and
kuba-moo
committed
octeontx2-af: Add support for CPT1 in debugfs
Adds support to display block CPT1 stats at "/sys/kernel/debug/octeontx2/cpt1". Signed-off-by: Mahipal Challa <[email protected]> Signed-off-by: Srujana Challa <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent de2854c commit b0f60fa

File tree

2 files changed

+49
-44
lines changed

2 files changed

+49
-44
lines changed

‎drivers/net/ethernet/marvell/octeontx2/af/rvu.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#define NAME_SIZE 32
3535
#define MAX_NIX_BLKS 2
36+
#define MAX_CPT_BLKS 2
3637

3738
/* PF_FUNC */
3839
#define RVU_PFVF_PF_SHIFT 10
@@ -47,6 +48,11 @@ struct dump_ctx {
4748
bool all;
4849
};
4950

51+
struct cpt_ctx {
52+
int blkaddr;
53+
struct rvu *rvu;
54+
};
55+
5056
struct rvu_debugfs {
5157
struct dentry *root;
5258
struct dentry *cgx_root;
@@ -61,6 +67,7 @@ struct rvu_debugfs {
6167
struct dump_ctx nix_cq_ctx;
6268
struct dump_ctx nix_rq_ctx;
6369
struct dump_ctx nix_sq_ctx;
70+
struct cpt_ctx cpt_ctx[MAX_CPT_BLKS];
6471
int npa_qsize_id;
6572
int nix_qsize_id;
6673
};

‎drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1904,20 +1904,16 @@ static void rvu_dbg_npc_init(struct rvu *rvu)
19041904
&rvu_dbg_npc_rx_miss_act_fops);
19051905
}
19061906

1907-
/* CPT debugfs APIs */
19081907
static int cpt_eng_sts_display(struct seq_file *filp, u8 eng_type)
19091908
{
1910-
struct rvu *rvu = filp->private;
1909+
struct cpt_ctx *ctx = filp->private;
19111910
u64 busy_sts = 0, free_sts = 0;
19121911
u32 e_min = 0, e_max = 0, e, i;
19131912
u16 max_ses, max_ies, max_aes;
1914-
int blkaddr;
1913+
struct rvu *rvu = ctx->rvu;
1914+
int blkaddr = ctx->blkaddr;
19151915
u64 reg;
19161916

1917-
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
1918-
if (blkaddr < 0)
1919-
return -ENODEV;
1920-
19211917
reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
19221918
max_ses = reg & 0xffff;
19231919
max_ies = (reg >> 16) & 0xffff;
@@ -1977,16 +1973,13 @@ RVU_DEBUG_SEQ_FOPS(cpt_ie_sts, cpt_ie_sts_display, NULL);
19771973

19781974
static int rvu_dbg_cpt_engines_info_display(struct seq_file *filp, void *unused)
19791975
{
1980-
struct rvu *rvu = filp->private;
1976+
struct cpt_ctx *ctx = filp->private;
19811977
u16 max_ses, max_ies, max_aes;
1978+
struct rvu *rvu = ctx->rvu;
1979+
int blkaddr = ctx->blkaddr;
19821980
u32 e_max, e;
1983-
int blkaddr;
19841981
u64 reg;
19851982

1986-
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
1987-
if (blkaddr < 0)
1988-
return -ENODEV;
1989-
19901983
reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
19911984
max_ses = reg & 0xffff;
19921985
max_ies = (reg >> 16) & 0xffff;
@@ -2014,17 +2007,15 @@ RVU_DEBUG_SEQ_FOPS(cpt_engines_info, cpt_engines_info_display, NULL);
20142007

20152008
static int rvu_dbg_cpt_lfs_info_display(struct seq_file *filp, void *unused)
20162009
{
2017-
struct rvu *rvu = filp->private;
2018-
struct rvu_hwinfo *hw = rvu->hw;
2010+
struct cpt_ctx *ctx = filp->private;
2011+
int blkaddr = ctx->blkaddr;
2012+
struct rvu *rvu = ctx->rvu;
20192013
struct rvu_block *block;
2020-
int blkaddr;
2014+
struct rvu_hwinfo *hw;
20212015
u64 reg;
20222016
u32 lf;
20232017

2024-
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
2025-
if (blkaddr < 0)
2026-
return -ENODEV;
2027-
2018+
hw = rvu->hw;
20282019
block = &hw->block[blkaddr];
20292020
if (!block->lf.bmap)
20302021
return -ENODEV;
@@ -2049,13 +2040,10 @@ RVU_DEBUG_SEQ_FOPS(cpt_lfs_info, cpt_lfs_info_display, NULL);
20492040

20502041
static int rvu_dbg_cpt_err_info_display(struct seq_file *filp, void *unused)
20512042
{
2052-
struct rvu *rvu = filp->private;
2043+
struct cpt_ctx *ctx = filp->private;
2044+
struct rvu *rvu = ctx->rvu;
2045+
int blkaddr = ctx->blkaddr;
20532046
u64 reg0, reg1;
2054-
int blkaddr;
2055-
2056-
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
2057-
if (blkaddr < 0)
2058-
return -ENODEV;
20592047

20602048
reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
20612049
reg1 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(1));
@@ -2079,15 +2067,11 @@ RVU_DEBUG_SEQ_FOPS(cpt_err_info, cpt_err_info_display, NULL);
20792067

20802068
static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused)
20812069
{
2082-
struct rvu *rvu;
2083-
int blkaddr;
2070+
struct cpt_ctx *ctx = filp->private;
2071+
struct rvu *rvu = ctx->rvu;
2072+
int blkaddr = ctx->blkaddr;
20842073
u64 reg;
20852074

2086-
rvu = filp->private;
2087-
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
2088-
if (blkaddr < 0)
2089-
return -ENODEV;
2090-
20912075
reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_REQ_PC);
20922076
seq_printf(filp, "CPT instruction requests %llu\n", reg);
20932077
reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_LATENCY_PC);
@@ -2108,26 +2092,39 @@ static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused)
21082092

21092093
RVU_DEBUG_SEQ_FOPS(cpt_pc, cpt_pc_display, NULL);
21102094

2111-
static void rvu_dbg_cpt_init(struct rvu *rvu)
2095+
static void rvu_dbg_cpt_init(struct rvu *rvu, int blkaddr)
21122096
{
2113-
if (!is_block_implemented(rvu->hw, BLKADDR_CPT0))
2097+
struct cpt_ctx *ctx;
2098+
2099+
if (!is_block_implemented(rvu->hw, blkaddr))
21142100
return;
21152101

2116-
rvu->rvu_dbg.cpt = debugfs_create_dir("cpt", rvu->rvu_dbg.root);
2102+
if (blkaddr == BLKADDR_CPT0) {
2103+
rvu->rvu_dbg.cpt = debugfs_create_dir("cpt", rvu->rvu_dbg.root);
2104+
ctx = &rvu->rvu_dbg.cpt_ctx[0];
2105+
ctx->blkaddr = BLKADDR_CPT0;
2106+
ctx->rvu = rvu;
2107+
} else {
2108+
rvu->rvu_dbg.cpt = debugfs_create_dir("cpt1",
2109+
rvu->rvu_dbg.root);
2110+
ctx = &rvu->rvu_dbg.cpt_ctx[1];
2111+
ctx->blkaddr = BLKADDR_CPT1;
2112+
ctx->rvu = rvu;
2113+
}
21172114

2118-
debugfs_create_file("cpt_pc", 0600, rvu->rvu_dbg.cpt, rvu,
2115+
debugfs_create_file("cpt_pc", 0600, rvu->rvu_dbg.cpt, ctx,
21192116
&rvu_dbg_cpt_pc_fops);
2120-
debugfs_create_file("cpt_ae_sts", 0600, rvu->rvu_dbg.cpt, rvu,
2117+
debugfs_create_file("cpt_ae_sts", 0600, rvu->rvu_dbg.cpt, ctx,
21212118
&rvu_dbg_cpt_ae_sts_fops);
2122-
debugfs_create_file("cpt_se_sts", 0600, rvu->rvu_dbg.cpt, rvu,
2119+
debugfs_create_file("cpt_se_sts", 0600, rvu->rvu_dbg.cpt, ctx,
21232120
&rvu_dbg_cpt_se_sts_fops);
2124-
debugfs_create_file("cpt_ie_sts", 0600, rvu->rvu_dbg.cpt, rvu,
2121+
debugfs_create_file("cpt_ie_sts", 0600, rvu->rvu_dbg.cpt, ctx,
21252122
&rvu_dbg_cpt_ie_sts_fops);
2126-
debugfs_create_file("cpt_engines_info", 0600, rvu->rvu_dbg.cpt, rvu,
2123+
debugfs_create_file("cpt_engines_info", 0600, rvu->rvu_dbg.cpt, ctx,
21272124
&rvu_dbg_cpt_engines_info_fops);
2128-
debugfs_create_file("cpt_lfs_info", 0600, rvu->rvu_dbg.cpt, rvu,
2125+
debugfs_create_file("cpt_lfs_info", 0600, rvu->rvu_dbg.cpt, ctx,
21292126
&rvu_dbg_cpt_lfs_info_fops);
2130-
debugfs_create_file("cpt_err_info", 0600, rvu->rvu_dbg.cpt, rvu,
2127+
debugfs_create_file("cpt_err_info", 0600, rvu->rvu_dbg.cpt, ctx,
21312128
&rvu_dbg_cpt_err_info_fops);
21322129
}
21332130

@@ -2146,7 +2143,8 @@ void rvu_dbg_init(struct rvu *rvu)
21462143
rvu_dbg_nix_init(rvu, BLKADDR_NIX1);
21472144
rvu_dbg_cgx_init(rvu);
21482145
rvu_dbg_npc_init(rvu);
2149-
rvu_dbg_cpt_init(rvu);
2146+
rvu_dbg_cpt_init(rvu, BLKADDR_CPT0);
2147+
rvu_dbg_cpt_init(rvu, BLKADDR_CPT1);
21502148
}
21512149

21522150
void rvu_dbg_exit(struct rvu *rvu)

0 commit comments

Comments
 (0)