Merge branch 'net-mvpp2-cls-Add-classification'

Maxime Chevallier says:

====================
net: mvpp2: cls: Add classification

This series is a rework of the previously standalone patch adding
classification support for mvpp2 :

https://lore.kernel.org/netdev/20190423075031.26074-1-maxime.chevallier@bootlin.com/

This patch has been reworked according to Saeed's review, to make sure
that the location of the rule is always respected and serves as a way to
prioritize rules between each other. This the 3rd iteration of this
submission, but since it's now a series, I reset the revision numbering.

This series implements that in a limited configuration for now, since we
limit the total number of rules per port to 4.

The main factors for this limitation are that :
 - We share the classification tables between all ports (4 max, although
   one is only used for internal loopback), hence we have to perform a
   logical separation between rules, which is done today by dedicated
   ranges for each port in each table

 - The "Flow table", which dictates which lookups operations are
   performed for an ingress packet, in subdivided into 22 "sub flows",
   each corresponding to a traffic type based on the L3 proto, L4
   proto, the presence or not of a VLAN tag and the L3 fragmentation.

   This makes so that when adding a rule, it has to be added into each
   of these subflows, introducing duplications of entries and limiting
   our max number of entries.

These limitations can be overcomed in several ways, but for readability
sake, I'd rather submit basic classification offload support for now,
and improve it gradually.

This series also adds a small cosmetic cleanup patch (1), and also adds
support for the "Drop" action compared to the first submission of this
feature. It is simple enough to be added with this basic support.

Compared to the first submissions, the NETIF_F_NTUPLE flag was also
removed, following Saeed's comment.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 545 insertions, 84 deletions

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 67cce2736806..6171270a016c 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -14,6 +14,7 @@
 #include <linux/netdevice.h>
 #include <linux/phy.h>
 #include <linux/phylink.h>
+#include <net/flow_offload.h>
 
 /* Fifo Registers */
 #define MVPP2_RX_DATA_FIFO_SIZE_REG(port)       (0x00 + 4 * (port))
@@ -126,6 +127,7 @@
 #define MVPP22_CLS_C2_TCAM_DATA4                0x1b20
 #define     MVPP22_CLS_C2_LU_TYPE(lu)           ((lu) & 0x3f)
 #define     MVPP22_CLS_C2_PORT_ID(port)         ((port) << 8)
+#define     MVPP22_CLS_C2_PORT_MASK             (0xff << 8)
 #define MVPP22_CLS_C2_TCAM_INV                  0x1b24
 #define     MVPP22_CLS_C2_TCAM_INV_BIT          BIT(31)
 #define MVPP22_CLS_C2_HIT_CTR                   0x1b50
@@ -134,6 +136,7 @@
 #define     MVPP22_CLS_C2_ACT_FWD(act)          (((act) & 0x7) << 13)
 #define     MVPP22_CLS_C2_ACT_QHIGH(act)        (((act) & 0x3) << 11)
 #define     MVPP22_CLS_C2_ACT_QLOW(act)         (((act) & 0x3) << 9)
+#define     MVPP22_CLS_C2_ACT_COLOR(act)        ((act) & 0x7)
 #define MVPP22_CLS_C2_ATTR0                     0x1b64
 #define     MVPP22_CLS_C2_ATTR0_QHIGH(qh)       (((qh) & 0x1f) << 24)
 #define     MVPP22_CLS_C2_ATTR0_QHIGH_MASK      0x1f
@@ -615,6 +618,10 @@
 #define MVPP2_BIT_IN_WORD(bit)          ((bit) % 32)
 
 #define MVPP2_N_PRS_FLOWS               52
+#define MVPP2_N_RFS_ENTRIES_PER_FLOW    4
+
+/* There are 7 supported high-level flows */
+#define MVPP2_N_RFS_RULES               (MVPP2_N_RFS_ENTRIES_PER_FLOW * 7)
 
 /* RSS constants */
 #define MVPP22_RSS_TABLE_ENTRIES        32
@@ -812,6 +819,37 @@ struct mvpp2_queue_vector {
         struct cpumask *mask;
 };
 
