d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common/cnxk: fix pointer argument with GCC 12

Browse Source 
The pointer passed to the rq_ctx and sq_ctx functions was the address
of qctx. Instead of that qctx should be passed. This patch fixes this.

This patch also resolves warning observed with gcc 12 compiler.

log:
   ../drivers/common/cnxk/cnxk_telemetry.h:12:38:
       warning: array subscript
   ‘struct nix_cn10k_sq_ctx_s[0]’ is partly outside array bounds of
   ‘volatile void[8]’ [-Warray-bounds]

Bugzilla ID: 853
Fixes: af75aac789 ("common/cnxk: support telemetry for NIX")
Cc: stable@dpdk.org

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Reviewed-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Reviewed-by: Jerin Jacob <jerinj@marvell.com>
This commit is contained in:
Ankur Dwivedi 2021-11-08 14:49:48 +05:30 committed by Jerin Jacob
parent f96789aeaf
commit 5050f441e3
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/common/cnxk/cnxk_telemetry_nix.c
View File

@ -266,9 +266,11 @@ cnxk_tel_nix_sq(struct roc_nix_sq *sq, struct plt_tel_data *d)
}
static void
nix_rq_ctx_cn9k(void *qctx, struct plt_tel_data *d)
nix_rq_ctx_cn9k(volatile void *qctx, struct plt_tel_data *d)
{
struct nix_rq_ctx_s *ctx = (struct nix_rq_ctx_s *)qctx;
volatile struct nix_rq_ctx_s *ctx;
ctx = (volatile struct nix_rq_ctx_s *)qctx;
/* W0 */
CNXK_TEL_DICT_INT(d, ctx, wqe_aura, w0_);
@ -343,9 +345,11 @@ nix_rq_ctx_cn9k(void *qctx, struct plt_tel_data *d)
}
static void
nix_rq_ctx(void *qctx, struct plt_tel_data *d)
nix_rq_ctx(volatile void *qctx, struct plt_tel_data *d)
{
struct nix_cn10k_rq_ctx_s *ctx = (struct nix_cn10k_rq_ctx_s *)qctx;
volatile struct nix_cn10k_rq_ctx_s *ctx;
ctx = (volatile struct nix_cn10k_rq_ctx_s *)qctx;
/* W0 */
CNXK_TEL_DICT_INT(d, ctx, wqe_aura, w0_);
@ -453,9 +457,9 @@ cnxk_tel_nix_rq_ctx(struct roc_nix *roc_nix, uint8_t n, struct plt_tel_data *d)
}
if (roc_model_is_cn9k())
nix_rq_ctx_cn9k(&qctx, d);
nix_rq_ctx_cn9k(qctx, d);
else
nix_rq_ctx(&qctx, d);
nix_rq_ctx(qctx, d);
return 0;
}
@ -512,9 +516,11 @@ cnxk_tel_nix_cq_ctx(struct roc_nix *roc_nix, uint8_t n, struct plt_tel_data *d)
}
static void
nix_sq_ctx_cn9k(void *qctx, struct plt_tel_data *d)
nix_sq_ctx_cn9k(volatile void *qctx, struct plt_tel_data *d)
{
struct nix_sq_ctx_s *ctx = (struct nix_sq_ctx_s *)qctx;
volatile struct nix_sq_ctx_s *ctx;
ctx = (volatile struct nix_sq_ctx_s *)qctx;
/* W0 */
CNXK_TEL_DICT_INT(d, ctx, sqe_way_mask, w0_);
@ -595,9 +601,11 @@ nix_sq_ctx_cn9k(void *qctx, struct plt_tel_data *d)
}
static void
nix_sq_ctx(void *qctx, struct plt_tel_data *d)
nix_sq_ctx(volatile void *qctx, struct plt_tel_data *d)
{
struct nix_cn10k_sq_ctx_s *ctx = (struct nix_cn10k_sq_ctx_s *)qctx;
volatile struct nix_cn10k_sq_ctx_s *ctx;
ctx = (volatile struct nix_cn10k_sq_ctx_s *)qctx;
/* W0 */
CNXK_TEL_DICT_INT(d, ctx, sqe_way_mask, w0_);
@ -698,9 +706,9 @@ cnxk_tel_nix_sq_ctx(struct roc_nix *roc_nix, uint8_t n, struct plt_tel_data *d)
}
if (roc_model_is_cn9k())
nix_sq_ctx_cn9k(&qctx, d);
nix_sq_ctx_cn9k(qctx, d);
else
nix_sq_ctx(&qctx, d);
nix_sq_ctx(qctx, d);
return 0;
}