mlxsw: reg: Add definition of LAG unicast record for SFD register

LAG-related records have specific format in SFD register.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 049abbb8bcc2422450919bd159e55ff84803c348..431b28e2b42062644d59440dfbe8183a3ec6d308 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -286,6 +286,7 @@ MLXSW_ITEM32_INDEXED(reg, sfd, rec_swid, MLXSW_REG_SFD_BASE_LEN, 24, 8,
 
 enum mlxsw_reg_sfd_rec_type {
        MLXSW_REG_SFD_REC_TYPE_UNICAST = 0x0,
+       MLXSW_REG_SFD_REC_TYPE_UNICAST_LAG = 0x1,
 };
 
 /* reg_sfd_rec_type
@@ -376,24 +377,34 @@ MLXSW_ITEM32_INDEXED(reg, sfd, uc_fid_vid, MLXSW_REG_SFD_BASE_LEN, 0, 16,
 MLXSW_ITEM32_INDEXED(reg, sfd, uc_system_port, MLXSW_REG_SFD_BASE_LEN, 0, 16,
                     MLXSW_REG_SFD_REC_LEN, 0x0C, false);
 
-static inline void mlxsw_reg_sfd_uc_pack(char *payload, int rec_index,
-                                        enum mlxsw_reg_sfd_rec_policy policy,
-                                        const char *mac, u16 vid,
-                                        enum mlxsw_reg_sfd_rec_action action,
-                                        u8 local_port)
+static inline void mlxsw_reg_sfd_rec_pack(char *payload, int rec_index,
+                                         enum mlxsw_reg_sfd_rec_type rec_type,
+                                         enum mlxsw_reg_sfd_rec_policy policy,
+                                         const char *mac,
+                                         enum mlxsw_reg_sfd_rec_action action)
 {
        u8 num_rec = mlxsw_reg_sfd_num_rec_get(payload);
 
        if (rec_index >= num_rec)
                mlxsw_reg_sfd_num_rec_set(payload, rec_index + 1);
        mlxsw_reg_sfd_rec_swid_set(payload, rec_index, 0);
-       mlxsw_reg_sfd_rec_type_set(payload, rec_index,
-                                  MLXSW_REG_SFD_REC_TYPE_UNICAST);
+       mlxsw_reg_sfd_rec_type_set(payload, rec_index, rec_type);
        mlxsw_reg_sfd_rec_policy_set(payload, rec_index, policy);
        mlxsw_reg_sfd_rec_mac_memcpy_to(payload, rec_index, mac);
+       mlxsw_reg_sfd_rec_action_set(payload, rec_index, action);
+}
+
+static inline void mlxsw_reg_sfd_uc_pack(char *payload, int rec_index,
+                                        enum mlxsw_reg_sfd_rec_policy policy,
+                                        const char *mac, u16 vid,
+                                        enum mlxsw_reg_sfd_rec_action action,
+                                        u8 local_port)
+{
+       mlxsw_reg_sfd_rec_pack(payload, rec_index,
+                              MLXSW_REG_SFD_REC_TYPE_UNICAST,
+                              policy, mac, action);
        mlxsw_reg_sfd_uc_sub_port_set(payload, rec_index, 0);
        mlxsw_reg_sfd_uc_fid_vid_set(payload, rec_index, vid);
-       mlxsw_reg_sfd_rec_action_set(payload, rec_index, action);
        mlxsw_reg_sfd_uc_system_port_set(payload, rec_index, local_port);
 }
 
@@ -406,6 +417,58 @@ static inline void mlxsw_reg_sfd_uc_unpack(char *payload, int rec_index,
        *p_local_port = mlxsw_reg_sfd_uc_system_port_get(payload, rec_index);
 }
 
+/* reg_sfd_uc_lag_sub_port
+ * LAG sub port.
+ * Must be 0 if multichannel VEPA is not enabled.
+ * Access: RW
+ */
+MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_sub_port, MLXSW_REG_SFD_BASE_LEN, 16, 8,
+                    MLXSW_REG_SFD_REC_LEN, 0x08, false);
+
+/* reg_sfd_uc_lag_fid_vid
+ * Filtering ID or VLAN ID
+ * For SwitchX and SwitchX-2:
+ * - Dynamic entries (policy 2,3) use FID
+ * - Static entries (policy 0) use VID
+ * - When independent learning is configured, VID=FID
+ * For Spectrum: use FID for both Dynamic and Static entries.
+ * VID should not be used.
+ * Access: Index
+ */
+MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_fid_vid, MLXSW_REG_SFD_BASE_LEN, 0, 16,
+                    MLXSW_REG_SFD_REC_LEN, 0x08, false);
+
+/* reg_sfd_uc_lag_lag_id
+ * LAG Identifier - pointer into the LAG descriptor table.
+ * Access: RW
+ */
+MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_lag_id, MLXSW_REG_SFD_BASE_LEN, 0, 10,
+                    MLXSW_REG_SFD_REC_LEN, 0x0C, false);
+
+static inline void
+mlxsw_reg_sfd_uc_lag_pack(char *payload, int rec_index,
+                         enum mlxsw_reg_sfd_rec_policy policy,
+                         const char *mac, u16 vid,
+                         enum mlxsw_reg_sfd_rec_action action,
+                         u16 lag_id)
+{
+       mlxsw_reg_sfd_rec_pack(payload, rec_index,
+                              MLXSW_REG_SFD_REC_TYPE_UNICAST_LAG,
+                              policy, mac, action);
+       mlxsw_reg_sfd_uc_lag_sub_port_set(payload, rec_index, 0);
+       mlxsw_reg_sfd_uc_lag_fid_vid_set(payload, rec_index, vid);
+       mlxsw_reg_sfd_uc_lag_lag_id_set(payload, rec_index, lag_id);
+}
+
+static inline void mlxsw_reg_sfd_uc_lag_unpack(char *payload, int rec_index,
+                                              char *mac, u16 *p_vid,
+                                              u16 *p_lag_id)
+{
+       mlxsw_reg_sfd_rec_mac_memcpy_from(payload, rec_index, mac);
+       *p_vid = mlxsw_reg_sfd_uc_lag_fid_vid_get(payload, rec_index);
+       *p_lag_id = mlxsw_reg_sfd_uc_lag_lag_id_get(payload, rec_index);
+}
+
 /* SFN - Switch FDB Notification Register
  * -------------------------------------------
  * The switch provides notifications on newly learned FDB entries and