From: Jerin Jacob <jerinjacobk@gmail.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: sgoutham@marvell.com, lcherian@marvell.com, gakula@marvell.com,
jerinj@marvell.com
Subject: [PATCH v1 net-next 01/14] octeontx2-af: Skip NIXLF check for bcast MCE entry
Date: Sat, 1 Dec 2018 14:43:50 +0530 [thread overview]
Message-ID: <20181201091403.30166-2-jerinjacobk@gmail.com> (raw)
In-Reply-To: <20181201091403.30166-1-jerinjacobk@gmail.com>
From: Sunil Goutham <sgoutham@marvell.com>
At the time of initial broadcast packet replication table init,
NIXLFs are not yet attached to PF_FUNCs. Hence skipped checking
NIXLF while submitting MCE entry init instruction to NIX admin queue.
Also did a minor cleanup while installing bcast match entry in
packet parser unit i.e NPC.
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
.../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 14 +++++++++-----
.../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 962a82f7d141..183331448cf0 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -431,9 +431,8 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req,
bool ena;
u64 cfg;
- pfvf = rvu_get_pfvf(rvu, pcifunc);
blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NIX, pcifunc);
- if (!pfvf->nixlf || blkaddr < 0)
+ if (blkaddr < 0)
return NIX_AF_ERR_AF_LF_INVALID;
block = &hw->block[blkaddr];
@@ -443,9 +442,14 @@ static int rvu_nix_aq_enq_inst(struct rvu *rvu, struct nix_aq_enq_req *req,
return NIX_AF_ERR_AQ_ENQUEUE;
}
+ pfvf = rvu_get_pfvf(rvu, pcifunc);
nixlf = rvu_get_lf(rvu, block, pcifunc, 0);
- if (nixlf < 0)
- return NIX_AF_ERR_AF_LF_INVALID;
+
+ /* Skip NIXLF check for broadcast MCE entry init */
+ if (!(!rsp && req->ctype == NIX_AQ_CTYPE_MCE)) {
+ if (!pfvf->nixlf || nixlf < 0)
+ return NIX_AF_ERR_AF_LF_INVALID;
+ }
switch (req->ctype) {
case NIX_AQ_CTYPE_RQ:
@@ -1295,7 +1299,7 @@ static int nix_setup_mce(struct rvu *rvu, int mce, u8 op,
struct nix_aq_enq_req aq_req;
int err;
- aq_req.hdr.pcifunc = pcifunc;
+ aq_req.hdr.pcifunc = 0;
aq_req.ctype = NIX_AQ_CTYPE_MCE;
aq_req.op = op;
aq_req.qidx = mce;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index 6ea2b0e2df42..ee2600d93d54 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -476,7 +476,7 @@ void rvu_npc_install_bcast_match_entry(struct rvu *rvu, u16 pcifunc,
*
*/
entry.kw[0] = BIT_ULL(13) | chan;
- entry.kw_mask[0] = ~entry.kw[0] & (BIT_ULL(13) | 0xFFFULL);
+ entry.kw_mask[0] = BIT_ULL(13) | 0xFFFULL;
*(u64 *)&action = 0x00;
#ifdef MCAST_MCE
--
2.19.2
next prev parent reply other threads:[~2018-12-01 20:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-01 9:13 [PATCH v1 net-next 00/14] octeontx2-af: NIX and NPC enhancements Jerin Jacob
2018-12-01 9:13 ` Jerin Jacob [this message]
2018-12-01 9:13 ` [PATCH v1 net-next 02/14] octeontx2-af: Add response for RSS flow key cfg message Jerin Jacob
2018-12-02 1:30 ` David Miller
2018-12-01 9:13 ` [PATCH v1 net-next 03/14] octeontx2-af: Add support for dynamic flow cfg to RSS field generation Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 04/14] octeontx2-af: Add support for runtime RSS algo index reservation Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 05/14] octeontx2-af: Restrict TL1 allocation and configuration Jerin Jacob
2018-12-02 1:31 ` David Miller
2018-12-01 9:13 ` [PATCH v1 net-next 06/14] octeontx2-af: Allow freeing single TLx Tx schedule queue Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 07/14] octeontx2-af: Enable inner IPv4 checksum and its error code Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 08/14] octeontx2-af: Define all NIX_AF_RX_DEF_* registers Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 09/14] octeontx2-af: Enable RSS with promiscuous mode Jerin Jacob
2018-12-01 9:13 ` [PATCH v1 net-next 10/14] octeontx2-af: Add support for Tx packet marking Jerin Jacob
2018-12-01 9:14 ` [PATCH v1 net-next 11/14] octeontx2-af: Configure VLAN TPIDs Jerin Jacob
2018-12-01 9:14 ` [PATCH v1 net-next 12/14] octeontx2-af: Add L3 and L4 packet verification mailbox Jerin Jacob
2018-12-01 9:14 ` [PATCH v1 net-next 13/14] octeontx2-af: Add LSO format configuration mailbox Jerin Jacob
2018-12-01 9:14 ` [PATCH v1 net-next 14/14] octeontx2-af: Enable mkex profile Jerin Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181201091403.30166-2-jerinjacobk@gmail.com \
--to=jerinjacobk@gmail.com \
--cc=davem@davemloft.net \
--cc=gakula@marvell.com \
--cc=jerinj@marvell.com \
--cc=lcherian@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=sgoutham@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).