+/* Internal represention of a Flow Steering rule */
+struct mvpp2_rfs_rule {
+        /* Rule location inside the flow*/
+        int loc;
+
+        /* Flow type, such as TCP_V4_FLOW, IP6_FLOW, etc. */
+        int flow_type;
+
+        /* Index of the C2 TCAM entry handling this rule */
+        int c2_index;
+
+        /* Header fields that needs to be extracted to match this flow */
+        u16 hek_fields;
+
+        /* CLS engine : only c2 is supported for now. */
+        u8 engine;
+
+        /* TCAM key and mask for C2-based steering. These fields should be
+         * encapsulated in a union should we add more engines.
+         */
+        u64 c2_tcam;
+        u64 c2_tcam_mask;
+
+        struct flow_rule *flow;
+};
+
+struct mvpp2_ethtool_fs {
+        struct mvpp2_rfs_rule rule;
+        struct ethtool_rxnfc rxnfc;
+};
+
 struct mvpp2_port {
         u8 id;
 
@@ -883,6 +921,10 @@ struct mvpp2_port {
 
         /* RSS indirection table */
         u32 indir[MVPP22_RSS_TABLE_ENTRIES];
+
+        /* List of steering rules active on that port */
+        struct mvpp2_ethtool_fs *rfs_rules[MVPP2_N_RFS_RULES];
+        int n_rfs_rules;
 };
 
 /* The mvpp2_tx_desc and mvpp2_rx_desc structures describe the
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
index 1087974d3b98..4989fb13244f 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
@@ -24,300 +24,300 @@
 
 static const struct mvpp2_cls_flow cls_flows[MVPP2_N_PRS_FLOWS] = {
         /* TCP over IPv4 flows, Not fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* TCP over IPv4 flows, Not fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
         /* TCP over IPv4 flows, fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* TCP over IPv4 flows, fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V4_FLOW, MVPP2_FL_IP4_TCP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP4, MVPP2_FL_IP4_TCP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
         /* UDP over IPv4 flows, Not fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP4_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* UDP over IPv4 flows, Not fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_NF_TAG,
                        MVPP22_CLS_HEK_IP4_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
         /* UDP over IPv4 flows, fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4 |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* UDP over IPv4 flows, fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4 | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OPT | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V4_FLOW, MVPP2_FL_IP4_UDP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP4, MVPP2_FL_IP4_UDP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OTHER | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
         /* TCP over IPv6 flows, not fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP6_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP6_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* TCP over IPv6 flows, not fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_TAG,
                        MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_NF_TAG,
                        MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
         /* TCP over IPv6 flows, fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |
                        MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |
                        MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* TCP over IPv6 flows, fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_IP_FRAG_TRUE |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(TCP_V6_FLOW, MVPP2_FL_IP6_TCP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_TCP6, MVPP2_FL_IP6_TCP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_IP_FRAG_TRUE |
                        MVPP2_PRS_RI_L4_TCP,
                        MVPP2_PRS_IP_MASK),
 
         /* UDP over IPv6 flows, not fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP6_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_UNTAG,
                        MVPP22_CLS_HEK_IP6_5T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* UDP over IPv6 flows, not fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_TAG,
                        MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_NF_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_NF_TAG,
                        MVPP22_CLS_HEK_IP6_5T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
         /* UDP over IPv6 flows, fragmented, no vlan tag */
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6 |
                        MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6_EXT |
                        MVPP2_PRS_RI_IP_FRAG_TRUE | MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK | MVPP2_PRS_RI_VLAN_MASK),
 
         /* UDP over IPv6 flows, fragmented, with vlan tag */
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6 | MVPP2_PRS_RI_IP_FRAG_TRUE |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
-        MVPP2_DEF_FLOW(UDP_V6_FLOW, MVPP2_FL_IP6_UDP_FRAG_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_UDP6, MVPP2_FL_IP6_UDP_FRAG_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6_EXT | MVPP2_PRS_RI_IP_FRAG_TRUE |
                        MVPP2_PRS_RI_L4_UDP,
                        MVPP2_PRS_IP_MASK),
 
         /* IPv4 flows, no vlan tag */
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4,
                        MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OPT,
                        MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_UNTAG,
                        MVPP22_CLS_HEK_IP4_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP4_OTHER,
                        MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),
 
         /* IPv4 flows, with vlan tag */
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4,
                        MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OPT,
                        MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV4_FLOW, MVPP2_FL_IP4_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP4, MVPP2_FL_IP4_TAG,
                        MVPP22_CLS_HEK_IP4_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP4_OTHER,
                        MVPP2_PRS_RI_L3_PROTO_MASK),
 
         /* IPv6 flows, no vlan tag */
-        MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6,
                        MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_UNTAG,
                        MVPP22_CLS_HEK_IP6_2T,
                        MVPP2_PRS_RI_VLAN_NONE | MVPP2_PRS_RI_L3_IP6,
                        MVPP2_PRS_RI_VLAN_MASK | MVPP2_PRS_RI_L3_PROTO_MASK),
 
         /* IPv6 flows, with vlan tag */
-        MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6,
                        MVPP2_PRS_RI_L3_PROTO_MASK),
-        MVPP2_DEF_FLOW(IPV6_FLOW, MVPP2_FL_IP6_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_IP6, MVPP2_FL_IP6_TAG,
                        MVPP22_CLS_HEK_IP6_2T | MVPP22_CLS_HEK_OPT_VLAN,
                        MVPP2_PRS_RI_L3_IP6,
                        MVPP2_PRS_RI_L3_PROTO_MASK),
 
         /* Non IP flow, no vlan tag */
-        MVPP2_DEF_FLOW(ETHER_FLOW, MVPP2_FL_NON_IP_UNTAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_ETHERNET, MVPP2_FL_NON_IP_UNTAG,
                        0,
                        MVPP2_PRS_RI_VLAN_NONE,
                        MVPP2_PRS_RI_VLAN_MASK),
         /* Non IP flow, with vlan tag */
