net/mlx4_core: Add immediate activate for VGT->VST->VGT

Allow immediate activate of VGT->VST and VST->VGT transitions, without
the need of rebinding in mlx4_master_immediate_activate_vlan_qos().

Also in struct res_qp: add qp parameters (vlan_index,fvl,vlan_cntrol..)
to the saved set, in order to restore when move to VGT.
 - Clear at mlx4_RST2INIT_QP_wrapper()
 - Save at mlx4_INIT2RTR_QP_wrapper()
 - Restore at mlx4_vf_immed_vlan_work_handler()

Update mlx4_vf_immed_vlan_work_handler() to support VGT.

Signed-off-by: Rony Efraim <ronye@mellanox.com>
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Reviewed-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 20 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 7207dcd05759..1e9970d2f0f3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1539,11 +1539,6 @@ out:
         return ret;
 }
 
-static int calculate_transition(u16 oper_vlan, u16 admin_vlan)
-{
-        return (2 * (oper_vlan == MLX4_VGT) + (admin_vlan == MLX4_VGT));
-}
-
 static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
                                             int slave, int port)
 {
@@ -1553,7 +1548,6 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
         struct mlx4_dev *dev = &(priv->dev);
         int err;
         int admin_vlan_ix = NO_INDX;
-        enum mlx4_vlan_transition vlan_trans;
 
         vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
         vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
@@ -1563,12 +1557,8 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
             vp_oper->state.link_state == vp_admin->link_state)
                 return 0;
 
-        vlan_trans = calculate_transition(vp_oper->state.default_vlan,
-                                          vp_admin->default_vlan);
-
         if (!(priv->mfunc.master.slave_state[slave].active &&
-              dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_UPDATE_QP &&
-              vlan_trans == MLX4_VLAN_TRANSITION_VST_VST)) {
+              dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_UPDATE_QP)) {
                 /* even if the UPDATE_QP command isn't supported, we still want
                  * to set this VF link according to the admin directive
                  */
@@ -1586,15 +1576,19 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
                 return -ENOMEM;
 
         if (vp_oper->state.default_vlan != vp_admin->default_vlan) {
-                err = __mlx4_register_vlan(&priv->dev, port,
-                                           vp_admin->default_vlan,
-                                           &admin_vlan_ix);
-                if (err) {
-                        kfree(work);
-                        mlx4_warn((&priv->dev),
-                                  "No vlan resources slave %d, port %d\n",
-                                  slave, port);
-                        return err;
+                if (MLX4_VGT != vp_admin->default_vlan) {
+                        err = __mlx4_register_vlan(&priv->dev, port,
+                                                   vp_admin->default_vlan,
+                                                   &admin_vlan_ix);
+                        if (err) {
+                                kfree(work);
+                                mlx4_warn((&priv->dev),
+                                          "No vlan resources slave %d, port %d\n",
+                                          slave, port);
+                                return err;
+                        }
+                } else {
+                        admin_vlan_ix = NO_INDX;
                 }
                 work->flags |= MLX4_VF_IMMED_VLAN_FLAG_VLAN;
                 mlx4_dbg((&(priv->dev)),