net: mscc: ocelot: add definitions for VCAP ES0 keys, actions and target

As a preparation step for the offloading to ES0, let's create the
infrastructure for talking with this hardware block.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/mips/boot/dts/mscc/ocelot.dtsi b/arch/mips/boot/dts/mscc/ocelot.dtsi
index 70c74860b82271ef0c66bd223236109dbebe050b..535a98284dcb56663d7ee85241a199a5f161eddc 100644 (file)
--- a/arch/mips/boot/dts/mscc/ocelot.dtsi
+++ b/arch/mips/boot/dts/mscc/ocelot.dtsi
@@ -134,12 +134,13 @@
                              <0x1280000 0x100>,
                              <0x1800000 0x80000>,
                              <0x1880000 0x10000>,
+                             <0x1040000 0x10000>,
                              <0x1050000 0x10000>,
                              <0x1060000 0x10000>;
                        reg-names = "sys", "rew", "qs", "ptp", "port0", "port1",
                                    "port2", "port3", "port4", "port5", "port6",
                                    "port7", "port8", "port9", "port10", "qsys",
-                                   "ana", "s1", "s2";
+                                   "ana", "s0", "s1", "s2";
                        interrupts = <18 21 22>;
                        interrupt-names = "ptp_rdy", "xtr", "inj";
 

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 5ca0ce23d32a7aed1758af7c495a75869fc2aa95..e3e961e299c43449d5d451736ef8ec90687973fe 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -361,6 +361,7 @@ static const u32 *vsc9959_regmap[TARGET_MAX] = {
        [QSYS]  = vsc9959_qsys_regmap,
        [REW]   = vsc9959_rew_regmap,
        [SYS]   = vsc9959_sys_regmap,
+       [S0]    = vsc9959_vcap_regmap,
        [S1]    = vsc9959_vcap_regmap,
        [S2]    = vsc9959_vcap_regmap,
        [PTP]   = vsc9959_ptp_regmap,
@@ -395,6 +396,11 @@ static const struct resource vsc9959_target_io_res[TARGET_MAX] = {
                .end    = 0x001ffff,
                .name   = "sys",
        },
+       [S0] = {
+               .start  = 0x0040000,
+               .end    = 0x00403ff,
+               .name   = "s0",
+       },
        [S1] = {
                .start  = 0x0050000,
                .end    = 0x00503ff,
@@ -604,6 +610,38 @@ static const struct ocelot_stat_layout vsc9959_stats_layout[] = {
        { .offset = 0x111,      .name = "drop_green_prio_7", },
 };
 
+static const struct vcap_field vsc9959_vcap_es0_keys[] = {
+       [VCAP_ES0_EGR_PORT]                     = {  0,  3},
+       [VCAP_ES0_IGR_PORT]                     = {  3,  3},
+       [VCAP_ES0_RSV]                          = {  6,  2},
+       [VCAP_ES0_L2_MC]                        = {  8,  1},
+       [VCAP_ES0_L2_BC]                        = {  9,  1},
+       [VCAP_ES0_VID]                          = { 10, 12},
+       [VCAP_ES0_DP]                           = { 22,  1},
+       [VCAP_ES0_PCP]                          = { 23,  3},
+};
+
+static const struct vcap_field vsc9959_vcap_es0_actions[] = {
+       [VCAP_ES0_ACT_PUSH_OUTER_TAG]           = {  0,  2},
+       [VCAP_ES0_ACT_PUSH_INNER_TAG]           = {  2,  1},
+       [VCAP_ES0_ACT_TAG_A_TPID_SEL]           = {  3,  2},
+       [VCAP_ES0_ACT_TAG_A_VID_SEL]            = {  5,  1},
+       [VCAP_ES0_ACT_TAG_A_PCP_SEL]            = {  6,  2},
+       [VCAP_ES0_ACT_TAG_A_DEI_SEL]            = {  8,  2},
+       [VCAP_ES0_ACT_TAG_B_TPID_SEL]           = { 10,  2},
+       [VCAP_ES0_ACT_TAG_B_VID_SEL]            = { 12,  1},
+       [VCAP_ES0_ACT_TAG_B_PCP_SEL]            = { 13,  2},
+       [VCAP_ES0_ACT_TAG_B_DEI_SEL]            = { 15,  2},
+       [VCAP_ES0_ACT_VID_A_VAL]                = { 17, 12},
+       [VCAP_ES0_ACT_PCP_A_VAL]                = { 29,  3},
+       [VCAP_ES0_ACT_DEI_A_VAL]                = { 32,  1},
+       [VCAP_ES0_ACT_VID_B_VAL]                = { 33, 12},
+       [VCAP_ES0_ACT_PCP_B_VAL]                = { 45,  3},
+       [VCAP_ES0_ACT_DEI_B_VAL]                = { 48,  1},
+       [VCAP_ES0_ACT_RSV]                      = { 49, 23},
+       [VCAP_ES0_ACT_HIT_STICKY]               = { 72,  1},
+};
+
 static const struct vcap_field vsc9959_vcap_is1_keys[] = {
        [VCAP_IS1_HK_TYPE]                      = {  0,   1},
        [VCAP_IS1_HK_LOOKUP]                    = {  1,   2},
@@ -777,6 +815,18 @@ static struct vcap_field vsc9959_vcap_is2_actions[] = {
 };
 
 static const struct vcap_props vsc9959_vcap_props[] = {
+       [VCAP_ES0] = {
+               .action_type_width = 0,
+               .action_table = {
+                       [ES0_ACTION_TYPE_NORMAL] = {
+                               .width = 72, /* HIT_STICKY not included */
+                               .count = 1,
+                       },
+               },
+               .target = S0,
+               .keys = vsc9959_vcap_es0_keys,
+               .actions = vsc9959_vcap_es0_actions,
+       },
        [VCAP_IS1] = {
                .action_type_width = 0,
                .action_table = {

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 2b19c7912a9dab4d90a41c8f59aefbcc66c1f96b..67336a59ee8e792ec788bc9bd9e153cfba059459 100644 (file)
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -354,6 +354,7 @@ static const u32 *vsc9953_regmap[TARGET_MAX] = {
        [QSYS]          = vsc9953_qsys_regmap,
        [REW]           = vsc9953_rew_regmap,
        [SYS]           = vsc9953_sys_regmap,
+       [S0]            = vsc9953_vcap_regmap,
        [S1]            = vsc9953_vcap_regmap,
        [S2]            = vsc9953_vcap_regmap,
        [GCB]           = vsc9953_gcb_regmap,
@@ -387,6 +388,11 @@ static const struct resource vsc9953_target_io_res[TARGET_MAX] = {
                .end    = 0x001ffff,
                .name   = "sys",
        },
+       [S0] = {
+               .start  = 0x0040000,
+               .end    = 0x00403ff,
+               .name   = "s0",
+       },
        [S1] = {
                .start  = 0x0050000,
                .end    = 0x00503ff,
@@ -607,6 +613,38 @@ static const struct ocelot_stat_layout vsc9953_stats_layout[] = {
        { .offset = 0x91,       .name = "drop_green_prio_7", },
 };
 
+static const struct vcap_field vsc9953_vcap_es0_keys[] = {
+       [VCAP_ES0_EGR_PORT]                     = {  0,  4},
+       [VCAP_ES0_IGR_PORT]                     = {  4,  4},
+       [VCAP_ES0_RSV]                          = {  8,  2},
+       [VCAP_ES0_L2_MC]                        = { 10,  1},
+       [VCAP_ES0_L2_BC]                        = { 11,  1},
+       [VCAP_ES0_VID]                          = { 12, 12},
+       [VCAP_ES0_DP]                           = { 24,  1},
+       [VCAP_ES0_PCP]                          = { 25,  3},
+};
+
+static const struct vcap_field vsc9953_vcap_es0_actions[] = {
+       [VCAP_ES0_ACT_PUSH_OUTER_TAG]           = {  0,  2},
+       [VCAP_ES0_ACT_PUSH_INNER_TAG]           = {  2,  1},
+       [VCAP_ES0_ACT_TAG_A_TPID_SEL]           = {  3,  2},
+       [VCAP_ES0_ACT_TAG_A_VID_SEL]            = {  5,  1},
+       [VCAP_ES0_ACT_TAG_A_PCP_SEL]            = {  6,  2},
+       [VCAP_ES0_ACT_TAG_A_DEI_SEL]            = {  8,  2},
+       [VCAP_ES0_ACT_TAG_B_TPID_SEL]           = { 10,  2},
+       [VCAP_ES0_ACT_TAG_B_VID_SEL]            = { 12,  1},
+       [VCAP_ES0_ACT_TAG_B_PCP_SEL]            = { 13,  2},
+       [VCAP_ES0_ACT_TAG_B_DEI_SEL]            = { 15,  2},
+       [VCAP_ES0_ACT_VID_A_VAL]                = { 17, 12},
+       [VCAP_ES0_ACT_PCP_A_VAL]                = { 29,  3},
+       [VCAP_ES0_ACT_DEI_A_VAL]                = { 32,  1},
+       [VCAP_ES0_ACT_VID_B_VAL]                = { 33, 12},
+       [VCAP_ES0_ACT_PCP_B_VAL]                = { 45,  3},
+       [VCAP_ES0_ACT_DEI_B_VAL]                = { 48,  1},
+       [VCAP_ES0_ACT_RSV]                      = { 49, 24},
+       [VCAP_ES0_ACT_HIT_STICKY]               = { 73,  1},
+};
+
 static const struct vcap_field vsc9953_vcap_is1_keys[] = {
        [VCAP_IS1_HK_TYPE]                      = {  0,   1},
        [VCAP_IS1_HK_LOOKUP]                    = {  1,   2},
@@ -767,6 +805,18 @@ static struct vcap_field vsc9953_vcap_is2_actions[] = {
 };
 
 static const struct vcap_props vsc9953_vcap_props[] = {
+       [VCAP_ES0] = {
+               .action_type_width = 0,
+               .action_table = {
+                       [ES0_ACTION_TYPE_NORMAL] = {
+                               .width = 73, /* HIT_STICKY not included */
+                               .count = 1,
+                       },
+               },
+               .target = S0,
+               .keys = vsc9953_vcap_es0_keys,
+               .actions = vsc9953_vcap_es0_actions,
+       },
        [VCAP_IS1] = {
                .action_type_width = 0,
                .action_table = {

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 4bb3f7f620298008c74266eb1e699ff0ddc7922c..86f8b77decf5e35e21924ada68fed7567b094315 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -758,6 +758,38 @@ static const struct ocelot_ops ocelot_ops = {
        .wm_enc                 = ocelot_wm_enc,
 };
 
+static const struct vcap_field vsc7514_vcap_es0_keys[] = {
+       [VCAP_ES0_EGR_PORT]                     = {  0,  4},
+       [VCAP_ES0_IGR_PORT]                     = {  4,  4},
+       [VCAP_ES0_RSV]                          = {  8,  2},
+       [VCAP_ES0_L2_MC]                        = { 10,  1},
+       [VCAP_ES0_L2_BC]                        = { 11,  1},
+       [VCAP_ES0_VID]                          = { 12, 12},
+       [VCAP_ES0_DP]                           = { 24,  1},
+       [VCAP_ES0_PCP]                          = { 25,  3},
+};
+
+static const struct vcap_field vsc7514_vcap_es0_actions[] = {
+       [VCAP_ES0_ACT_PUSH_OUTER_TAG]           = {  0,  2},
+       [VCAP_ES0_ACT_PUSH_INNER_TAG]           = {  2,  1},
+       [VCAP_ES0_ACT_TAG_A_TPID_SEL]           = {  3,  2},
+       [VCAP_ES0_ACT_TAG_A_VID_SEL]            = {  5,  1},
+       [VCAP_ES0_ACT_TAG_A_PCP_SEL]            = {  6,  2},
+       [VCAP_ES0_ACT_TAG_A_DEI_SEL]            = {  8,  2},
+       [VCAP_ES0_ACT_TAG_B_TPID_SEL]           = { 10,  2},
+       [VCAP_ES0_ACT_TAG_B_VID_SEL]            = { 12,  1},
+       [VCAP_ES0_ACT_TAG_B_PCP_SEL]            = { 13,  2},
+       [VCAP_ES0_ACT_TAG_B_DEI_SEL]            = { 15,  2},
+       [VCAP_ES0_ACT_VID_A_VAL]                = { 17, 12},
+       [VCAP_ES0_ACT_PCP_A_VAL]                = { 29,  3},
+       [VCAP_ES0_ACT_DEI_A_VAL]                = { 32,  1},
+       [VCAP_ES0_ACT_VID_B_VAL]                = { 33, 12},
+       [VCAP_ES0_ACT_PCP_B_VAL]                = { 45,  3},
+       [VCAP_ES0_ACT_DEI_B_VAL]                = { 48,  1},
+       [VCAP_ES0_ACT_RSV]                      = { 49, 24},
+       [VCAP_ES0_ACT_HIT_STICKY]               = { 73,  1},
+};
+
 static const struct vcap_field vsc7514_vcap_is1_keys[] = {
        [VCAP_IS1_HK_TYPE]                      = {  0,   1},
        [VCAP_IS1_HK_LOOKUP]                    = {  1,   2},
@@ -932,6 +964,18 @@ static const struct vcap_field vsc7514_vcap_is2_actions[] = {
 };
 
 static const struct vcap_props vsc7514_vcap_props[] = {
+       [VCAP_ES0] = {
+               .action_type_width = 0,
+               .action_table = {
+                       [ES0_ACTION_TYPE_NORMAL] = {
+                               .width = 73, /* HIT_STICKY not included */
+                               .count = 1,
+                       },
+               },
+               .target = S0,
+               .keys = vsc7514_vcap_es0_keys,
+               .actions = vsc7514_vcap_es0_actions,
+       },
        [VCAP_IS1] = {
                .action_type_width = 0,
                .action_table = {
@@ -1129,6 +1173,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
                { QSYS, "qsys" },
                { ANA, "ana" },
                { QS, "qs" },
+               { S0, "s0" },
                { S1, "s1" },
                { S2, "s2" },
                { PTP, "ptp", 1 },

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index d0073c94e22a33c35963e555c516e3b08a324145..b0a9efce8813b32e41342d7c76fd56c09bd3dc00 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -123,6 +123,7 @@ enum ocelot_target {
        QSYS,
        REW,
        SYS,
+       S0,
        S1,
        S2,
        HSIO,

diff --git a/include/soc/mscc/ocelot_vcap.h b/include/soc/mscc/ocelot_vcap.h
index 7ac1840472929f7041f716b691cc920318165135..707e609ec9197890ceb2c0f3465e2ec0d53eb1e4 100644 (file)
--- a/include/soc/mscc/ocelot_vcap.h
+++ b/include/soc/mscc/ocelot_vcap.h
@@ -14,9 +14,9 @@
  */
 
 enum {
+       VCAP_ES0,
        VCAP_IS1,
        VCAP_IS2,
-       /* VCAP_ES0, */
 };
 
 struct vcap_props {
@@ -355,4 +355,46 @@ enum vcap_is1_action_field {
        VCAP_IS1_ACT_HIT_STICKY,
 };
 
+/* =================================================================
+ *  VCAP ES0
+ * =================================================================
+ */
+
+enum {
+       ES0_ACTION_TYPE_NORMAL,
+       ES0_ACTION_TYPE_MAX,
+};
+
+enum vcap_es0_key_field {
+       VCAP_ES0_EGR_PORT,
+       VCAP_ES0_IGR_PORT,
+       VCAP_ES0_RSV,
+       VCAP_ES0_L2_MC,
+       VCAP_ES0_L2_BC,
+       VCAP_ES0_VID,
+       VCAP_ES0_DP,
+       VCAP_ES0_PCP,
+};
+
+enum vcap_es0_action_field {
+       VCAP_ES0_ACT_PUSH_OUTER_TAG,
+       VCAP_ES0_ACT_PUSH_INNER_TAG,
+       VCAP_ES0_ACT_TAG_A_TPID_SEL,
+       VCAP_ES0_ACT_TAG_A_VID_SEL,
+       VCAP_ES0_ACT_TAG_A_PCP_SEL,
+       VCAP_ES0_ACT_TAG_A_DEI_SEL,
+       VCAP_ES0_ACT_TAG_B_TPID_SEL,
+       VCAP_ES0_ACT_TAG_B_VID_SEL,
+       VCAP_ES0_ACT_TAG_B_PCP_SEL,
+       VCAP_ES0_ACT_TAG_B_DEI_SEL,
+       VCAP_ES0_ACT_VID_A_VAL,
+       VCAP_ES0_ACT_PCP_A_VAL,
+       VCAP_ES0_ACT_DEI_A_VAL,
+       VCAP_ES0_ACT_VID_B_VAL,
+       VCAP_ES0_ACT_PCP_B_VAL,
+       VCAP_ES0_ACT_DEI_B_VAL,
+       VCAP_ES0_ACT_RSV,
+       VCAP_ES0_ACT_HIT_STICKY,
+};
+
 #endif /* _OCELOT_VCAP_H_ */