-        MVPP2_DEF_FLOW(ETHER_FLOW, MVPP2_FL_NON_IP_TAG,
+        MVPP2_DEF_FLOW(MVPP22_FLOW_ETHERNET, MVPP2_FL_NON_IP_TAG,
                        MVPP22_CLS_HEK_OPT_VLAN,
                        0, 0),
 };
@@ -344,9 +344,9 @@ static void mvpp2_cls_flow_write(struct mvpp2 *priv,
                                  struct mvpp2_cls_flow_entry *fe)
 {
         mvpp2_write(priv, MVPP2_CLS_FLOW_INDEX_REG, fe->index);
-        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL0_REG,  fe->data[0]);
-        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL1_REG,  fe->data[1]);
-        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL2_REG,  fe->data[2]);
+        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL0_REG, fe->data[0]);
+        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL1_REG, fe->data[1]);
+        mvpp2_write(priv, MVPP2_CLS_FLOW_TBL2_REG, fe->data[2]);
 }
 
 u32 mvpp2_cls_lookup_hits(struct mvpp2 *priv, int index)
@@ -448,6 +448,12 @@ static void mvpp2_cls_flow_port_add(struct mvpp2_cls_flow_entry *fe,
         fe->data[0] |= MVPP2_CLS_FLOW_TBL0_PORT_ID(port);
 }
 
+static void mvpp2_cls_flow_port_remove(struct mvpp2_cls_flow_entry *fe,
+                                       u32 port)
+{
+        fe->data[0] &= ~MVPP2_CLS_FLOW_TBL0_PORT_ID(port);
+}
+
 static void mvpp2_cls_flow_lu_type_set(struct mvpp2_cls_flow_entry *fe,
                                        u8 lu_type)
 {
@@ -539,6 +545,31 @@ void mvpp2_cls_c2_read(struct mvpp2 *priv, int index,
         c2->valid = !(val & MVPP22_CLS_C2_TCAM_INV_BIT);
 }
 
+static int mvpp2_cls_ethtool_flow_to_type(int flow_type)
+{
+        switch (flow_type & ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS)) {
+        case TCP_V4_FLOW:
+                return MVPP22_FLOW_TCP4;
+        case TCP_V6_FLOW:
+                return MVPP22_FLOW_TCP6;
+        case UDP_V4_FLOW:
+                return MVPP22_FLOW_UDP4;
+        case UDP_V6_FLOW:
+                return MVPP22_FLOW_UDP6;
+        case IPV4_FLOW:
+                return MVPP22_FLOW_IP4;
+        case IPV6_FLOW:
+                return MVPP22_FLOW_IP6;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static int mvpp2_cls_c2_port_flow_index(struct mvpp2_port *port, int loc)
+{
+        return MVPP22_CLS_C2_RFS_LOC(port->id, loc);
+}
+
 /* Initialize the flow table entries for the given flow */
 static void mvpp2_cls_flow_init(struct mvpp2 *priv,
                                 const struct mvpp2_cls_flow *flow)
@@ -565,7 +596,7 @@ static void mvpp2_cls_flow_init(struct mvpp2 *priv,
 
         mvpp2_cls_flow_eng_set(&fe, MVPP22_CLS_ENGINE_C2);
         mvpp2_cls_flow_port_id_sel(&fe, true);
-        mvpp2_cls_flow_lu_type_set(&fe, MVPP2_CLS_LU_ALL);
+        mvpp2_cls_flow_lu_type_set(&fe, MVPP22_FLOW_ETHERNET);
 
         /* Add all ports */
         for (i = 0; i < MVPP2_MAX_PORTS; i++)
@@ -652,6 +683,26 @@ static int mvpp2_flow_set_hek_fields(struct mvpp2_cls_flow_entry *fe,
         return 0;
 }
 
+/* Returns the size, in bits, of the corresponding HEK field */
+static int mvpp2_cls_hek_field_size(u32 field)
+{
+        switch (field) {
+        case MVPP22_CLS_HEK_OPT_MAC_DA:
+                return 48;
+        case MVPP22_CLS_HEK_OPT_IP4SA:
+        case MVPP22_CLS_HEK_OPT_IP4DA:
+                return 32;
+        case MVPP22_CLS_HEK_OPT_IP6SA:
+        case MVPP22_CLS_HEK_OPT_IP6DA:
+                return 128;
+        case MVPP22_CLS_HEK_OPT_L4SIP:
+        case MVPP22_CLS_HEK_OPT_L4DIP:
+                return 16;
+        default:
+                return -1;
+        }
+}
+
 const struct mvpp2_cls_flow *mvpp2_cls_flow_get(int flow)
 {
         if (flow >= MVPP2_N_PRS_FLOWS)
@@ -810,7 +861,7 @@ static void mvpp2_port_c2_cls_init(struct mvpp2_port *port)
 
         /* Match on Lookup Type */
         c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK));
-        c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_ALL);
+        c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(MVPP22_FLOW_ETHERNET);
 
         /* Update RSS status after matching this entry */
         c2.act = MVPP22_CLS_C2_ACT_RSS_EN(MVPP22_C2_UPD_LOCK);
@@ -944,6 +995,18 @@ void mvpp22_port_rss_disable(struct mvpp2_port *port)
         mvpp2_rss_port_c2_disable(port);
 }
 
