net: dsa: sja1105: add packing ops for the Retagging Table

The Retagging Table is an optional feature that allows the switch to
match frames against a {ingress port, egress port, vid} rule and change
their VLAN ID. The retagged frames are by default clones of the original
ones (since the hardware-foreseen use case was to mirror traffic for
debugging purposes and to tag it with a special VLAN for this purpose),
but we can force the original frames to be dropped by removing the
pre-retagging VLAN from the port membership list of the egress port.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index 1dcaecab0912ac280ced5627f0a0ba0c08e3c46a..1ecdfd6be4c204cf6878afba3f9c9f516aa00499 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -328,6 +328,8 @@ size_t sja1105et_l2_lookup_entry_packing(void *buf, void *entry_ptr,
                                         enum packing_op op);
 size_t sja1105_vlan_lookup_entry_packing(void *buf, void *entry_ptr,
                                         enum packing_op op);
+size_t sja1105_retagging_entry_packing(void *buf, void *entry_ptr,
+                                      enum packing_op op);
 size_t sja1105pqrs_mac_config_entry_packing(void *buf, void *entry_ptr,
                                            enum packing_op op);
 size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr,

diff --git a/drivers/net/dsa/sja1105/sja1105_dynamic_config.c b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
index bdee0181196046ec5f46a890b3ef93cb239931cb..2a8fbd7fdedc883a0165b5aa10a5c0fdc3ea7da7 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
+++ b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
@@ -133,6 +133,9 @@
 #define SJA1105PQRS_SIZE_AVB_PARAMS_DYN_CMD                    \
        (SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY)
 
+#define SJA1105_SIZE_RETAGGING_DYN_CMD                         \
+       (SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_RETAGGING_ENTRY)
+
 #define SJA1105_MAX_DYN_CMD_SIZE                               \
        SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD
 
@@ -525,6 +528,20 @@ sja1105pqrs_avb_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,
        sja1105_packing(p, &cmd->rdwrset, 29, 29, size, op);
 }
 
+static void
+sja1105_retagging_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,
+                             enum packing_op op)
+{
+       u8 *p = buf + SJA1105_SIZE_RETAGGING_ENTRY;
+       const int size = SJA1105_SIZE_DYN_CMD;
+
+       sja1105_packing(p, &cmd->valid,    31, 31, size, op);
+       sja1105_packing(p, &cmd->errors,   30, 30, size, op);
+       sja1105_packing(p, &cmd->valident, 29, 29, size, op);
+       sja1105_packing(p, &cmd->rdwrset,  28, 28, size, op);
+       sja1105_packing(p, &cmd->index,     5,  0, size, op);
+}
+
 #define OP_READ                BIT(0)
 #define OP_WRITE       BIT(1)
 #define OP_DEL         BIT(2)
@@ -606,6 +623,14 @@ struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {
                .packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,
                .addr = 0x34,
        },
+       [BLK_IDX_RETAGGING] = {
+               .entry_packing = sja1105_retagging_entry_packing,
+               .cmd_packing = sja1105_retagging_cmd_packing,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+               .access = (OP_WRITE | OP_DEL),
+               .packed_size = SJA1105_SIZE_RETAGGING_DYN_CMD,
+               .addr = 0x31,
+       },
        [BLK_IDX_XMII_PARAMS] = {0},
 };
 
@@ -692,6 +717,14 @@ struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {
                .packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,
                .addr = 0x34,
        },
+       [BLK_IDX_RETAGGING] = {
+               .entry_packing = sja1105_retagging_entry_packing,
+               .cmd_packing = sja1105_retagging_cmd_packing,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+               .access = (OP_READ | OP_WRITE | OP_DEL),
+               .packed_size = SJA1105_SIZE_RETAGGING_DYN_CMD,
+               .addr = 0x38,
+       },
        [BLK_IDX_XMII_PARAMS] = {0},
 };
 

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c
index b68c9c92c2488f123c5fd6bb20d444a703fa2b2f..780aca034cdcea598d913b6125fdb7eebde9e500 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.c
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.c
@@ -541,6 +541,22 @@ static size_t sja1105_xmii_params_entry_packing(void *buf, void *entry_ptr,
        return size;
 }
 
