| From 078d6b86cbca959c064bed161ee13bc667a43599 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 30 Aug 2021 23:30:45 +0530 |
| Subject: octeontx2-af: Fix static code analyzer reported issues |
| |
| From: Subbaraya Sundeep <sbhatta@marvell.com> |
| |
| [ Upstream commit 698a82ebfb4b2f2014baf31b7324b328a2a6366e ] |
| |
| This patch fixes the static code analyzer reported issues |
| in rvu_npc.c. The reported errors are different sizes of |
| operands in bitops and returning uninitialized values. |
| |
| Fixes: 651cd2652339 ("octeontx2-af: MCAM entry installation support") |
| Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com> |
| Signed-off-by: Sunil Goutham <sgoutham@marvell.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c |
| index 0122310ee3a7..0a9ff2e0c9bb 100644 |
| --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c |
| +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c |
| @@ -23,7 +23,7 @@ |
| #define RSVD_MCAM_ENTRIES_PER_NIXLF 1 /* Ucast for LFs */ |
| |
| #define NPC_PARSE_RESULT_DMAC_OFFSET 8 |
| -#define NPC_HW_TSTAMP_OFFSET 8 |
| +#define NPC_HW_TSTAMP_OFFSET 8ULL |
| #define NPC_KEX_CHAN_MASK 0xFFFULL |
| #define NPC_KEX_PF_FUNC_MASK 0xFFFFULL |
| |
| @@ -2166,7 +2166,7 @@ static void npc_unmap_mcam_entry_and_cntr(struct rvu *rvu, |
| int blkaddr, u16 entry, u16 cntr) |
| { |
| u16 index = entry & (mcam->banksize - 1); |
| - u16 bank = npc_get_bank(mcam, entry); |
| + u32 bank = npc_get_bank(mcam, entry); |
| |
| /* Remove mapping and reduce counter's refcnt */ |
| mcam->entry2cntr_map[entry] = NPC_MCAM_INVALID_MAP; |
| @@ -2788,8 +2788,8 @@ int rvu_mbox_handler_npc_mcam_shift_entry(struct rvu *rvu, |
| struct npc_mcam *mcam = &rvu->hw->mcam; |
| u16 pcifunc = req->hdr.pcifunc; |
| u16 old_entry, new_entry; |
| + int blkaddr, rc = 0; |
| u16 index, cntr; |
| - int blkaddr, rc; |
| |
| blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0); |
| if (blkaddr < 0) |
| -- |
| 2.30.2 |
| |