mlxsw: core: Add support for EMAD string TLV parsing

During parsing of incoming EMADs, fill the string TLV's offset when it is
used.

Signed-off-by: Shalom Toledo <shalomt@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index a50a36f9584b6d00602df6aaa020786a2ef5b991..d834bdc632ef273c7eaec5c4940eea9b1e1c6f1d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -382,17 +382,32 @@ static void mlxsw_emad_construct(struct sk_buff *skb,
 
 struct mlxsw_emad_tlv_offsets {
        u16 op_tlv;
+       u16 string_tlv;
        u16 reg_tlv;
 };
 
+static bool mlxsw_emad_tlv_is_string_tlv(const char *tlv)
+{
+       u8 tlv_type = mlxsw_emad_string_tlv_type_get(tlv);
+
+       return tlv_type == MLXSW_EMAD_TLV_TYPE_STRING;
+}
+
 static void mlxsw_emad_tlv_parse(struct sk_buff *skb)
 {
        struct mlxsw_emad_tlv_offsets *offsets =
                (struct mlxsw_emad_tlv_offsets *) skb->cb;
 
        offsets->op_tlv = MLXSW_EMAD_ETH_HDR_LEN;
+       offsets->string_tlv = 0;
        offsets->reg_tlv = MLXSW_EMAD_ETH_HDR_LEN +
                           MLXSW_EMAD_OP_TLV_LEN * sizeof(u32);
+
+       /* If string TLV is present, it must come after the operation TLV. */
+       if (mlxsw_emad_tlv_is_string_tlv(skb->data + offsets->reg_tlv)) {
+               offsets->string_tlv = offsets->reg_tlv;
+               offsets->reg_tlv += MLXSW_EMAD_STRING_TLV_LEN * sizeof(u32);
+       }
 }
 
 static char *mlxsw_emad_op_tlv(const struct sk_buff *skb)