[PATCH net-next,1/9] octeontx2-af: Fix interrupt name strings completely
flat view
STALE1366d
From: Srujana Challa <schalla@marvell.com>
Date: 2023-01-09 07:36:29
Subsystem:
marvell octeontx2 rvu admin function driver, networking drivers, the rest · Maintainers:
Sunil Goutham, Ratheesh Kannoth, Geetha sowjanya, Subbaraya Sundeep, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v1 of 7 in this series.
Revisions (7)
From: Dave Kleikamp <redacted>
The earlier commit: ("octeontx2-af: Fix interrupt name strings") fixed
one instance of a stack address being saved as if it were static.
This patch fixes another instance.
Signed-off-by: Henry Willard <redacted>
Signed-off-by: Dave Kleikamp <redacted>
---
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
index 38bbae5d9ae0..33979adb7d02 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c@@ -209,7 +209,6 @@ static int cpt_register_interrupts(struct rvu *rvu, int blkaddr) struct rvu_hwinfo *hw = rvu->hw; struct rvu_block *block; int i, offs, ret = 0; - char irq_name[16]; if (!is_block_implemented(rvu->hw, blkaddr)) return 0;
@@ -226,10 +225,10 @@ static int cpt_register_interrupts(struct rvu *rvu, int blkaddr) return cpt_10k_register_interrupts(block, offs); for (i = CPT_AF_INT_VEC_FLT0; i < CPT_AF_INT_VEC_RVU; i++) { - snprintf(irq_name, sizeof(irq_name), "CPTAF FLT%d", i); + sprintf(&rvu->irq_name[(offs + i) * NAME_SIZE], "CPTAF FLT%d", i); ret = rvu_cpt_do_register_interrupt(block, offs + i, rvu_cpt_af_flt_intr_handler, - irq_name); + &rvu->irq_name[(offs + i) * NAME_SIZE]); if (ret) goto err; rvu_write64(rvu, blkaddr, CPT_AF_FLTX_INT_ENA_W1S(i), 0x1);
--
2.25.1