nfp: flower: support to offload pedit of IPv6 flowinto fields

Previously the traffic class field is ignored while firmware has
already supported to pedit flowinfo fields, including traffic
class and flow label, now add it back.

Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Link: https://lore.kernel.org/r/20220609080136.151830-1-simon.horman@corigine.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index 0147de40536533bea52ee9f140a7933ac9b77c65..b456e81a73a43f84ae0226699554fa75708a175f 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -674,9 +674,9 @@ nfp_fl_set_ip6_hop_limit_flow_label(u32 off, __be32 exact, __be32 mask,
                                            fl_hl_mask->hop_limit;
                break;
        case round_down(offsetof(struct ipv6hdr, flow_lbl), 4):
-               if (mask & ~IPV6_FLOW_LABEL_MASK ||
-                   exact & ~IPV6_FLOW_LABEL_MASK) {
-                       NL_SET_ERR_MSG_MOD(extack, "unsupported offload: invalid pedit IPv6 flow label action");
+               if (mask & ~IPV6_FLOWINFO_MASK ||
+                   exact & ~IPV6_FLOWINFO_MASK) {
+                       NL_SET_ERR_MSG_MOD(extack, "unsupported offload: invalid pedit IPv6 flow info action");
                        return -EOPNOTSUPP;
                }
 

diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index 68e8a2fb1a2979511e8c193a6e3d66a9dd37a988..2df2af1da7166c4ca9b6d7e77a88919e89a24c57 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -96,8 +96,6 @@
 #define NFP_FL_PUSH_VLAN_PRIO          GENMASK(15, 13)
 #define NFP_FL_PUSH_VLAN_VID           GENMASK(11, 0)
 
-#define IPV6_FLOW_LABEL_MASK           cpu_to_be32(0x000fffff)
-
 /* LAG ports */
 #define NFP_FL_LAG_OUT                 0xC0DE0000