+static void mvpp22_port_c2_lookup_disable(struct mvpp2_port *port, int entry)
+{
+        struct mvpp2_cls_c2_entry c2;
+
+        mvpp2_cls_c2_read(port->priv, entry, &c2);
+
+        /* Clear the port map so that the entry doesn't match anymore */
+        c2.tcam[4] &= ~(MVPP22_CLS_C2_PORT_ID(BIT(port->id)));
+
+        mvpp2_cls_c2_write(port->priv, &c2);
+}
+
 /* Set CPU queue number for oversize packets */
 void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port)
 {
@@ -960,6 +1023,290 @@ void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port)
         mvpp2_write(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);
 }
 
+static int mvpp2_port_c2_tcam_rule_add(struct mvpp2_port *port,
+                                       struct mvpp2_rfs_rule *rule)
+{
+        struct flow_action_entry *act;
+        struct mvpp2_cls_c2_entry c2;
+        u8 qh, ql, pmap;
+
+        memset(&c2, 0, sizeof(c2));
+
+        c2.index = mvpp2_cls_c2_port_flow_index(port, rule->loc);
+        if (c2.index < 0)
+                return -EINVAL;
+
+        act = &rule->flow->action.entries[0];
+
+        rule->c2_index = c2.index;
+
+        c2.tcam[0] = (rule->c2_tcam & 0xffff) |
+                     ((rule->c2_tcam_mask & 0xffff) << 16);
+        c2.tcam[1] = ((rule->c2_tcam >> 16) & 0xffff) |
+                     (((rule->c2_tcam_mask >> 16) & 0xffff) << 16);
+        c2.tcam[2] = ((rule->c2_tcam >> 32) & 0xffff) |
+                     (((rule->c2_tcam_mask >> 32) & 0xffff) << 16);
+        c2.tcam[3] = ((rule->c2_tcam >> 48) & 0xffff) |
+                     (((rule->c2_tcam_mask >> 48) & 0xffff) << 16);
+
+        pmap = BIT(port->id);
+        c2.tcam[4] = MVPP22_CLS_C2_PORT_ID(pmap);
+        c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_PORT_ID(pmap));
+
+        /* Match on Lookup Type */
+        c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK));
+        c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(rule->loc);
+
+        if (act->id == FLOW_ACTION_DROP) {
+                c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_RED_LOCK);
+        } else {
+                /* We want to keep the default color derived from the Header
+                 * Parser drop entries, for VLAN and MAC filtering. This will
+                 * assign a default color of Green or Red, and we want matches
+                 * with a non-drop action to keep that color.
+                 */
+                c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_NO_UPD_LOCK);
+
+                /* Mark packet as "forwarded to software", needed for RSS */
+                c2.act |= MVPP22_CLS_C2_ACT_FWD(MVPP22_C2_FWD_SW_LOCK);
+
+                c2.act |= MVPP22_CLS_C2_ACT_QHIGH(MVPP22_C2_UPD_LOCK) |
+                           MVPP22_CLS_C2_ACT_QLOW(MVPP22_C2_UPD_LOCK);
+
+                qh = ((act->queue.index + port->first_rxq) >> 3) & MVPP22_CLS_C2_ATTR0_QHIGH_MASK;
+                ql = (act->queue.index + port->first_rxq) & MVPP22_CLS_C2_ATTR0_QLOW_MASK;
+
+                c2.attr[0] = MVPP22_CLS_C2_ATTR0_QHIGH(qh) |
+                              MVPP22_CLS_C2_ATTR0_QLOW(ql);
+        }
+
+        c2.valid = true;
+
+        mvpp2_cls_c2_write(port->priv, &c2);
+
+        return 0;
+}
+
+static int mvpp2_port_c2_rfs_rule_insert(struct mvpp2_port *port,
+                                         struct mvpp2_rfs_rule *rule)
+{
+        return mvpp2_port_c2_tcam_rule_add(port, rule);
+}
+
+static int mvpp2_port_cls_rfs_rule_remove(struct mvpp2_port *port,
+                                          struct mvpp2_rfs_rule *rule)
+{
+        const struct mvpp2_cls_flow *flow;
+        struct mvpp2_cls_flow_entry fe;
+        int index, i;
+
+        for_each_cls_flow_id_containing_type(i, rule->flow_type) {
+                flow = mvpp2_cls_flow_get(i);
+                if (!flow)
+                        return 0;
+
+                index = MVPP2_CLS_FLT_C2_RFS(port->id, flow->flow_id, rule->loc);
+
+                mvpp2_cls_flow_read(port->priv, index, &fe);
+                mvpp2_cls_flow_port_remove(&fe, BIT(port->id));
+                mvpp2_cls_flow_write(port->priv, &fe);
+        }
+
+        if (rule->c2_index >= 0)
+                mvpp22_port_c2_lookup_disable(port, rule->c2_index);
+
+        return 0;
+}
+
+static int mvpp2_port_flt_rfs_rule_insert(struct mvpp2_port *port,
+                                          struct mvpp2_rfs_rule *rule)
+{
+        const struct mvpp2_cls_flow *flow;
+        struct mvpp2 *priv = port->priv;
+        struct mvpp2_cls_flow_entry fe;
+        int index, ret, i;
+
+        if (rule->engine != MVPP22_CLS_ENGINE_C2)
+                return -EOPNOTSUPP;
+
+        ret = mvpp2_port_c2_rfs_rule_insert(port, rule);
+        if (ret)
+                return ret;
+
+        for_each_cls_flow_id_containing_type(i, rule->flow_type) {
+                flow = mvpp2_cls_flow_get(i);
+                if (!flow)
+                        return 0;
+
+                index = MVPP2_CLS_FLT_C2_RFS(port->id, flow->flow_id, rule->loc);
+
+                mvpp2_cls_flow_read(priv, index, &fe);
+                mvpp2_cls_flow_eng_set(&fe, rule->engine);
+                mvpp2_cls_flow_port_id_sel(&fe, true);
+                mvpp2_flow_set_hek_fields(&fe, rule->hek_fields);
+                mvpp2_cls_flow_lu_type_set(&fe, rule->loc);
+                mvpp2_cls_flow_port_add(&fe, 0xf);
+
+                mvpp2_cls_flow_write(priv, &fe);
+        }
+
+        return 0;
+}
+
+static int mvpp2_cls_c2_build_match(struct mvpp2_rfs_rule *rule)
+{
+        struct flow_rule *flow = rule->flow;
+        struct flow_action_entry *act;
+        int offs = 64;
+
+        act = &flow->action.entries[0];
+
+        if (flow_rule_match_key(flow, FLOW_DISSECTOR_KEY_PORTS)) {
+                struct flow_match_ports match;
+
+                flow_rule_match_ports(flow, &match);
+                if (match.mask->src) {
+                        rule->hek_fields |= MVPP22_CLS_HEK_OPT_L4SIP;
+                        offs -= mvpp2_cls_hek_field_size(MVPP22_CLS_HEK_OPT_L4SIP);
+
+                        rule->c2_tcam |= ((u64)ntohs(match.key->src)) << offs;
+                        rule->c2_tcam_mask |= ((u64)ntohs(match.mask->src)) << offs;
+                }
+
+                if (match.mask->dst) {
+                        rule->hek_fields |= MVPP22_CLS_HEK_OPT_L4DIP;
+                        offs -= mvpp2_cls_hek_field_size(MVPP22_CLS_HEK_OPT_L4DIP);
+
+                        rule->c2_tcam |= ((u64)ntohs(match.key->dst)) << offs;
+                        rule->c2_tcam_mask |= ((u64)ntohs(match.mask->dst)) << offs;
+                }
+        }
+
+        if (hweight16(rule->hek_fields) > MVPP2_FLOW_N_FIELDS)
+                return -EOPNOTSUPP;
+
+        return 0;
+}
+
+static int mvpp2_cls_rfs_parse_rule(struct mvpp2_rfs_rule *rule)
+{
+        struct flow_rule *flow = rule->flow;
+        struct flow_action_entry *act;
+
+        act = &flow->action.entries[0];
+        if (act->id != FLOW_ACTION_QUEUE && act->id != FLOW_ACTION_DROP)
+                return -EOPNOTSUPP;
+
+        /* For now, only use the C2 engine which has a HEK size limited to 64
+         * bits for TCAM matching.
+         */
+        rule->engine = MVPP22_CLS_ENGINE_C2;
+
+        if (mvpp2_cls_c2_build_match(rule))
+                return -EINVAL;
+
+        return 0;
+}
+
+int mvpp2_ethtool_cls_rule_get(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *rxnfc)
+{
+        struct mvpp2_ethtool_fs *efs;
+
+        if (rxnfc->fs.location >= MVPP2_N_RFS_RULES)
+                return -EINVAL;
+
+        efs = port->rfs_rules[rxnfc->fs.location];
+        if (!efs)
+                return -ENOENT;
+
+        memcpy(rxnfc, &efs->rxnfc, sizeof(efs->rxnfc));
+
+        return 0;
+}
+
+int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *info)
+{
+        struct ethtool_rx_flow_spec_input input = {};
+        struct ethtool_rx_flow_rule *ethtool_rule;
+        struct mvpp2_ethtool_fs *efs, *old_efs;
+        int ret = 0;
+
+        if (info->fs.location >= 4 ||
+            info->fs.location < 0)
+                return -EINVAL;
+
+        efs = kzalloc(sizeof(*efs), GFP_KERNEL);
+        if (!efs)
+                return -ENOMEM;
+
+        input.fs = &info->fs;
+
+        ethtool_rule = ethtool_rx_flow_rule_create(&input);
+        if (IS_ERR(ethtool_rule)) {
+                ret = PTR_ERR(ethtool_rule);
+                goto clean_rule;
+        }
+
+        efs->rule.flow = ethtool_rule->rule;
+        efs->rule.flow_type = mvpp2_cls_ethtool_flow_to_type(info->fs.flow_type);
+
+        ret = mvpp2_cls_rfs_parse_rule(&efs->rule);
+        if (ret)
+                goto clean_eth_rule;
+
+        efs->rule.loc = info->fs.location;
+
+        /* Replace an already existing rule */
+        if (port->rfs_rules[efs->rule.loc]) {
+                old_efs = port->rfs_rules[efs->rule.loc];
+                ret = mvpp2_port_cls_rfs_rule_remove(port, &old_efs->rule);
+                if (ret)
+                        goto clean_eth_rule;
+                kfree(old_efs);
+                port->n_rfs_rules--;
+        }
+
+        ret = mvpp2_port_flt_rfs_rule_insert(port, &efs->rule);
+        if (ret)
+                goto clean_eth_rule;
+
+        memcpy(&efs->rxnfc, info, sizeof(*info));
+        port->rfs_rules[efs->rule.loc] = efs;
+        port->n_rfs_rules++;
+
+        return ret;
+
+clean_eth_rule:
+        ethtool_rx_flow_rule_destroy(ethtool_rule);
+clean_rule:
+        kfree(efs);
+        return ret;
+}
+
+int mvpp2_ethtool_cls_rule_del(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *info)
+{
+        struct mvpp2_ethtool_fs *efs;
+        int ret;
+
+        efs = port->rfs_rules[info->fs.location];
+        if (!efs)
+                return -EINVAL;
+
+        /* Remove the rule from the engines. */
+        ret = mvpp2_port_cls_rfs_rule_remove(port, &efs->rule);
+        if (ret)
+                return ret;
+
+        port->n_rfs_rules--;
+        port->rfs_rules[info->fs.location] = NULL;
+        kfree(efs);
+
+        return 0;
+}
+
 static inline u32 mvpp22_rxfh_indir(struct mvpp2_port *port, u32 rxq)
 {
         int nrxqs, cpu, cpus = num_possible_cpus();
@@ -997,19 +1344,22 @@ void mvpp22_rss_fill_table(struct mvpp2_port *port, u32 table)
 int mvpp2_ethtool_rxfh_set(struct mvpp2_port *port, struct ethtool_rxnfc *info)
 {
         u16 hash_opts = 0;
+        u32 flow_type;
 
-        switch (info->flow_type) {
-        case TCP_V4_FLOW:
-        case UDP_V4_FLOW:
-        case TCP_V6_FLOW:
-        case UDP_V6_FLOW:
+        flow_type = mvpp2_cls_ethtool_flow_to_type(info->flow_type);
+
+        switch (flow_type) {
+        case MVPP22_FLOW_TCP4:
+        case MVPP22_FLOW_UDP4:
+        case MVPP22_FLOW_TCP6:
+        case MVPP22_FLOW_UDP6:
                 if (info->data & RXH_L4_B_0_1)
                         hash_opts |= MVPP22_CLS_HEK_OPT_L4SIP;
                 if (info->data & RXH_L4_B_2_3)
                         hash_opts |= MVPP22_CLS_HEK_OPT_L4DIP;
                 /* Fallthrough */
-        case IPV4_FLOW:
-        case IPV6_FLOW:
+        case MVPP22_FLOW_IP4:
+        case MVPP22_FLOW_IP6:
                 if (info->data & RXH_L2DA)
                         hash_opts |= MVPP22_CLS_HEK_OPT_MAC_DA;
                 if (info->data & RXH_VLAN)
@@ -1026,15 +1376,18 @@ int mvpp2_ethtool_rxfh_set(struct mvpp2_port *port, struct ethtool_rxnfc *info)
         default: return -EOPNOTSUPP;
         }
 
-        return mvpp2_port_rss_hash_opts_set(port, info->flow_type, hash_opts);
+        return mvpp2_port_rss_hash_opts_set(port, flow_type, hash_opts);
 }
 
 int mvpp2_ethtool_rxfh_get(struct mvpp2_port *port, struct ethtool_rxnfc *info)
 {
         unsigned long hash_opts;
+        u32 flow_type;
         int i;
 
-        hash_opts = mvpp2_port_rss_hash_opts_get(port, info->flow_type);
+        flow_type = mvpp2_cls_ethtool_flow_to_type(info->flow_type);
+
+        hash_opts = mvpp2_port_rss_hash_opts_get(port, flow_type);
         info->data = 0;
 
         for_each_set_bit(i, &hash_opts, MVPP22_CLS_HEK_N_FIELDS) {
@@ -1097,10 +1450,10 @@ void mvpp22_port_rss_init(struct mvpp2_port *port)
         mvpp22_rss_fill_table(port, port->id);
 
         /* Configure default flows */
-        mvpp2_port_rss_hash_opts_set(port, IPV4_FLOW, MVPP22_CLS_HEK_IP4_2T);
-        mvpp2_port_rss_hash_opts_set(port, IPV6_FLOW, MVPP22_CLS_HEK_IP6_2T);
-        mvpp2_port_rss_hash_opts_set(port, TCP_V4_FLOW, MVPP22_CLS_HEK_IP4_5T);
-        mvpp2_port_rss_hash_opts_set(port, TCP_V6_FLOW, MVPP22_CLS_HEK_IP6_5T);
-        mvpp2_port_rss_hash_opts_set(port, UDP_V4_FLOW, MVPP22_CLS_HEK_IP4_5T);
-        mvpp2_port_rss_hash_opts_set(port, UDP_V6_FLOW, MVPP22_CLS_HEK_IP6_5T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_IP4, MVPP22_CLS_HEK_IP4_2T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_IP6, MVPP22_CLS_HEK_IP6_2T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_TCP4, MVPP22_CLS_HEK_IP4_5T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_TCP6, MVPP22_CLS_HEK_IP6_5T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_UDP4, MVPP22_CLS_HEK_IP4_5T);
+        mvpp2_port_rss_hash_opts_set(port, MVPP22_FLOW_UDP6, MVPP22_CLS_HEK_IP6_5T);
 }
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h
index 96304ffc5d49..56b617375a65 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h
@@ -92,6 +92,17 @@ enum mvpp22_cls_c2_fwd_action {
         MVPP22_C2_FWD_HW_LOW_LAT_LOCK,
 };
 
+enum mvpp22_cls_c2_color_action {
+        MVPP22_C2_COL_NO_UPD = 0,
+        MVPP22_C2_COL_NO_UPD_LOCK,
+        MVPP22_C2_COL_GREEN,
+        MVPP22_C2_COL_GREEN_LOCK,
+        MVPP22_C2_COL_YELLOW,
+        MVPP22_C2_COL_YELLOW_LOCK,
+        MVPP22_C2_COL_RED,              /* Drop */
+        MVPP22_C2_COL_RED_LOCK,         /* Drop */
+};
+
 #define MVPP2_CLS_C2_TCAM_WORDS                 5
 #define MVPP2_CLS_C2_ATTR_WORDS                 5
 
@@ -107,15 +118,36 @@ struct mvpp2_cls_c2_entry {
         u8 valid;
 };
 
+#define MVPP22_FLOW_ETHER_BIT   BIT(0)
+#define MVPP22_FLOW_IP4_BIT     BIT(1)
+#define MVPP22_FLOW_IP6_BIT     BIT(2)
+#define MVPP22_FLOW_TCP_BIT     BIT(3)
+#define MVPP22_FLOW_UDP_BIT     BIT(4)
+
+#define MVPP22_FLOW_TCP4        (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT | MVPP22_FLOW_TCP_BIT)
+#define MVPP22_FLOW_TCP6        (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT | MVPP22_FLOW_TCP_BIT)
+#define MVPP22_FLOW_UDP4        (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT | MVPP22_FLOW_UDP_BIT)
+#define MVPP22_FLOW_UDP6        (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT | MVPP22_FLOW_UDP_BIT)
+#define MVPP22_FLOW_IP4         (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP4_BIT)
+#define MVPP22_FLOW_IP6         (MVPP22_FLOW_ETHER_BIT | MVPP22_FLOW_IP6_BIT)
+#define MVPP22_FLOW_ETHERNET    (MVPP22_FLOW_ETHER_BIT)
+
 /* Classifier C2 engine entries */
 #define MVPP22_CLS_C2_N_ENTRIES         256
 
 /* Number of per-port dedicated entries in the C2 TCAM */
-#define MVPP22_CLS_C2_PORT_RANGE        8
+#define MVPP22_CLS_C2_PORT_N_FLOWS      MVPP2_N_RFS_ENTRIES_PER_FLOW
 
-#define MVPP22_CLS_C2_PORT_FIRST(p)     (MVPP22_CLS_C2_N_ENTRIES - \
-                                        ((p) * MVPP22_CLS_C2_PORT_RANGE))
-#define MVPP22_CLS_C2_RSS_ENTRY(p)      (MVPP22_CLS_C2_PORT_FIRST(p) - 1)
+/* Each port has oen range per flow type + one entry controling the global RSS
+ * setting and the default rx queue
+ */
+#define MVPP22_CLS_C2_PORT_RANGE        (MVPP22_CLS_C2_PORT_N_FLOWS + 1)
+#define MVPP22_CLS_C2_PORT_FIRST(p)     ((p) * MVPP22_CLS_C2_PORT_RANGE)
+#define MVPP22_CLS_C2_RSS_ENTRY(p)      (MVPP22_CLS_C2_PORT_FIRST((p) + 1) - 1)
+
+#define MVPP22_CLS_C2_PORT_FLOW_FIRST(p)        (MVPP22_CLS_C2_PORT_FIRST(p))
+
+#define MVPP22_CLS_C2_RFS_LOC(p, loc)   (MVPP22_CLS_C2_PORT_FLOW_FIRST(p) + (loc))
 
 /* Packet flow ID */
 enum mvpp2_prs_flow {
@@ -145,10 +177,6 @@ enum mvpp2_prs_flow {
         MVPP2_FL_LAST,
 };
 
-enum mvpp2_cls_lu_type {
-        MVPP2_CLS_LU_ALL = 0,
-};
-
 /* LU Type defined for all engines, and specified in the flow table */
 #define MVPP2_CLS_LU_TYPE_MASK                  0x3f
 
@@ -168,11 +196,16 @@ struct mvpp2_cls_flow {
         struct mvpp2_prs_result_info prs_ri;
 };
 
-#define MVPP2_CLS_FLT_ENTRIES_PER_FLOW          (MVPP2_MAX_PORTS + 1)
+#define MVPP2_CLS_FLT_ENTRIES_PER_FLOW          (MVPP2_MAX_PORTS + 1 + 16)
 #define MVPP2_CLS_FLT_FIRST(id)                 (((id) - MVPP2_FL_START) * \
                                                  MVPP2_CLS_FLT_ENTRIES_PER_FLOW)
-#define MVPP2_CLS_FLT_C2_RSS_ENTRY(id)          (MVPP2_CLS_FLT_FIRST(id))
-#define MVPP2_CLS_FLT_HASH_ENTRY(port, id)      (MVPP2_CLS_FLT_C2_RSS_ENTRY(id) + (port) + 1)
+
+#define MVPP2_CLS_FLT_C2_RFS(port, id, rfs_n)   (MVPP2_CLS_FLT_FIRST(id) + \
+                                                 ((port) * MVPP2_MAX_PORTS) + \
+                                                 (rfs_n))
+
+#define MVPP2_CLS_FLT_C2_RSS_ENTRY(id)          (MVPP2_CLS_FLT_C2_RFS(MVPP2_MAX_PORTS, id, 0))
+#define MVPP2_CLS_FLT_HASH_ENTRY(port, id)      (MVPP2_CLS_FLT_C2_RSS_ENTRY(id) + 1 + (port))
 #define MVPP2_CLS_FLT_LAST(id)                  (MVPP2_CLS_FLT_FIRST(id) + \
                                                  MVPP2_CLS_FLT_ENTRIES_PER_FLOW - 1)
 
