net/mlx5: E-switch, move offloads mode callbacks to offloads file

eswitch.c is mainly for common code between legacy and offloads mode.
MAC address get and set via devlink is applicable only in offloads mode.

Hence, move it to eswitch_offloads.c file.

Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index c0526fc..ec5b164 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1690,65 +1690,6 @@ bool mlx5_esw_is_sf_vport(struct mlx5_eswitch *esw, u16 vport_num)
        return mlx5_esw_check_port_type(esw, vport_num, MLX5_ESW_VPT_SF);
 }
 
-static bool
-is_port_function_supported(struct mlx5_eswitch *esw, u16 vport_num)
-{
-       return vport_num == MLX5_VPORT_PF ||
-              mlx5_eswitch_is_vf_vport(esw, vport_num) ||
-              mlx5_esw_is_sf_vport(esw, vport_num);
-}
-
-int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port,
-                                          u8 *hw_addr, int *hw_addr_len,
-                                          struct netlink_ext_ack *extack)
-{
-       struct mlx5_eswitch *esw;
-       struct mlx5_vport *vport;
-       u16 vport_num;
-
-       esw = mlx5_devlink_eswitch_get(port->devlink);
-       if (IS_ERR(esw))
-               return PTR_ERR(esw);
-
-       vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
-       if (!is_port_function_supported(esw, vport_num))
-               return -EOPNOTSUPP;
-
-       vport = mlx5_eswitch_get_vport(esw, vport_num);
-       if (IS_ERR(vport)) {
-               NL_SET_ERR_MSG_MOD(extack, "Invalid port");
-               return PTR_ERR(vport);
-       }
-
-       mutex_lock(&esw->state_lock);
-       ether_addr_copy(hw_addr, vport->info.mac);
-       *hw_addr_len = ETH_ALEN;
-       mutex_unlock(&esw->state_lock);
-       return 0;
-}
-
-int mlx5_devlink_port_function_hw_addr_set(struct devlink_port *port,
-                                          const u8 *hw_addr, int hw_addr_len,
-                                          struct netlink_ext_ack *extack)
-{
-       struct mlx5_eswitch *esw;
-       u16 vport_num;
-
-       esw = mlx5_devlink_eswitch_get(port->devlink);
-       if (IS_ERR(esw)) {
-               NL_SET_ERR_MSG_MOD(extack, "Eswitch doesn't support set hw_addr");
-               return PTR_ERR(esw);
-       }
-
-       vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
-       if (!is_port_function_supported(esw, vport_num)) {
-               NL_SET_ERR_MSG_MOD(extack, "Port doesn't support set hw_addr");
-               return -EINVAL;
-       }
-
-       return mlx5_eswitch_set_vport_mac(esw, vport_num, hw_addr);
-}
-
 int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,
                                 u16 vport, int link_state)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index f4eaa58..4bd502a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -3862,3 +3862,62 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw,
        return vport->metadata;
 }
 EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_set);
+
+static bool
+is_port_function_supported(struct mlx5_eswitch *esw, u16 vport_num)
+{
+       return vport_num == MLX5_VPORT_PF ||
+              mlx5_eswitch_is_vf_vport(esw, vport_num) ||
+              mlx5_esw_is_sf_vport(esw, vport_num);
+}
+
+int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port,
+                                          u8 *hw_addr, int *hw_addr_len,
+                                          struct netlink_ext_ack *extack)
+{
+       struct mlx5_eswitch *esw;
+       struct mlx5_vport *vport;
+       u16 vport_num;
+
+       esw = mlx5_devlink_eswitch_get(port->devlink);
+       if (IS_ERR(esw))
+               return PTR_ERR(esw);
+
+       vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
+       if (!is_port_function_supported(esw, vport_num))
+               return -EOPNOTSUPP;
+
+       vport = mlx5_eswitch_get_vport(esw, vport_num);
+       if (IS_ERR(vport)) {
+               NL_SET_ERR_MSG_MOD(extack, "Invalid port");
+               return PTR_ERR(vport);
+       }
+
+       mutex_lock(&esw->state_lock);
+       ether_addr_copy(hw_addr, vport->info.mac);
+       *hw_addr_len = ETH_ALEN;
+       mutex_unlock(&esw->state_lock);
+       return 0;
+}
+
+int mlx5_devlink_port_function_hw_addr_set(struct devlink_port *port,
+                                          const u8 *hw_addr, int hw_addr_len,
+                                          struct netlink_ext_ack *extack)
+{
+       struct mlx5_eswitch *esw;
+       u16 vport_num;
+
+       esw = mlx5_devlink_eswitch_get(port->devlink);
+       if (IS_ERR(esw)) {
+               NL_SET_ERR_MSG_MOD(extack, "Eswitch doesn't support set hw_addr");
+               return PTR_ERR(esw);
+       }
+
+       vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
+       if (!is_port_function_supported(esw, vport_num)) {
+               NL_SET_ERR_MSG_MOD(extack, "Port doesn't support set hw_addr");
+               return -EINVAL;
+       }
+
+       return mlx5_eswitch_set_vport_mac(esw, vport_num, hw_addr);
+}