Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f7d218 authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by Greg Kroah-Hartman
Browse files

nfp: flower: replace CFI with vlan present 



[ Upstream commit f7ee799a51ddbcc205ef615fe424fb5084e9e0aa ]

Replace vlan CFI bit with a vlan present bit that indicates the
presence of a vlan tag. Previously the driver incorrectly assumed
that an vlan id of 0 is not matchable, therefore we indicate vlan
presence with a vlan present bit.

Fixes: 5571e8c9 ("nfp: extend flower matching capabilities")
Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: default avatarLouis Peens <louis.peens@netronome.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbce0413

drivers/net/ethernet/netronome/nfp/flower/cmsg.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#define NFP_FLOWER_LAYER2_GENEVE_OP	BIT(6)



#define NFP_FLOWER_MASK_VLAN_PRIO	GENMASK(15, 13)

#define NFP_FLOWER_MASK_VLAN_CFI	BIT(12)

#define NFP_FLOWER_MASK_VLAN_PRESENT	BIT(12)

#define NFP_FLOWER_MASK_VLAN_VID	GENMASK(11, 0)



#define NFP_FLOWER_MASK_MPLS_LB		GENMASK(31, 12)

drivers/net/ethernet/netronome/nfp/flower/match.c

+6 −8
Original line number Diff line number Diff line
@@ -56,16 +56,14 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *frame, 
						      FLOW_DISSECTOR_KEY_VLAN,

						      target);

		/* Populate the tci field. */

		if (flow_vlan->vlan_id || flow_vlan->vlan_priority) {

			tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,

		tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT;

		tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,

				      flow_vlan->vlan_priority) |

			   FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID,

					     flow_vlan->vlan_id) |

				  NFP_FLOWER_MASK_VLAN_CFI;

				      flow_vlan->vlan_id);

		frame->tci = cpu_to_be16(tmp_tci);

	}

}

}



static void

nfp_flower_compile_ext_meta(struct nfp_flower_ext_meta *frame, u32 key_ext)