Commit 425652d4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeontx2-cpt-rss-cfg-fixes' into main 



Srujana Challa says:

====================
Fixes for CPT and RSS configuration

This series of patches fixes various issues related to CPT
configuration and RSS configuration.

v1->v2:
- Excluded the patch "octeontx2-af: reduce cpt flt interrupt vectors for
  cn10kb" to submit it to net-next.
- Addressed the review comments.

Kiran Kumar K (1):
  octeontx2-af: Fix issue with IPv6 ext match for RSS
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b9b59e2 60795bbf

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ struct cpt_lf_alloc_req_msg { 
	u16 nix_pf_func;

	u16 sso_pf_func;

	u16 eng_grpmsk;

	int blkaddr;

	u8 blkaddr;

	u8 ctx_ilen_valid : 1;

	u8 ctx_ilen : 7;

};

drivers/net/ethernet/marvell/octeontx2/af/npc.h

+6 −2
Original line number Diff line number Diff line
@@ -63,8 +63,13 @@ enum npc_kpu_lb_ltype { 
	NPC_LT_LB_CUSTOM1 = 0xF,

};



/* Don't modify ltypes up to IP6_EXT, otherwise length and checksum of IP

 * headers may not be checked correctly. IPv4 ltypes and IPv6 ltypes must

 * differ only at bit 0 so mask 0xE can be used to detect extended headers.

 */

enum npc_kpu_lc_ltype {

	NPC_LT_LC_IP = 1,

	NPC_LT_LC_PTP = 1,

	NPC_LT_LC_IP,

	NPC_LT_LC_IP_OPT,

	NPC_LT_LC_IP6,

	NPC_LT_LC_IP6_EXT,
@@ -72,7 +77,6 @@ enum npc_kpu_lc_ltype { 
	NPC_LT_LC_RARP,

	NPC_LT_LC_MPLS,

	NPC_LT_LC_NSH,

	NPC_LT_LC_PTP,

	NPC_LT_LC_FCOE,

	NPC_LT_LC_NGIO,

	NPC_LT_LC_CUSTOM0 = 0xE,

drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c

+16 −7
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ int rvu_mbox_handler_cpt_rd_wr_register(struct rvu *rvu, 
					struct cpt_rd_wr_reg_msg *req,

					struct cpt_rd_wr_reg_msg *rsp)

{

	int blkaddr;

	u64 offset = req->reg_offset;

	int blkaddr, lf;



	blkaddr = validate_and_get_cpt_blkaddr(req->blkaddr);

	if (blkaddr < 0)
@@ -707,17 +708,25 @@ int rvu_mbox_handler_cpt_rd_wr_register(struct rvu *rvu, 
	    !is_cpt_vf(rvu, req->hdr.pcifunc))

		return CPT_AF_ERR_ACCESS_DENIED;



	rsp->reg_offset = req->reg_offset;

	rsp->ret_val = req->ret_val;

	rsp->is_write = req->is_write;



	if (!is_valid_offset(rvu, req))

		return CPT_AF_ERR_ACCESS_DENIED;



	/* Translate local LF used by VFs to global CPT LF */

	lf = rvu_get_lf(rvu, &rvu->hw->block[blkaddr], req->hdr.pcifunc,

			(offset & 0xFFF) >> 3);



	/* Translate local LF's offset to global CPT LF's offset */

	offset &= 0xFF000;

	offset += lf << 3;



	rsp->reg_offset = offset;

	rsp->ret_val = req->ret_val;

	rsp->is_write = req->is_write;



	if (req->is_write)

		rvu_write64(rvu, blkaddr, req->reg_offset, req->val);

		rvu_write64(rvu, blkaddr, offset, req->val);

	else

		rsp->val = rvu_read64(rvu, blkaddr, req->reg_offset);

		rsp->val = rvu_read64(rvu, blkaddr, offset);



	return 0;

}

drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c

+8 −4
Original line number Diff line number Diff line
@@ -3864,6 +3864,11 @@ static int get_flowkey_alg_idx(struct nix_hw *nix_hw, u32 flow_cfg) 
	return -ERANGE;

}



/* Mask to match ipv6(NPC_LT_LC_IP6) and ipv6 ext(NPC_LT_LC_IP6_EXT) */

#define NPC_LT_LC_IP6_MATCH_MSK ((~(NPC_LT_LC_IP6 ^ NPC_LT_LC_IP6_EXT)) & 0xf)

/* Mask to match both ipv4(NPC_LT_LC_IP) and ipv4 ext(NPC_LT_LC_IP_OPT) */

#define NPC_LT_LC_IP_MATCH_MSK  ((~(NPC_LT_LC_IP ^ NPC_LT_LC_IP_OPT)) & 0xf)



static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg)

{

	int idx, nr_field, key_off, field_marker, keyoff_marker;
@@ -3933,7 +3938,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) 
			field->hdr_offset = 9; /* offset */

			field->bytesm1 = 0; /* 1 byte */

			field->ltype_match = NPC_LT_LC_IP;

			field->ltype_mask = 0xF;

			field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK;

			break;

		case NIX_FLOW_KEY_TYPE_IPV4:

		case NIX_FLOW_KEY_TYPE_INNR_IPV4:
@@ -3960,8 +3965,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) 
					field->bytesm1 = 3; /* DIP, 4 bytes */

				}

			}



			field->ltype_mask = 0xF; /* Match only IPv4 */

			field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK;

			keyoff_marker = false;

			break;

		case NIX_FLOW_KEY_TYPE_IPV6:
@@ -3990,7 +3994,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) 
					field->bytesm1 = 15; /* DIP,16 bytes */

				}

			}

			field->ltype_mask = 0xF; /* Match only IPv6 */

			field->ltype_mask = NPC_LT_LC_IP6_MATCH_MSK;

			break;

		case NIX_FLOW_KEY_TYPE_TCP:

		case NIX_FLOW_KEY_TYPE_UDP: