Skip to content

Commit 6dc9a23

Browse files
sgoutham-marvellkuba-moo
authored andcommitted
octeontx2-af: Fix interrupt name strings
Fixed interrupt name string logic which currently results in wrong memory location being accessed while dumping /proc/interrupts. Fixes: 4826090 ("octeontx2-af: Enable CPT HW interrupts") Signed-off-by: Sunil Goutham <[email protected]> Signed-off-by: Subbaraya Sundeep <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent dc35616 commit 6dc9a23

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,13 @@ static int cpt_10k_register_interrupts(struct rvu_block *block, int off)
172172
{
173173
struct rvu *rvu = block->rvu;
174174
int blkaddr = block->addr;
175-
char irq_name[16];
176175
int i, ret;
177176

178177
for (i = CPT_10K_AF_INT_VEC_FLT0; i < CPT_10K_AF_INT_VEC_RVU; i++) {
179-
snprintf(irq_name, sizeof(irq_name), "CPTAF FLT%d", i);
178+
sprintf(&rvu->irq_name[(off + i) * NAME_SIZE], "CPTAF FLT%d", i);
180179
ret = rvu_cpt_do_register_interrupt(block, off + i,
181180
rvu_cpt_af_flt_intr_handler,
182-
irq_name);
181+
&rvu->irq_name[(off + i) * NAME_SIZE]);
183182
if (ret)
184183
goto err;
185184
rvu_write64(rvu, blkaddr, CPT_AF_FLTX_INT_ENA_W1S(i), 0x1);

drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static bool rvu_common_request_irq(struct rvu *rvu, int offset,
4141
struct rvu_devlink *rvu_dl = rvu->rvu_dl;
4242
int rc;
4343

44-
sprintf(&rvu->irq_name[offset * NAME_SIZE], name);
44+
sprintf(&rvu->irq_name[offset * NAME_SIZE], "%s", name);
4545
rc = request_irq(pci_irq_vector(rvu->pdev, offset), fn, 0,
4646
&rvu->irq_name[offset * NAME_SIZE], rvu_dl);
4747
if (rc)

0 commit comments

Comments
 (0)