+size_t sja1105_retagging_entry_packing(void *buf, void *entry_ptr,
+                                      enum packing_op op)
+{
+       struct sja1105_retagging_entry *entry = entry_ptr;
+       const size_t size = SJA1105_SIZE_RETAGGING_ENTRY;
+
+       sja1105_packing(buf, &entry->egr_port,       63, 59, size, op);
+       sja1105_packing(buf, &entry->ing_port,       58, 54, size, op);
+       sja1105_packing(buf, &entry->vlan_ing,       53, 42, size, op);
+       sja1105_packing(buf, &entry->vlan_egr,       41, 30, size, op);
+       sja1105_packing(buf, &entry->do_not_learn,   29, 29, size, op);
+       sja1105_packing(buf, &entry->use_dest_ports, 28, 28, size, op);
+       sja1105_packing(buf, &entry->destports,      27, 23, size, op);
+       return size;
+}
+
 size_t sja1105_table_header_packing(void *buf, void *entry_ptr,
                                    enum packing_op op)
 {
@@ -603,6 +619,7 @@ static u64 blk_id_map[BLK_IDX_MAX] = {
        [BLK_IDX_L2_FORWARDING_PARAMS] = BLKID_L2_FORWARDING_PARAMS,
        [BLK_IDX_AVB_PARAMS] = BLKID_AVB_PARAMS,
        [BLK_IDX_GENERAL_PARAMS] = BLKID_GENERAL_PARAMS,
+       [BLK_IDX_RETAGGING] = BLKID_RETAGGING,
        [BLK_IDX_XMII_PARAMS] = BLKID_XMII_PARAMS,
 };
 
@@ -646,7 +663,7 @@ static_config_check_memory_size(const struct sja1105_table *tables)
 {
        const struct sja1105_l2_forwarding_params_entry *l2_fwd_params;
        const struct sja1105_vl_forwarding_params_entry *vl_fwd_params;
-       int i, mem = 0;
+       int i, max_mem, mem = 0;
 
        l2_fwd_params = tables[BLK_IDX_L2_FORWARDING_PARAMS].entries;
 
@@ -659,7 +676,12 @@ static_config_check_memory_size(const struct sja1105_table *tables)
                        mem += vl_fwd_params->partspc[i];
        }
 
-       if (mem > SJA1105_MAX_FRAME_MEMORY)
+       if (tables[BLK_IDX_RETAGGING].entry_count)
+               max_mem = SJA1105_MAX_FRAME_MEMORY_RETAGGING;
+       else
+               max_mem = SJA1105_MAX_FRAME_MEMORY;
+
+       if (mem > max_mem)
                return SJA1105_OVERCOMMITTED_FRAME_MEMORY;
 
        return SJA1105_CONFIG_OK;
@@ -881,6 +903,12 @@ struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),
@@ -993,6 +1021,12 @@ struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),
@@ -1065,6 +1099,12 @@ struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),
@@ -1177,6 +1217,12 @@ struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),
@@ -1249,6 +1295,12 @@ struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),
@@ -1361,6 +1413,12 @@ struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {
                .packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,
                .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,
        },
+       [BLK_IDX_RETAGGING] = {
+               .packing = sja1105_retagging_entry_packing,
+               .unpacked_entry_size = sizeof(struct sja1105_retagging_entry),
+               .packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,
+               .max_entry_count = SJA1105_MAX_RETAGGING_COUNT,
+       },
        [BLK_IDX_XMII_PARAMS] = {
                .packing = sja1105_xmii_params_entry_packing,
                .unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.h b/drivers/net/dsa/sja1105/sja1105_static_config.h
index b569e3de35908b936f4fde19dc341c08ee58c198..d96044d86b11fec692a4c0ab9cbe73bc96e009ae 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.h
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.h
@@ -20,6 +20,7 @@
 #define SJA1105_SIZE_VLAN_LOOKUP_ENTRY                 8
 #define SJA1105_SIZE_L2_FORWARDING_ENTRY               8
 #define SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY                12
+#define SJA1105_SIZE_RETAGGING_ENTRY                   8
 #define SJA1105_SIZE_XMII_PARAMS_ENTRY                 4
 #define SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY             12
 #define SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY        4
@@ -54,6 +55,7 @@ enum {
        BLKID_L2_FORWARDING_PARAMS                      = 0x0E,
        BLKID_AVB_PARAMS                                = 0x10,
        BLKID_GENERAL_PARAMS                            = 0x11,
+       BLKID_RETAGGING                                 = 0x12,
        BLKID_XMII_PARAMS                               = 0x4E,
 };
 
@@ -75,6 +77,7 @@ enum sja1105_blk_idx {
        BLK_IDX_L2_FORWARDING_PARAMS,
        BLK_IDX_AVB_PARAMS,
        BLK_IDX_GENERAL_PARAMS,
+       BLK_IDX_RETAGGING,
        BLK_IDX_XMII_PARAMS,
        BLK_IDX_MAX,
        /* Fake block indices that are only valid for dynamic access */
@@ -99,10 +102,12 @@ enum sja1105_blk_idx {
 #define SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT             1
 #define SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT         1
 #define SJA1105_MAX_GENERAL_PARAMS_COUNT               1
+#define SJA1105_MAX_RETAGGING_COUNT                    32
 #define SJA1105_MAX_XMII_PARAMS_COUNT                  1
 #define SJA1105_MAX_AVB_PARAMS_COUNT                   1
 
 #define SJA1105_MAX_FRAME_MEMORY                       929
+#define SJA1105_MAX_FRAME_MEMORY_RETAGGING             910
 
 #define SJA1105E_DEVICE_ID                             0x9C00000Cull
 #define SJA1105T_DEVICE_ID                             0x9E00030Eull
@@ -273,6 +278,16 @@ struct sja1105_mac_config_entry {
        u64 ingress;
 };
 
+struct sja1105_retagging_entry {
+       u64 egr_port;
+       u64 ing_port;
+       u64 vlan_ing;
+       u64 vlan_egr;
+       u64 do_not_learn;
+       u64 use_dest_ports;
+       u64 destports;
+};
+
 struct sja1105_xmii_params_entry {
        u64 phy_mac[5];
        u64 xmii_mode[5];