cxgb4: add tc flower support for ETH-SMAC rewrite

Adds support for ETH-SMAC rewrite via TC-PEDIT action.

Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index 7c8b0c65934c6244e3d95ae77eb43db997df6984..34d67a2a86f4e5fc0ed6b9ad68e52469594bd2a6 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -45,6 +45,8 @@
 struct ch_tc_pedit_fields pedits[] = {
        PEDIT_FIELDS(ETH_, DMAC_31_0, 4, dmac, 0),
        PEDIT_FIELDS(ETH_, DMAC_47_32, 2, dmac, 4),
+       PEDIT_FIELDS(ETH_, SMAC_15_0, 2, smac, 0),
+       PEDIT_FIELDS(ETH_, SMAC_47_16, 4, smac, 2),
 };
 
 static struct ch_tc_flower_entry *allocate_flower_entry(void)
@@ -291,6 +293,13 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val,
                case PEDIT_ETH_DMAC_47_32_SMAC_15_0:
                        if (~mask & PEDIT_ETH_DMAC_MASK)
                                offload_pedit(fs, val, mask, ETH_DMAC_47_32);
+                       else
+                               offload_pedit(fs, val >> 16, mask >> 16,
+                                             ETH_SMAC_15_0);
+                       break;
+               case PEDIT_ETH_SMAC_47_16:
+                       fs->newsmac = 1;
+                       offload_pedit(fs, val, mask, ETH_SMAC_47_16);
                }
        }
 }
@@ -440,6 +449,7 @@ static int cxgb4_validate_flow_actions(struct net_device *dev,
                                        switch (offset) {
                                        case PEDIT_ETH_DMAC_31_0:
                                        case PEDIT_ETH_DMAC_47_32_SMAC_15_0:
+                                       case PEDIT_ETH_SMAC_47_16:
                                                break;
                                        default:
                                                netdev_err(dev, "%s: Unsupported pedit field\n",

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
index 7bf6cfa892aa943ffc9e69a6b0aab4e857a4b096..a2acb782918f1584ced33942c3dced4d0e8209a9 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
@@ -57,6 +57,8 @@ struct ch_tc_flower_entry {
 enum {
        ETH_DMAC_31_0,  /* dmac bits 0.. 31 */
        ETH_DMAC_47_32, /* dmac bits 32..47 */
+       ETH_SMAC_15_0,  /* smac bits 0.. 15 */
+       ETH_SMAC_47_16, /* smac bits 16..47 */
 };
 
 struct ch_tc_pedit_fields {
@@ -72,6 +74,7 @@ struct ch_tc_pedit_fields {
 #define PEDIT_ETH_DMAC_MASK            0xffff
 #define PEDIT_ETH_DMAC_31_0            0x0
 #define PEDIT_ETH_DMAC_47_32_SMAC_15_0 0x4
+#define PEDIT_ETH_SMAC_47_16           0x8
 
 int cxgb4_tc_flower_replace(struct net_device *dev,
                            struct tc_cls_flower_offload *cls);