Commit e7938365 authored by Sunil Goutham's avatar Sunil Goutham Committed by David S. Miller
Browse files

octeontx2-pf: Fix algorithm index in MCAM rules with RSS action 



Otherthan setting action as RSS in NPC MCAM entry, RSS flowkey
algorithm index also needs to be set. Otherwise whatever algorithm
is defined at flowkey index '0' will be considered by HW and pkt
flows will be distributed as such.

Fix this by saving the flowkey index sent by admin function while
initializing RSS and then use it when framing MCAM rules.

Fixes: 81a43620 ("octeontx2-pf: Add RSS multi group support")
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05209e35

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c

+11 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ int otx2_config_pause_frm(struct otx2_nic *pfvf) 
int otx2_set_flowkey_cfg(struct otx2_nic *pfvf)

{

	struct otx2_rss_info *rss = &pfvf->hw.rss_info;

	struct nix_rss_flowkey_cfg_rsp *rsp;

	struct nix_rss_flowkey_cfg *req;

	int err;
@@ -283,6 +284,16 @@ int otx2_set_flowkey_cfg(struct otx2_nic *pfvf) 
	req->group = DEFAULT_RSS_CONTEXT_GROUP;



	err = otx2_sync_mbox_msg(&pfvf->mbox);

	if (err)

		goto fail;



	rsp = (struct nix_rss_flowkey_cfg_rsp *)

			otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);

	if (IS_ERR(rsp))

		goto fail;



	pfvf->hw.flowkey_alg_idx = rsp->alg_idx;

fail:

	mutex_unlock(&pfvf->mbox.lock);

	return err;

}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ struct otx2_hw { 
	u8			lso_udpv4_idx;

	u8			lso_udpv6_idx;



	/* RSS */

	u8			flowkey_alg_idx;



	/* MSI-X */

	u8			cint_cnt; /* CQ interrupt count */

	u16			npa_msixoff; /* Offset of NPA vectors */

drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c

+1 −0
Original line number Diff line number Diff line
@@ -907,6 +907,7 @@ static int otx2_add_flow_msg(struct otx2_nic *pfvf, struct otx2_flow *flow) 
		if (flow->flow_spec.flow_type & FLOW_RSS) {

			req->op = NIX_RX_ACTIONOP_RSS;

			req->index = flow->rss_ctx_id;

			req->flow_key_alg = pfvf->hw.flowkey_alg_idx;

		} else {

			req->op = NIX_RX_ACTIONOP_UCAST;

			req->index = ethtool_get_flow_spec_ring(ring_cookie);