Commit 99ce286d authored by Horatiu Vultur's avatar Horatiu Vultur Committed by Jakub Kicinski
Browse files

net: lan966x: Add IS1 VCAP model 



Provide IS1 (ingress stage 1) VCAP model for lan966x.
This provides classification actions for lan966x.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent cc4342f6

drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.c

+1401 −1

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/microchip/vcap/vcap_ag_api.h

+160 −57
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
 * Microchip VCAP API

 */



/* This file is autogenerated by cml-utils 2023-02-10 11:15:56 +0100.

 * Commit ID: c30fb4bf0281cd4a7133bdab6682f9e43c872ada

/* This file is autogenerated by cml-utils 2023-02-16 11:41:14 +0100.

 * Commit ID: be85f176b3a151fa748dcaf97c8824a5c2e065f3

 */



#ifndef __VCAP_AG_API__
@@ -14,6 +14,7 @@ enum vcap_type { 
	VCAP_TYPE_ES0,

	VCAP_TYPE_ES2,

	VCAP_TYPE_IS0,

	VCAP_TYPE_IS1,

	VCAP_TYPE_IS2,

	VCAP_TYPE_MAX

};
@@ -21,7 +22,12 @@ enum vcap_type { 
/* Keyfieldset names with origin information */

enum vcap_keyfield_set {

	VCAP_KFS_NO_VALUE,          /* initial value */

	VCAP_KFS_5TUPLE_IP4,        /* lan966x is1 X2 */

	VCAP_KFS_5TUPLE_IP6,        /* lan966x is1 X4 */

	VCAP_KFS_7TUPLE,            /* lan966x is1 X4 */

	VCAP_KFS_ARP,               /* sparx5 is2 X6, sparx5 es2 X6, lan966x is2 X2 */

	VCAP_KFS_DBL_VID,           /* lan966x is1 X1 */

	VCAP_KFS_DMAC_VID,          /* lan966x is1 X1 */

	VCAP_KFS_ETAG,              /* sparx5 is0 X2 */

	VCAP_KFS_IP4_OTHER,         /* sparx5 is2 X6, sparx5 es2 X6, lan966x is2 X2 */

	VCAP_KFS_IP4_TCP_UDP,       /* sparx5 is2 X6, sparx5 es2 X6, lan966x is2 X2 */
@@ -36,10 +42,13 @@ enum vcap_keyfield_set { 
	VCAP_KFS_MAC_ETYPE,         /* sparx5 is2 X6, sparx5 es2 X6, lan966x is2 X2 */

	VCAP_KFS_MAC_LLC,           /* lan966x is2 X2 */

	VCAP_KFS_MAC_SNAP,          /* lan966x is2 X2 */

	VCAP_KFS_NORMAL,            /* lan966x is1 X2 */

	VCAP_KFS_NORMAL_5TUPLE_IP4,  /* sparx5 is0 X6 */

	VCAP_KFS_NORMAL_7TUPLE,     /* sparx5 is0 X12 */

	VCAP_KFS_NORMAL_IP6,        /* lan966x is1 X4 */

	VCAP_KFS_OAM,               /* lan966x is2 X2 */

	VCAP_KFS_PURE_5TUPLE_IP4,   /* sparx5 is0 X3 */

	VCAP_KFS_RT,                /* lan966x is1 X1 */

	VCAP_KFS_SMAC_SIP4,         /* lan966x is2 X1 */

	VCAP_KFS_SMAC_SIP6,         /* lan966x is2 X2 */

};
@@ -61,17 +70,20 @@ enum vcap_keyfield_set { 
 *   Used by 802.1BR Bridge Port Extension in an E-Tag

 * VCAP_KF_8021BR_IGR_ECID_EXT: W8, sparx5: is0

 *   Used by 802.1BR Bridge Port Extension in an E-Tag

 * VCAP_KF_8021Q_DEI0: W1, sparx5: is0

 * VCAP_KF_8021CB_R_TAGGED_IS: W1, lan966x: is1

 *   Set if frame contains an RTAG: IEEE 802.1CB (FRER Redundancy tag, Ethertype

 *   0xf1c1)

 * VCAP_KF_8021Q_DEI0: W1, sparx5: is0, lan966x: is1

 *   First DEI in multiple vlan tags (outer tag or default port tag)

 * VCAP_KF_8021Q_DEI1: W1, sparx5: is0

 * VCAP_KF_8021Q_DEI1: W1, sparx5: is0, lan966x: is1

 *   Second DEI in multiple vlan tags (inner tag)

 * VCAP_KF_8021Q_DEI2: W1, sparx5: is0

 *   Third DEI in multiple vlan tags (not always available)

 * VCAP_KF_8021Q_DEI_CLS: W1, sparx5: is2/es2, lan966x: is2

 *   Classified DEI

 * VCAP_KF_8021Q_PCP0: W3, sparx5: is0

 * VCAP_KF_8021Q_PCP0: W3, sparx5: is0, lan966x: is1

 *   First PCP in multiple vlan tags (outer tag or default port tag)

 * VCAP_KF_8021Q_PCP1: W3, sparx5: is0

 * VCAP_KF_8021Q_PCP1: W3, sparx5: is0, lan966x: is1

 *   Second PCP in multiple vlan tags (inner tag)

 * VCAP_KF_8021Q_PCP2: W3, sparx5: is0

 *   Third PCP in multiple vlan tags (not always available)
@@ -79,22 +91,24 @@ enum vcap_keyfield_set { 
 *   Classified PCP

 * VCAP_KF_8021Q_TPID: W3, sparx5: es0

 *   TPID for outer tag: 0: Customer TPID 1: Service TPID (88A8 or programmable)

 * VCAP_KF_8021Q_TPID0: W3, sparx5: is0

 * VCAP_KF_8021Q_TPID0: sparx5 is0 W3, lan966x is1 W1

 *   First TPIC in multiple vlan tags (outer tag or default port tag)

 * VCAP_KF_8021Q_TPID1: W3, sparx5: is0

 * VCAP_KF_8021Q_TPID1: sparx5 is0 W3, lan966x is1 W1

 *   Second TPID in multiple vlan tags (inner tag)

 * VCAP_KF_8021Q_TPID2: W3, sparx5: is0

 *   Third TPID in multiple vlan tags (not always available)

 * VCAP_KF_8021Q_VID0: W12, sparx5: is0

 * VCAP_KF_8021Q_VID0: W12, sparx5: is0, lan966x: is1

 *   First VID in multiple vlan tags (outer tag or default port tag)

 * VCAP_KF_8021Q_VID1: W12, sparx5: is0

 * VCAP_KF_8021Q_VID1: W12, sparx5: is0, lan966x: is1

 *   Second VID in multiple vlan tags (inner tag)

 * VCAP_KF_8021Q_VID2: W12, sparx5: is0

 *   Third VID in multiple vlan tags (not always available)

 * VCAP_KF_8021Q_VID_CLS: sparx5 is2 W13, sparx5 es0 W13, sparx5 es2 W13,

 *   lan966x is2 W12

 *   Classified VID

 * VCAP_KF_8021Q_VLAN_TAGGED_IS: W1, sparx5: is2/es2, lan966x: is2

 * VCAP_KF_8021Q_VLAN_DBL_TAGGED_IS: W1, lan966x: is1

 *   Set if frame has two or more Q-tags. Independent of port VLAN awareness

 * VCAP_KF_8021Q_VLAN_TAGGED_IS: W1, sparx5: is2/es2, lan966x: is1/is2

 *   Sparx5: Set if frame was received with a VLAN tag, LAN966x: Set if frame has

 *   one or more Q-tags. Independent of port VLAN awareness

 * VCAP_KF_8021Q_VLAN_TAGS: W3, sparx5: is0
@@ -120,9 +134,9 @@ enum vcap_keyfield_set { 
 *   Class of service

 * VCAP_KF_ES0_ISDX_KEY_ENA: W1, sparx5: es2

 *   The value taken from the IFH .FWD.ES0_ISDX_KEY_ENA

 * VCAP_KF_ETYPE: W16, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_ETYPE: W16, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Ethernet type

 * VCAP_KF_ETYPE_LEN_IS: W1, sparx5: is0/is2/es2

 * VCAP_KF_ETYPE_LEN_IS: W1, sparx5: is0/is2/es2, lan966x: is1

 *   Set if frame has EtherType >= 0x600

 * VCAP_KF_HOST_MATCH: W1, lan966x: is2

 *   The action from the SMAC_SIP4 or SMAC_SIP6 lookups. Used for IP source
@@ -134,11 +148,12 @@ enum vcap_keyfield_set { 
 *   CPU queue)

 * VCAP_KF_IF_EGR_PORT_NO: W7, sparx5: es0

 *   Egress port number

 * VCAP_KF_IF_IGR_PORT: sparx5 is0 W7, sparx5 es2 W9, lan966x is2 W4

 * VCAP_KF_IF_IGR_PORT: sparx5 is0 W7, sparx5 es2 W9, lan966x is1 W3, lan966x

 *   is2 W4

 *   Sparx5: Logical ingress port number retrieved from

 *   ANA_CL::PORT_ID_CFG.LPORT_NUM or ERLEG, LAN966x: ingress port nunmber

 * VCAP_KF_IF_IGR_PORT_MASK: sparx5 is0 W65, sparx5 is2 W32, sparx5 is2 W65,

 *   lan966x is2 W9

 *   lan966x is1 W9, lan966x is2 W9

 *   Ingress port mask, one bit per port/erleg

 * VCAP_KF_IF_IGR_PORT_MASK_L3: W1, sparx5: is2

 *   If set, IF_IGR_PORT_MASK, IF_IGR_PORT_MASK_RNG, and IF_IGR_PORT_MASK_SEL are
@@ -151,24 +166,26 @@ enum vcap_keyfield_set { 
 *   Mapping: 0: DEFAULT 1: LOOPBACK 2: MASQUERADE 3: CPU_VD

 * VCAP_KF_IF_IGR_PORT_SEL: W1, sparx5: es2

 *   Selector for IF_IGR_PORT: physical port number or ERLEG

 * VCAP_KF_IP4_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_IP4_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Set if frame has EtherType = 0x800 and IP version = 4

 * VCAP_KF_IP_MC_IS: W1, sparx5: is0

 * VCAP_KF_IP_MC_IS: W1, sparx5: is0, lan966x: is1

 *   Set if frame is IPv4 frame and frame's destination MAC address is an IPv4

 *   multicast address (0x01005E0 /25). Set if frame is IPv6 frame and frame's

 *   destination MAC address is an IPv6 multicast address (0x3333/16).

 * VCAP_KF_IP_PAYLOAD_5TUPLE: W32, sparx5: is0

 * VCAP_KF_IP_PAYLOAD_5TUPLE: W32, sparx5: is0, lan966x: is1

 *   Payload bytes after IP header

 * VCAP_KF_IP_SNAP_IS: W1, sparx5: is0

 * VCAP_KF_IP_PAYLOAD_S1_IP6: W112, lan966x: is1

 *   Payload after IPv6 header

 * VCAP_KF_IP_SNAP_IS: W1, sparx5: is0, lan966x: is1

 *   Set if frame is IPv4, IPv6, or SNAP frame

 * VCAP_KF_ISDX_CLS: W12, sparx5: is2/es0/es2

 *   Classified ISDX

 * VCAP_KF_ISDX_GT0_IS: W1, sparx5: is2/es0/es2, lan966x: is2

 *   Set if classified ISDX > 0

 * VCAP_KF_L2_BC_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L2_BC_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Set if frame's destination MAC address is the broadcast address

 *   (FF-FF-FF-FF-FF-FF).

 * VCAP_KF_L2_DMAC: W48, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L2_DMAC: W48, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Destination MAC address

 * VCAP_KF_L2_FRM_TYPE: W4, lan966x: is2

 *   Frame subtype for specific EtherTypes (MRP, DLR)
@@ -176,7 +193,9 @@ enum vcap_keyfield_set { 
 *   Set if the frame is allowed to be forwarded to front ports

 * VCAP_KF_L2_LLC: W40, lan966x: is2

 *   LLC header and data after up to two VLAN tags and the type/length field

 * VCAP_KF_L2_MC_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L2_MAC: W48, lan966x: is1

 *   MAC address (FIRST=1: SMAC, FIRST=0: DMAC)

 * VCAP_KF_L2_MC_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Set if frame's destination MAC address is a multicast address (bit 40 = 1).

 * VCAP_KF_L2_PAYLOAD0: W16, lan966x: is2

 *   Payload bytes 0-1 after the frame's EtherType
@@ -188,7 +207,7 @@ enum vcap_keyfield_set { 
 *   specifically for PTP frames.

 * VCAP_KF_L2_PAYLOAD_ETYPE: W64, sparx5: is2/es2

 *   Byte 0-7 of L2 payload after Type/Len field and overloading for OAM

 * VCAP_KF_L2_SMAC: W48, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L2_SMAC: W48, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Source MAC address

 * VCAP_KF_L2_SNAP: W40, lan966x: is2

 *   SNAP header after LLC header (AA-AA-03)
@@ -196,32 +215,38 @@ enum vcap_keyfield_set { 
 *   Set if Src IP matches Dst IP address

 * VCAP_KF_L3_DPL_CLS: W1, sparx5: es0/es2

 *   The frames drop precedence level

 * VCAP_KF_L3_DSCP: W6, sparx5: is0

 * VCAP_KF_L3_DSCP: W6, sparx5: is0, lan966x: is1

 *   Frame's DSCP value

 * VCAP_KF_L3_DST_IS: W1, sparx5: is2

 *   Set if lookup is done for egress router leg

 * VCAP_KF_L3_FRAGMENT: W1, lan966x: is2

 * VCAP_KF_L3_FRAGMENT: W1, lan966x: is1/is2

 *   Set if IPv4 frame is fragmented

 * VCAP_KF_L3_FRAGMENT_TYPE: W2, sparx5: is0/is2/es2

 *   L3 Fragmentation type (none, initial, suspicious, valid follow up)

 * VCAP_KF_L3_FRAG_INVLD_L4_LEN: W1, sparx5: is0/is2

 *   Set if frame's L4 length is less than ANA_CL:COMMON:CLM_FRAGMENT_CFG.L4_MIN_L

 *   EN

 * VCAP_KF_L3_FRAG_OFS_GT0: W1, lan966x: is2

 * VCAP_KF_L3_FRAG_OFS_GT0: W1, lan966x: is1/is2

 *   Set if IPv4 frame is fragmented and it is not the first fragment

 * VCAP_KF_L3_IP4_DIP: W32, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_IP4_DIP: W32, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Destination IPv4 Address

 * VCAP_KF_L3_IP4_SIP: W32, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_IP4_SIP: W32, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Source IPv4 Address

 * VCAP_KF_L3_IP6_DIP: W128, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_IP6_DIP: sparx5 is0 W128, sparx5 is2 W128, sparx5 es2 W128,

 *   lan966x is1 W64, lan966x is1 W128, lan966x is2 W128

 *   Sparx5: Full IPv6 DIP, LAN966x: Either Full IPv6 DIP or a subset depending on

 *   frame type

 * VCAP_KF_L3_IP6_SIP: W128, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_IP6_DIP_MSB: W16, lan966x: is1

 *   MS 16bits of IPv6 DIP

 * VCAP_KF_L3_IP6_SIP: sparx5 is0 W128, sparx5 is2 W128, sparx5 es2 W128,

 *   lan966x is1 W128, lan966x is1 W64, lan966x is2 W128

 *   Sparx5: Full IPv6 SIP, LAN966x: Either Full IPv6 SIP or a subset depending on

 *   frame type

 * VCAP_KF_L3_IP_PROTO: W8, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_IP6_SIP_MSB: W16, lan966x: is1

 *   MS 16bits of IPv6 DIP

 * VCAP_KF_L3_IP_PROTO: W8, sparx5: is0/is2/es2, lan966x: is1/is2

 *   IPv4 frames: IP protocol. IPv6 frames: Next header, same as for IPV4

 * VCAP_KF_L3_OPTIONS_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L3_OPTIONS_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Set if IPv4 frame contains options (IP len > 5)

 * VCAP_KF_L3_PAYLOAD: sparx5 is2 W96, sparx5 is2 W40, sparx5 es2 W96, sparx5

 *   es2 W40, lan966x is2 W56
@@ -254,7 +279,8 @@ enum vcap_keyfield_set { 
 * VCAP_KF_L4_PSH: W1, sparx5: is2/es2, lan966x: is2

 *   Sparx5: TCP flag PSH, LAN966x: TCP: TCP flag PSH. PTP over UDP: flagField bit

 *   1 (twoStepFlag)

 * VCAP_KF_L4_RNG: sparx5 is0 W8, sparx5 is2 W16, sparx5 es2 W16, lan966x is2 W8

 * VCAP_KF_L4_RNG: sparx5 is0 W8, sparx5 is2 W16, sparx5 es2 W16, lan966x is1

 *   W8, lan966x is2 W8

 *   Range checker bitmask (one for each range checker). Input into range checkers

 *   is taken from classified results (VID, DSCP) and frame (SPORT, DPORT, ETYPE,

 *   outer VID, inner VID)
@@ -264,7 +290,7 @@ enum vcap_keyfield_set { 
 * VCAP_KF_L4_SEQUENCE_EQ0_IS: W1, sparx5: is2/es2, lan966x: is2

 *   Set if TCP sequence number is 0, LAN966x: Overlayed with PTP over UDP:

 *   messageType bit 0

 * VCAP_KF_L4_SPORT: W16, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_L4_SPORT: W16, sparx5: is0/is2/es2, lan966x: is1/is2

 *   TCP/UDP source port

 * VCAP_KF_L4_SPORT_EQ_DPORT_IS: W1, sparx5: is2/es2, lan966x: is2

 *   Set if UDP or TCP source port equals UDP or TCP destination port
@@ -274,13 +300,16 @@ enum vcap_keyfield_set { 
 * VCAP_KF_L4_URG: W1, sparx5: is2/es2, lan966x: is2

 *   Sparx5: TCP flag URG, LAN966x: TCP: TCP flag URG. PTP over UDP: flagField bit

 *   7 (reserved)

 * VCAP_KF_LOOKUP_FIRST_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_LOOKUP_FIRST_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Selects between entries relevant for first and second lookup. Set for first

 *   lookup, cleared for second lookup.

 * VCAP_KF_LOOKUP_GEN_IDX: W12, sparx5: is0

 *   Generic index - for chaining CLM instances

 * VCAP_KF_LOOKUP_GEN_IDX_SEL: W2, sparx5: is0

 *   Select the mode of the Generic Index

 * VCAP_KF_LOOKUP_INDEX: W2, lan966x: is1

 *   0: First lookup, 1: Second lookup, 2: Third lookup, Similar to VCAP_KF_FIRST

 *   but with extra info

 * VCAP_KF_LOOKUP_PAG: W8, sparx5: is2, lan966x: is2

 *   Classified Policy Association Group: chains rules from IS1/CLM to IS2

 * VCAP_KF_MIRROR_PROBE: W2, sparx5: es2
@@ -303,14 +332,22 @@ enum vcap_keyfield_set { 
 *   Set if frame's EtherType = 0x8902

 * VCAP_KF_PROT_ACTIVE: W1, sparx5: es0/es2

 *   Protection is active

 * VCAP_KF_TCP_IS: W1, sparx5: is0/is2/es2, lan966x: is2

 * VCAP_KF_RT_FRMID: W32, lan966x: is1

 *   Profinet or OPC-UA FrameId

 * VCAP_KF_RT_TYPE: W2, lan966x: is1

 *   Encoding of frame's EtherType: 0: Other, 1: Profinet, 2: OPC-UA, 3: Custom

 *   (ANA::RT_CUSTOM)

 * VCAP_KF_RT_VLAN_IDX: W3, lan966x: is1

 *   Real-time VLAN index from ANA::RT_VLAN_PCP

 * VCAP_KF_TCP_IS: W1, sparx5: is0/is2/es2, lan966x: is1/is2

 *   Set if frame is IPv4 TCP frame (IP protocol = 6) or IPv6 TCP frames (Next

 *   header = 6)

 * VCAP_KF_TCP_UDP_IS: W1, sparx5: is0/is2/es2

 * VCAP_KF_TCP_UDP_IS: W1, sparx5: is0/is2/es2, lan966x: is1

 *   Set if frame is IPv4/IPv6 TCP or UDP frame (IP protocol/next header equals 6

 *   or 17)

 * VCAP_KF_TYPE: sparx5 is0 W2, sparx5 is0 W1, sparx5 is2 W4, sparx5 is2 W2,

 *   sparx5 es0 W1, sparx5 es2 W3, lan966x is2 W4, lan966x is2 W2

 *   sparx5 es0 W1, sparx5 es2 W3, lan966x is1 W1, lan966x is1 W2, lan966x is2 W4,

 *   lan966x is2 W2

 *   Keyset type id - set by the API

 */
@@ -323,6 +360,7 @@ enum vcap_key_field { 
	VCAP_KF_8021BR_GRP,

	VCAP_KF_8021BR_IGR_ECID_BASE,

	VCAP_KF_8021BR_IGR_ECID_EXT,

	VCAP_KF_8021CB_R_TAGGED_IS,

	VCAP_KF_8021Q_DEI0,

	VCAP_KF_8021Q_DEI1,

	VCAP_KF_8021Q_DEI2,
@@ -339,6 +377,7 @@ enum vcap_key_field { 
	VCAP_KF_8021Q_VID1,

	VCAP_KF_8021Q_VID2,

	VCAP_KF_8021Q_VID_CLS,

	VCAP_KF_8021Q_VLAN_DBL_TAGGED_IS,

	VCAP_KF_8021Q_VLAN_TAGGED_IS,

	VCAP_KF_8021Q_VLAN_TAGS,

	VCAP_KF_ACL_GRP_ID,
@@ -366,6 +405,7 @@ enum vcap_key_field { 
	VCAP_KF_IP4_IS,

	VCAP_KF_IP_MC_IS,

	VCAP_KF_IP_PAYLOAD_5TUPLE,

	VCAP_KF_IP_PAYLOAD_S1_IP6,

	VCAP_KF_IP_SNAP_IS,

	VCAP_KF_ISDX_CLS,

	VCAP_KF_ISDX_GT0_IS,
@@ -374,6 +414,7 @@ enum vcap_key_field { 
	VCAP_KF_L2_FRM_TYPE,

	VCAP_KF_L2_FWD_IS,

	VCAP_KF_L2_LLC,

	VCAP_KF_L2_MAC,

	VCAP_KF_L2_MC_IS,

	VCAP_KF_L2_PAYLOAD0,

	VCAP_KF_L2_PAYLOAD1,
@@ -392,7 +433,9 @@ enum vcap_key_field { 
	VCAP_KF_L3_IP4_DIP,

	VCAP_KF_L3_IP4_SIP,

	VCAP_KF_L3_IP6_DIP,

	VCAP_KF_L3_IP6_DIP_MSB,

	VCAP_KF_L3_IP6_SIP,

	VCAP_KF_L3_IP6_SIP_MSB,

	VCAP_KF_L3_IP_PROTO,

	VCAP_KF_L3_OPTIONS_IS,

	VCAP_KF_L3_PAYLOAD,
@@ -416,6 +459,7 @@ enum vcap_key_field { 
	VCAP_KF_LOOKUP_FIRST_IS,

	VCAP_KF_LOOKUP_GEN_IDX,

	VCAP_KF_LOOKUP_GEN_IDX_SEL,

	VCAP_KF_LOOKUP_INDEX,

	VCAP_KF_LOOKUP_PAG,

	VCAP_KF_MIRROR_PROBE,

	VCAP_KF_OAM_CCM_CNTS_EQ0,
@@ -427,6 +471,9 @@ enum vcap_key_field { 
	VCAP_KF_OAM_VER,

	VCAP_KF_OAM_Y1731_IS,

	VCAP_KF_PROT_ACTIVE,

	VCAP_KF_RT_FRMID,

	VCAP_KF_RT_TYPE,

	VCAP_KF_RT_VLAN_IDX,

	VCAP_KF_TCP_IS,

	VCAP_KF_TCP_UDP_IS,

	VCAP_KF_TYPE,
@@ -440,6 +487,7 @@ enum vcap_actionfield_set { 
	VCAP_AFS_CLASS_REDUCED,     /* sparx5 is0 X1 */

	VCAP_AFS_ES0,               /* sparx5 es0 X1 */

	VCAP_AFS_FULL,              /* sparx5 is0 X3 */

	VCAP_AFS_S1,                /* lan966x is1 X1 */

	VCAP_AFS_SMAC_SIP,          /* lan966x is2 X1 */

};
@@ -470,23 +518,31 @@ enum vcap_actionfield_set { 
 *   CPU extraction queue. Used when FWD_SEL >0 and PIPELINE_ACT = XTR.

 * VCAP_AF_CPU_QUEUE_NUM: W3, sparx5: is2/es2, lan966x: is2

 *   CPU queue number. Used when CPU_COPY_ENA is set.

 * VCAP_AF_CUSTOM_ACE_TYPE_ENA: W4, lan966x: is1

 *   Enables use of custom keys in IS2. Bits 3:2 control second lookup in IS2

 *   while bits 1:0 control first lookup. Encoding per lookup: 0: Disabled.  1:

 *   Extract 40 bytes after position corresponding to the location of the IPv4

 *   header and use as key.  2: Extract 40 bytes after SMAC and use as key

 * VCAP_AF_DEI_A_VAL: W1, sparx5: es0

 *   DEI used in ES0 tag A. See TAG_A_DEI_SEL.

 * VCAP_AF_DEI_B_VAL: W1, sparx5: es0

 *   DEI used in ES0 tag B. See TAG_B_DEI_SEL.

 * VCAP_AF_DEI_C_VAL: W1, sparx5: es0

 *   DEI used in ES0 tag C. See TAG_C_DEI_SEL.

 * VCAP_AF_DEI_ENA: W1, sparx5: is0

 * VCAP_AF_DEI_ENA: W1, sparx5: is0, lan966x: is1

 *   If set, use DEI_VAL as classified DEI value. Otherwise, DEI from basic

 *   classification is used

 * VCAP_AF_DEI_VAL: W1, sparx5: is0

 * VCAP_AF_DEI_VAL: W1, sparx5: is0, lan966x: is1

 *   See DEI_ENA

 * VCAP_AF_DP_ENA: W1, sparx5: is0

 * VCAP_AF_DLR_SEL: W2, lan966x: is1

 *   0: No changes to port-based selection in ANA:PORT:OAM_CFG.DLR_ENA.  1: Enable

 *   DLR frame processing 2: Disable DLR processing

 * VCAP_AF_DP_ENA: W1, sparx5: is0, lan966x: is1

 *   If set, use DP_VAL as classified drop precedence level. Otherwise, drop

 *   precedence level from basic classification is used.

 * VCAP_AF_DP_VAL: W2, sparx5: is0

 * VCAP_AF_DP_VAL: sparx5 is0 W2, lan966x is1 W1

 *   See DP_ENA.

 * VCAP_AF_DSCP_ENA: W1, sparx5: is0

 * VCAP_AF_DSCP_ENA: W1, sparx5: is0, lan966x: is1

 *   If set, use DSCP_VAL as classified DSCP value. Otherwise, DSCP value from

 *   basic classification is used.

 * VCAP_AF_DSCP_SEL: W3, sparx5: es0
@@ -495,7 +551,7 @@ enum vcap_actionfield_set { 
 *   table 0, otherwise use DSCP_VAL. 5: Mapped using mapping table 1, otherwise

 *   use mapping table 0. 6: Mapped using mapping table 2, otherwise use DSCP_VAL.

 *   7: Mapped using mapping table 3, otherwise use mapping table 2

 * VCAP_AF_DSCP_VAL: W6, sparx5: is0/es0

 * VCAP_AF_DSCP_VAL: W6, sparx5: is0/es0, lan966x: is1

 *   See DSCP_ENA.

 * VCAP_AF_ES2_REW_CMD: W3, sparx5: es2

 *   Command forwarded to REW: 0: No action. 1: SWAP MAC addresses. 2: Do L2CP
@@ -529,9 +585,16 @@ enum vcap_actionfield_set { 
 * VCAP_AF_ISDX_ADD_REPLACE_SEL: W1, sparx5: is0

 *   Controls the classified ISDX. 0: New ISDX = old ISDX + ISDX_VAL. 1: New ISDX

 *   = ISDX_VAL.

 * VCAP_AF_ISDX_ADD_VAL: W8, lan966x: is1

 *   If ISDX_REPLACE_ENA is set, ISDX_ADD_VAL is used directly as the new ISDX.

 *   Encoding: ISDX_REPLACE_ENA=0, ISDX_ADD_VAL=0: Disabled ISDX_EPLACE_ENA=0,

 *   ISDX_ADD_VAL>0: Add value to classified ISDX. ISDX_REPLACE_ENA=1: Replace

 *   with ISDX_ADD_VAL value.

 * VCAP_AF_ISDX_ENA: W1, lan966x: is2

 *   Setting this bit to 1 causes the classified ISDX to be set to the value of

 *   POLICE_IDX[8:0].

 * VCAP_AF_ISDX_REPLACE_ENA: W1, lan966x: is1

 *   If set, classified ISDX is set to ISDX_ADD_VAL.

 * VCAP_AF_ISDX_VAL: W12, sparx5: is0

 *   See isdx_add_replace_sel

 * VCAP_AF_LOOP_ENA: W1, sparx5: es0
@@ -572,14 +635,22 @@ enum vcap_actionfield_set { 
 * VCAP_AF_MIRROR_PROBE_ID: W2, sparx5: es2

 *   Signals a mirror probe to be placed in the IFH. Only possible when FWD_MODE

 *   is copy. 0: No mirroring. 1-3: Use mirror probe 0-2.

 * VCAP_AF_MRP_SEL: W2, lan966x: is1

 *   0: No changes to port-based selection in ANA:PORT:OAM_CFG.MRP_ENA.  1: Enable

 *   MRP frame processing 2: Disable MRP processing

 * VCAP_AF_NXT_IDX: W12, sparx5: is0

 *   Index used as part of key (field G_IDX) in the next lookup.

 * VCAP_AF_NXT_IDX_CTRL: W3, sparx5: is0

 *   Controls the generation of the G_IDX used in the VCAP CLM next lookup

 * VCAP_AF_PAG_OVERRIDE_MASK: W8, sparx5: is0

 * VCAP_AF_OAM_SEL: W3, lan966x: is1

 *   0: No changes to port-based selection in ANA:PORT:OAM_CFG.OAM_CFG 1: Enable

 *   OAM frame processing for untagged frames 2: Enable OAM frame processing for

 *   single frames 3: Enable OAM frame processing for double frames 4: Disable OAM

 *   frame processing

 * VCAP_AF_PAG_OVERRIDE_MASK: W8, sparx5: is0, lan966x: is1

 *   Bits set in this mask will override PAG_VAL from port profile. New PAG = (PAG

 *   (input) AND ~PAG_OVERRIDE_MASK) OR (PAG_VAL AND PAG_OVERRIDE_MASK)

 * VCAP_AF_PAG_VAL: W8, sparx5: is0

 * VCAP_AF_PAG_VAL: W8, sparx5: is0, lan966x: is1

 *   See PAG_OVERRIDE_MASK.

 * VCAP_AF_PCP_A_VAL: W3, sparx5: es0

 *   PCP used in ES0 tag A. See TAG_A_PCP_SEL.
@@ -587,10 +658,10 @@ enum vcap_actionfield_set { 
 *   PCP used in ES0 tag B. See TAG_B_PCP_SEL.

 * VCAP_AF_PCP_C_VAL: W3, sparx5: es0

 *   PCP used in ES0 tag C. See TAG_C_PCP_SEL.

 * VCAP_AF_PCP_ENA: W1, sparx5: is0

 * VCAP_AF_PCP_ENA: W1, sparx5: is0, lan966x: is1

 *   If set, use PCP_VAL as classified PCP value. Otherwise, PCP from basic

 *   classification is used.

 * VCAP_AF_PCP_VAL: W3, sparx5: is0

 * VCAP_AF_PCP_VAL: W3, sparx5: is0, lan966x: is1

 *   See PCP_ENA.

 * VCAP_AF_PIPELINE_ACT: W1, sparx5: es0

 *   Pipeline action when FWD_SEL > 0. 0: XTR. CPU_QU selects CPU extraction queue
@@ -600,11 +671,11 @@ enum vcap_actionfield_set { 
 *   PIPELINE_PT == NONE. Overrules previous settings of pipeline point.

 * VCAP_AF_PIPELINE_PT: sparx5 is2 W5, sparx5 es0 W2

 *   Pipeline point used if PIPELINE_FORCE_ENA is set

 * VCAP_AF_POLICE_ENA: W1, sparx5: is2/es2, lan966x: is2

 *   Setting this bit to 1 causes frames that hit this action to be policed by the

 *   ACL policer specified in POLICE_IDX. Only applies to the first lookup.

 * VCAP_AF_POLICE_IDX: sparx5 is2 W6, sparx5 es2 W6, lan966x is2 W9

 *   Selects VCAP policer used when policing frames (POLICE_ENA)

 * VCAP_AF_POLICE_ENA: W1, sparx5: is2/es2, lan966x: is1/is2

 *   If set, POLICE_IDX is used to lookup ANA::POL.

 * VCAP_AF_POLICE_IDX: sparx5 is2 W6, sparx5 es2 W6, lan966x is1 W9, lan966x is2

 *   W9

 *   Policer index.

 * VCAP_AF_POLICE_REMARK: W1, sparx5: es2

 *   If set, frames exceeding policer rates are marked as yellow but not

 *   discarded.
@@ -628,16 +699,24 @@ enum vcap_actionfield_set { 
 *   port. 1: ES0 tag A: Push ES0 tag A. No port tag. 2: Force port tag: Always

 *   push port tag. No ES0 tag A. 3: Force untag: Never push port tag or ES0 tag

 *   A.

 * VCAP_AF_QOS_ENA: W1, sparx5: is0

 * VCAP_AF_QOS_ENA: W1, sparx5: is0, lan966x: is1

 *   If set, use QOS_VAL as classified QoS class. Otherwise, QoS class from basic

 *   classification is used.

 * VCAP_AF_QOS_VAL: W3, sparx5: is0

 * VCAP_AF_QOS_VAL: W3, sparx5: is0, lan966x: is1

 *   See QOS_ENA.

 * VCAP_AF_REW_OP: W16, lan966x: is2

 *   Rewriter operation command.

 * VCAP_AF_RT_DIS: W1, sparx5: is2

 *   If set, routing is disallowed. Only applies when IS_INNER_ACL is 0. See also

 *   IGR_ACL_ENA, EGR_ACL_ENA, and RLEG_STAT_IDX.

 * VCAP_AF_SFID_ENA: W1, lan966x: is1

 *   If set, SFID_VAL is used to lookup ANA::SFID.

 * VCAP_AF_SFID_VAL: W8, lan966x: is1

 *   Stream filter identifier.

 * VCAP_AF_SGID_ENA: W1, lan966x: is1

 *   If set, SGID_VAL is used to lookup ANA::SGID.

 * VCAP_AF_SGID_VAL: W8, lan966x: is1

 *   Stream gate identifier.

 * VCAP_AF_SWAP_MACS_ENA: W1, sparx5: es0

 *   This setting is only active when FWD_SEL = 1 or FWD_SEL = 2 and PIPELINE_ACT

 *   = LBK_ASM. 0: No action. 1: Swap MACs and clear bit 40 in new SMAC.
@@ -686,7 +765,7 @@ enum vcap_actionfield_set { 
 * VCAP_AF_TAG_C_VID_SEL: W2, sparx5: es0

 *   Selects VID for ES0 tag C. The resulting VID is termed C-TAG.VID. 0:

 *   Classified VID. 1: VID_C_VAL. 2: IFH.ENCAP.GVID. 3: Reserved.

 * VCAP_AF_TYPE: W1, sparx5: is0

 * VCAP_AF_TYPE: W1, sparx5: is0, lan966x: is1

 *   Actionset type id - Set by the API

 * VCAP_AF_UNTAG_VID_ENA: W1, sparx5: es0

 *   Controls insertion of tag C. Untag or insert mode can be selected. See
@@ -697,8 +776,19 @@ enum vcap_actionfield_set { 
 *   VID used in ES0 tag B. See TAG_B_VID_SEL.

 * VCAP_AF_VID_C_VAL: W12, sparx5: es0

 *   VID used in ES0 tag C. See TAG_C_VID_SEL.

 * VCAP_AF_VID_VAL: W13, sparx5: is0

 * VCAP_AF_VID_REPLACE_ENA: W1, lan966x: is1

 *   Controls the classified VID: VID_REPLACE_ENA=0: Add VID_ADD_VAL to basic

 *   classified VID and use result as new classified VID. VID_REPLACE_ENA = 1:

 *   Replace basic classified VID with VID_VAL value and use as new classified

 *   VID.

 * VCAP_AF_VID_VAL: sparx5 is0 W13, lan966x is1 W12

 *   New VID Value

 * VCAP_AF_VLAN_POP_CNT: W2, lan966x: is1

 *   See VLAN_POP_CNT_ENA

 * VCAP_AF_VLAN_POP_CNT_ENA: W1, lan966x: is1

 *   If set, use VLAN_POP_CNT as the number of VLAN tags to pop from the incoming

 *   frame. This number is used by the Rewriter. Otherwise, VLAN_POP_CNT from

 *   ANA:PORT:VLAN_CFG.VLAN_POP_CNT is used

 */



/* Actionfield names */
@@ -712,11 +802,13 @@ enum vcap_action_field { 
	VCAP_AF_CPU_COPY_ENA,

	VCAP_AF_CPU_QU,

	VCAP_AF_CPU_QUEUE_NUM,

	VCAP_AF_CUSTOM_ACE_TYPE_ENA,

	VCAP_AF_DEI_A_VAL,

	VCAP_AF_DEI_B_VAL,

	VCAP_AF_DEI_C_VAL,

	VCAP_AF_DEI_ENA,

	VCAP_AF_DEI_VAL,

	VCAP_AF_DLR_SEL,

	VCAP_AF_DP_ENA,

	VCAP_AF_DP_VAL,

	VCAP_AF_DSCP_ENA,
@@ -732,7 +824,9 @@ enum vcap_action_field { 
	VCAP_AF_IGNORE_PIPELINE_CTRL,

	VCAP_AF_INTR_ENA,

	VCAP_AF_ISDX_ADD_REPLACE_SEL,

	VCAP_AF_ISDX_ADD_VAL,

	VCAP_AF_ISDX_ENA,

	VCAP_AF_ISDX_REPLACE_ENA,

	VCAP_AF_ISDX_VAL,

	VCAP_AF_LOOP_ENA,

	VCAP_AF_LRN_DIS,
@@ -745,8 +839,10 @@ enum vcap_action_field { 
	VCAP_AF_MIRROR_ENA,

	VCAP_AF_MIRROR_PROBE,

	VCAP_AF_MIRROR_PROBE_ID,

	VCAP_AF_MRP_SEL,

	VCAP_AF_NXT_IDX,

	VCAP_AF_NXT_IDX_CTRL,

	VCAP_AF_OAM_SEL,

	VCAP_AF_PAG_OVERRIDE_MASK,

	VCAP_AF_PAG_VAL,

	VCAP_AF_PCP_A_VAL,
@@ -770,6 +866,10 @@ enum vcap_action_field { 
	VCAP_AF_QOS_VAL,

	VCAP_AF_REW_OP,

	VCAP_AF_RT_DIS,

	VCAP_AF_SFID_ENA,

	VCAP_AF_SFID_VAL,

	VCAP_AF_SGID_ENA,

	VCAP_AF_SGID_VAL,

	VCAP_AF_SWAP_MACS_ENA,

	VCAP_AF_TAG_A_DEI_SEL,

	VCAP_AF_TAG_A_PCP_SEL,
@@ -788,7 +888,10 @@ enum vcap_action_field { 
	VCAP_AF_VID_A_VAL,

	VCAP_AF_VID_B_VAL,

	VCAP_AF_VID_C_VAL,

	VCAP_AF_VID_REPLACE_ENA,

	VCAP_AF_VID_VAL,

	VCAP_AF_VLAN_POP_CNT,

	VCAP_AF_VLAN_POP_CNT_ENA,

};



#endif /* __VCAP_AG_API__ */

drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static const char * const test_admin_info_expect[] = { 
	"default_cnt: 73\n",

	"require_cnt_dis: 0\n",

	"version: 1\n",

	"vtype: 3\n",

	"vtype: 4\n",

	"vinst: 0\n",

	"ingress: 1\n",

	"first_cid: 10000\n",
@@ -435,7 +435,7 @@ static const char * const test_admin_expect[] = { 
	"default_cnt: 73\n",

	"require_cnt_dis: 0\n",

	"version: 1\n",

	"vtype: 3\n",

	"vtype: 4\n",

	"vinst: 0\n",

	"ingress: 1\n",

	"first_cid: 8000000\n",