Skip to content

L
linux
Commit b0f60fab authored by Srujana Challa's avatar Srujana Challa Committed by Jakub Kicinski
Browse files
Options

octeontx2-af: Add support for CPT1 in debugfs 

Adds support to display block CPT1 stats at
"/sys/kernel/debug/octeontx2/cpt1".
Signed-off-by: default avatarMahipal Challa <mchalla@marvell.com>
Signed-off-by: default avatarSrujana Challa <schalla@marvell.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent de2854c8
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 44 deletions
drivers/net/ethernet/marvell/octeontx2/af/rvu.h
View file @ b0f60fab
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#define NAME_SIZE 32 #define NAME_SIZE 32
#define MAX_NIX_BLKS 2 #define MAX_NIX_BLKS 2
#define MAX_CPT_BLKS 2
/* PF_FUNC */ /* PF_FUNC */
#define RVU_PFVF_PF_SHIFT 10 #define RVU_PFVF_PF_SHIFT 10
...@@ -47,6 +48,11 @@ struct dump_ctx { ...@@ -47,6 +48,11 @@ struct dump_ctx {
bool all; bool all;
}; };
struct cpt_ctx {
int blkaddr;
struct rvu *rvu;
};
struct rvu_debugfs { struct rvu_debugfs {
struct dentry *root; struct dentry *root;
struct dentry *cgx_root; struct dentry *cgx_root;
...@@ -61,6 +67,7 @@ struct rvu_debugfs { ...@@ -61,6 +67,7 @@ struct rvu_debugfs {
struct dump_ctx nix_cq_ctx; struct dump_ctx nix_cq_ctx;
struct dump_ctx nix_rq_ctx; struct dump_ctx nix_rq_ctx;
struct dump_ctx nix_sq_ctx; struct dump_ctx nix_sq_ctx;
struct cpt_ctx cpt_ctx[MAX_CPT_BLKS];
int npa_qsize_id; int npa_qsize_id;
int nix_qsize_id; int nix_qsize_id;
}; };
......
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
View file @ b0f60fab
...@@ -1904,20 +1904,16 @@ static void rvu_dbg_npc_init(struct rvu *rvu) ...@@ -1904,20 +1904,16 @@ static void rvu_dbg_npc_init(struct rvu *rvu)
&rvu_dbg_npc_rx_miss_act_fops); &rvu_dbg_npc_rx_miss_act_fops);
} }
/* CPT debugfs APIs */
static int cpt_eng_sts_display(struct seq_file *filp, u8 eng_type) static int cpt_eng_sts_display(struct seq_file *filp, u8 eng_type)
{ {
struct rvu *rvu = filp->private; struct cpt_ctx *ctx = filp->private;
u64 busy_sts = 0, free_sts = 0; u64 busy_sts = 0, free_sts = 0;
u32 e_min = 0, e_max = 0, e, i; u32 e_min = 0, e_max = 0, e, i;
u16 max_ses, max_ies, max_aes; u16 max_ses, max_ies, max_aes;
int blkaddr; struct rvu *rvu = ctx->rvu;
int blkaddr = ctx->blkaddr;
u64 reg; u64 reg;
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
if (blkaddr < 0)
return -ENODEV;
reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1); reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
max_ses = reg & 0xffff; max_ses = reg & 0xffff;
max_ies = (reg >> 16) & 0xffff; max_ies = (reg >> 16) & 0xffff;
...@@ -1977,16 +1973,13 @@ RVU_DEBUG_SEQ_FOPS(cpt_ie_sts, cpt_ie_sts_display, NULL); ...@@ -1977,16 +1973,13 @@ RVU_DEBUG_SEQ_FOPS(cpt_ie_sts, cpt_ie_sts_display, NULL);
static int rvu_dbg_cpt_engines_info_display(struct seq_file *filp, void *unused) static int rvu_dbg_cpt_engines_info_display(struct seq_file *filp, void *unused)
{ {
struct rvu *rvu = filp->private; struct cpt_ctx *ctx = filp->private;
u16 max_ses, max_ies, max_aes; u16 max_ses, max_ies, max_aes;
struct rvu *rvu = ctx->rvu;
int blkaddr = ctx->blkaddr;
u32 e_max, e; u32 e_max, e;
int blkaddr;
u64 reg; u64 reg;
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
if (blkaddr < 0)
return -ENODEV;
reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1); reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
max_ses = reg & 0xffff; max_ses = reg & 0xffff;
max_ies = (reg >> 16) & 0xffff; max_ies = (reg >> 16) & 0xffff;
...@@ -2014,17 +2007,15 @@ RVU_DEBUG_SEQ_FOPS(cpt_engines_info, cpt_engines_info_display, NULL); ...@@ -2014,17 +2007,15 @@ RVU_DEBUG_SEQ_FOPS(cpt_engines_info, cpt_engines_info_display, NULL);
static int rvu_dbg_cpt_lfs_info_display(struct seq_file *filp, void *unused) static int rvu_dbg_cpt_lfs_info_display(struct seq_file *filp, void *unused)
{ {
struct rvu *rvu = filp->private; struct cpt_ctx *ctx = filp->private;
struct rvu_hwinfo *hw = rvu->hw; int blkaddr = ctx->blkaddr;
struct rvu *rvu = ctx->rvu;
struct rvu_block *block; struct rvu_block *block;
int blkaddr; struct rvu_hwinfo *hw;
u64 reg; u64 reg;
u32 lf; u32 lf;
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0); hw = rvu->hw;
if (blkaddr < 0)
return -ENODEV;
block = &hw->block[blkaddr]; block = &hw->block[blkaddr];
if (!block->lf.bmap) if (!block->lf.bmap)
return -ENODEV; return -ENODEV;
...@@ -2049,13 +2040,10 @@ RVU_DEBUG_SEQ_FOPS(cpt_lfs_info, cpt_lfs_info_display, NULL); ...@@ -2049,13 +2040,10 @@ RVU_DEBUG_SEQ_FOPS(cpt_lfs_info, cpt_lfs_info_display, NULL);
static int rvu_dbg_cpt_err_info_display(struct seq_file *filp, void *unused) static int rvu_dbg_cpt_err_info_display(struct seq_file *filp, void *unused)
{ {
struct rvu *rvu = filp->private; struct cpt_ctx *ctx = filp->private;
struct rvu *rvu = ctx->rvu;
int blkaddr = ctx->blkaddr;
u64 reg0, reg1; u64 reg0, reg1;
int blkaddr;
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
if (blkaddr < 0)
return -ENODEV;
reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0)); reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
reg1 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(1)); 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); ...@@ -2079,15 +2067,11 @@ RVU_DEBUG_SEQ_FOPS(cpt_err_info, cpt_err_info_display, NULL);
static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused) static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused)
{ {
struct rvu *rvu; struct cpt_ctx *ctx = filp->private;
int blkaddr; struct rvu *rvu = ctx->rvu;
int blkaddr = ctx->blkaddr;
u64 reg; u64 reg;
rvu = filp->private;
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
if (blkaddr < 0)
return -ENODEV;
reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_REQ_PC); reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_REQ_PC);
seq_printf(filp, "CPT instruction requests %llu\n", reg); seq_printf(filp, "CPT instruction requests %llu\n", reg);
reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_LATENCY_PC); 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) ...@@ -2108,26 +2092,39 @@ static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused)
RVU_DEBUG_SEQ_FOPS(cpt_pc, cpt_pc_display, NULL); RVU_DEBUG_SEQ_FOPS(cpt_pc, cpt_pc_display, NULL);
static void rvu_dbg_cpt_init(struct rvu *rvu) static void rvu_dbg_cpt_init(struct rvu *rvu, int blkaddr)
{ {
if (!is_block_implemented(rvu->hw, BLKADDR_CPT0)) struct cpt_ctx *ctx;
if (!is_block_implemented(rvu->hw, blkaddr))
return; return;
if (blkaddr == BLKADDR_CPT0) {
rvu->rvu_dbg.cpt = debugfs_create_dir("cpt", rvu->rvu_dbg.root); rvu->rvu_dbg.cpt = debugfs_create_dir("cpt", rvu->rvu_dbg.root);
ctx = &rvu->rvu_dbg.cpt_ctx[0];
ctx->blkaddr = BLKADDR_CPT0;
ctx->rvu = rvu;
} else {
rvu->rvu_dbg.cpt = debugfs_create_dir("cpt1",
rvu->rvu_dbg.root);
ctx = &rvu->rvu_dbg.cpt_ctx[1];
ctx->blkaddr = BLKADDR_CPT1;
ctx->rvu = rvu;
}
debugfs_create_file("cpt_pc", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_pc", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_pc_fops); &rvu_dbg_cpt_pc_fops);
debugfs_create_file("cpt_ae_sts", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_ae_sts", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_ae_sts_fops); &rvu_dbg_cpt_ae_sts_fops);
debugfs_create_file("cpt_se_sts", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_se_sts", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_se_sts_fops); &rvu_dbg_cpt_se_sts_fops);
debugfs_create_file("cpt_ie_sts", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_ie_sts", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_ie_sts_fops); &rvu_dbg_cpt_ie_sts_fops);
debugfs_create_file("cpt_engines_info", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_engines_info", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_engines_info_fops); &rvu_dbg_cpt_engines_info_fops);
debugfs_create_file("cpt_lfs_info", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_lfs_info", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_lfs_info_fops); &rvu_dbg_cpt_lfs_info_fops);
debugfs_create_file("cpt_err_info", 0600, rvu->rvu_dbg.cpt, rvu, debugfs_create_file("cpt_err_info", 0600, rvu->rvu_dbg.cpt, ctx,
&rvu_dbg_cpt_err_info_fops); &rvu_dbg_cpt_err_info_fops);
} }
...@@ -2146,7 +2143,8 @@ void rvu_dbg_init(struct rvu *rvu) ...@@ -2146,7 +2143,8 @@ void rvu_dbg_init(struct rvu *rvu)
rvu_dbg_nix_init(rvu, BLKADDR_NIX1); rvu_dbg_nix_init(rvu, BLKADDR_NIX1);
rvu_dbg_cgx_init(rvu); rvu_dbg_cgx_init(rvu);
rvu_dbg_npc_init(rvu); rvu_dbg_npc_init(rvu);
rvu_dbg_cpt_init(rvu); rvu_dbg_cpt_init(rvu, BLKADDR_CPT0);
rvu_dbg_cpt_init(rvu, BLKADDR_CPT1);
} }
void rvu_dbg_exit(struct rvu *rvu) void rvu_dbg_exit(struct rvu *rvu)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7