net/mlx5e: Support configurable MTU for vport representors

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_main.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 9b19863b059d2aeb20c4637bd246f70abfc25ed1..ab7b2a4e6edc22315625b47e52f8b616f9247278 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2633,15 +2633,21 @@ static void mlx5e_netdev_set_tcs(struct net_device *netdev)
                netdev_set_tc_queue(netdev, tc, nch, 0);
 }
 
-static void mlx5e_build_channels_tx_maps(struct mlx5e_priv *priv)
+static void mlx5e_build_tc2txq_maps(struct mlx5e_priv *priv)
 {
-       struct mlx5e_channel *c;
-       struct mlx5e_txqsq *sq;
+       int max_nch = priv->profile->max_nch(priv->mdev);
        int i, tc;
 
-       for (i = 0; i < priv->profile->max_nch(priv->mdev); i++)
+       for (i = 0; i < max_nch; i++)
                for (tc = 0; tc < priv->profile->max_tc; tc++)
-                       priv->channel_tc2txq[i][tc] = i + tc * priv->channels.num;
+                       priv->channel_tc2txq[i][tc] = i + tc * max_nch;
+}
+
+static void mlx5e_build_tx2sq_maps(struct mlx5e_priv *priv)
+{
+       struct mlx5e_channel *c;
+       struct mlx5e_txqsq *sq;
+       int i, tc;
 
        for (i = 0; i < priv->channels.num; i++) {
                c = priv->channels.c[i];
@@ -2661,11 +2667,8 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv)
        netif_set_real_num_tx_queues(netdev, num_txqs);
        netif_set_real_num_rx_queues(netdev, priv->channels.num);
 
-       mlx5e_build_channels_tx_maps(priv);
+       mlx5e_build_tx2sq_maps(priv);
        mlx5e_activate_channels(&priv->channels);
-       write_lock(&priv->stats_lock);
-       priv->channels_active = true;
-       write_unlock(&priv->stats_lock);
        netif_tx_start_all_queues(priv->netdev);
 
        if (MLX5_VPORT_MANAGER(priv->mdev))
@@ -2687,9 +2690,6 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv)
         */
        netif_tx_stop_all_queues(priv->netdev);
        netif_tx_disable(priv->netdev);
-       write_lock(&priv->stats_lock);
-       priv->channels_active = false;
-       write_unlock(&priv->stats_lock);
        mlx5e_deactivate_channels(&priv->channels);
 }
 
@@ -3495,7 +3495,8 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
        return features;
 }
 
-static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
+int mlx5e_change_mtu(struct net_device *netdev, int new_mtu,
+                    change_hw_mtu_cb set_mtu_cb)
 {
        struct mlx5e_priv *priv = netdev_priv(netdev);
        struct mlx5e_channels new_channels = {};
@@ -3522,7 +3523,7 @@ static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
 
        if (!reset) {
                params->sw_mtu = new_mtu;
-               mlx5e_set_dev_port_mtu(priv);
+               set_mtu_cb(priv);
                netdev->mtu = params->sw_mtu;
                goto out;
        }
@@ -3531,7 +3532,7 @@ static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
        if (err)
                goto out;
 
-       mlx5e_switch_priv_channels(priv, &new_channels, mlx5e_set_dev_port_mtu);
+       mlx5e_switch_priv_channels(priv, &new_channels, set_mtu_cb);
        netdev->mtu = new_channels.params.sw_mtu;
 
 out:
@@ -3539,6 +3540,11 @@ out:
        return err;
 }
 
+static int mlx5e_change_nic_mtu(struct net_device *netdev, int new_mtu)
+{
+       return mlx5e_change_mtu(netdev, new_mtu, mlx5e_set_dev_port_mtu);
+}
+
 int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)
 {
        struct hwtstamp_config config;
@@ -4033,7 +4039,7 @@ static const struct net_device_ops mlx5e_netdev_ops = {
        .ndo_vlan_rx_kill_vid    = mlx5e_vlan_rx_kill_vid,
        .ndo_set_features        = mlx5e_set_features,
        .ndo_fix_features        = mlx5e_fix_features,
-       .ndo_change_mtu          = mlx5e_change_mtu,
+       .ndo_change_mtu          = mlx5e_change_nic_mtu,
        .ndo_do_ioctl            = mlx5e_ioctl,
        .ndo_set_tx_maxrate      = mlx5e_set_tx_maxrate,
        .ndo_udp_tunnel_add      = mlx5e_add_vxlan_port,
@@ -4263,7 +4269,6 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev,
                               profile->max_nch(mdev), netdev->mtu);
 
        mutex_init(&priv->state_lock);
-       rwlock_init(&priv->stats_lock);
 
        INIT_WORK(&priv->update_carrier_work, mlx5e_update_carrier_work);
        INIT_WORK(&priv->set_rx_mode_work, mlx5e_set_rx_mode_work);
@@ -4446,6 +4451,7 @@ static void mlx5e_nic_init(struct mlx5_core_dev *mdev,
        if (err)
                mlx5_core_err(mdev, "TLS initialization failed, %d\n", err);
        mlx5e_build_nic_netdev(netdev);
+       mlx5e_build_tc2txq_maps(priv);
        mlx5e_vxlan_init(priv);
 }