@@ -199,6 +232,12 @@ struct mvpp2_cls_flow {
                         continue;                                             \
                 else
 
+#define for_each_cls_flow_id_containing_type(i, type)                         \
+        for_each_cls_flow_id((i))                                             \
+                if ((cls_flows[(i)].flow_type & (type)) != (type))            \
+                        continue;                                             \
+                else
+
 struct mvpp2_cls_flow_entry {
         u32 index;
         u32 data[MVPP2_CLS_FLOWS_TBL_DATA_WORDS];
@@ -246,4 +285,13 @@ u32 mvpp2_cls_c2_hit_count(struct mvpp2 *priv, int c2_index);
 void mvpp2_cls_c2_read(struct mvpp2 *priv, int index,
                        struct mvpp2_cls_c2_entry *c2);
 
+int mvpp2_ethtool_cls_rule_get(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *rxnfc);
+
+int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *info);
+
+int mvpp2_ethtool_cls_rule_del(struct mvpp2_port *port,
+                               struct ethtool_rxnfc *info);
+
 #endif
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index f128ea22b339..56d43d9b43ef 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -3937,7 +3937,7 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,
                                    struct ethtool_rxnfc *info, u32 *rules)
 {
         struct mvpp2_port *port = netdev_priv(dev);
-        int ret = 0;
+        int ret = 0, i, loc = 0;
 
         if (!mvpp22_rss_is_supported())
                 return -EOPNOTSUPP;
@@ -3949,6 +3949,18 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,
         case ETHTOOL_GRXRINGS:
                 info->data = port->nrxqs;
                 break;
+        case ETHTOOL_GRXCLSRLCNT:
+                info->rule_cnt = port->n_rfs_rules;
+                break;
+        case ETHTOOL_GRXCLSRULE:
+                ret = mvpp2_ethtool_cls_rule_get(port, info);
+                break;
+        case ETHTOOL_GRXCLSRLALL:
+                for (i = 0; i < MVPP2_N_RFS_RULES; i++) {
+                        if (port->rfs_rules[i])
+                                rules[loc++] = i;
+                }
+                break;
         default:
                 return -ENOTSUPP;
         }
@@ -3969,6 +3981,12 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev,
         case ETHTOOL_SRXFH:
                 ret = mvpp2_ethtool_rxfh_set(port, info);
                 break;
+        case ETHTOOL_SRXCLSRLINS:
+                ret = mvpp2_ethtool_cls_rule_ins(port, info);
+                break;
+        case ETHTOOL_SRXCLSRLDEL:
+                ret = mvpp2_ethtool_cls_rule_del(port, info);
+                break;
         default:
                 return -EOPNOTSUPP;
         }