Merge branch 'mlx5-fixes'

Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes for 4.7-rc

The following series provides some small fixes for mlx5 driver.

Two small fixes for the mlx5e netdev, the 1st is for the blue flame
quota accounting and the 2nd is a small refactoring in shutdown flow.

Five trivial fixes for mlx5 E-Switch.
	- Allmulti mc_promisc flag was not set in a specific flow.
	- Modify VF node guid when admin mac is changed.
	- Race in vport enable flow.
	- Misc code fixes (kvfree when needed and error pointers checking).

Three in mlx5 steering area.  Correct capabilities checking and root flow table update.

Three misc fixes in mlx5 commands enum and layouts.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

10 files changed, 128 insertions, 52 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index fd4392999eee..f5c8d5db25a8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3192,10 +3192,7 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
         flush_workqueue(priv->wq);
         if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) {
                 netif_device_detach(netdev);
-                mutex_lock(&priv->state_lock);
-                if (test_bit(MLX5E_STATE_OPENED, &priv->state))
-                        mlx5e_close_locked(netdev);
-                mutex_unlock(&priv->state_lock);
+                mlx5e_close(netdev);
         } else {
                 unregister_netdev(netdev);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index 229ab16fb8d3..b000ddc29553 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -317,7 +317,8 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb)
         while ((sq->pc & wq->sz_m1) > sq->edge)
                 mlx5e_send_nop(sq, false);
 
-        sq->bf_budget = bf ? sq->bf_budget - 1 : 0;
+        if (bf)
+                sq->bf_budget--;
 
         sq->stats.packets++;
         sq->stats.bytes += num_bytes;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index b84a6918a700..aebbd6ccb9fe 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -383,7 +383,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
                                    0, &dest);
-        if (IS_ERR_OR_NULL(flow_rule)) {
+        if (IS_ERR(flow_rule)) {
                 pr_warn(
                         "FDB: Failed to add flow rule: dmac_v(%pM) dmac_c(%pM) -> vport(%d), err(%ld)\n",
                          dmac_v, dmac_c, vport, PTR_ERR(flow_rule));
@@ -457,7 +457,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
 
         table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));
         fdb = mlx5_create_flow_table(root_ns, 0, table_size, 0);
-        if (IS_ERR_OR_NULL(fdb)) {
+        if (IS_ERR(fdb)) {
                 err = PTR_ERR(fdb);
                 esw_warn(dev, "Failed to create FDB Table err %d\n", err);
                 goto out;
@@ -474,7 +474,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 3);
         eth_broadcast_addr(dmac);
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create flow group err(%d)\n", err);
                 goto out;
@@ -489,7 +489,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         eth_zero_addr(dmac);
         dmac[0] = 0x01;
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create allmulti flow group err(%d)\n", err);
                 goto out;
@@ -506,7 +506,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports)
         MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, table_size - 1);
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 1);
         g = mlx5_create_flow_group(fdb, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create promisc flow group err(%d)\n", err);
                 goto out;
@@ -529,7 +529,7 @@ out:
                 }
         }
 
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
         return err;
 }
 
@@ -651,6 +651,7 @@ static void update_allmulti_vports(struct mlx5_eswitch *esw,
                                         esw_fdb_set_vport_rule(esw,
                                                                mac,
                                                                vport_idx);
+                        iter_vaddr->mc_promisc = true;
                         break;
                 case MLX5_ACTION_DEL:
                         if (!iter_vaddr)
@@ -1060,7 +1061,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
                 return;
 
         acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
-        if (IS_ERR_OR_NULL(acl)) {
+        if (IS_ERR(acl)) {
                 err = PTR_ERR(acl);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress flow Table, err(%d)\n",
                          vport->vport, err);
@@ -1075,7 +1076,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
 
         vlan_grp = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(vlan_grp)) {
+        if (IS_ERR(vlan_grp)) {
                 err = PTR_ERR(vlan_grp);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress allowed vlans flow group, err(%d)\n",
                          vport->vport, err);
@@ -1086,7 +1087,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 1);
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
         drop_grp = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(drop_grp)) {
+        if (IS_ERR(drop_grp)) {
                 err = PTR_ERR(drop_grp);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] egress drop flow group, err(%d)\n",
                          vport->vport, err);
@@ -1097,7 +1098,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
         vport->egress.drop_grp = drop_grp;
         vport->egress.allowed_vlans_grp = vlan_grp;
 out:
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
         if (err && !IS_ERR_OR_NULL(vlan_grp))
                 mlx5_destroy_flow_group(vlan_grp);
         if (err && !IS_ERR_OR_NULL(acl))
@@ -1174,7 +1175,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
                 return;
 
         acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
-        if (IS_ERR_OR_NULL(acl)) {
+        if (IS_ERR(acl)) {
                 err = PTR_ERR(acl);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress flow Table, err(%d)\n",
                          vport->vport, err);
@@ -1192,7 +1193,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged spoofchk flow group, err(%d)\n",
                          vport->vport, err);
@@ -1207,7 +1208,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged flow group, err(%d)\n",
                          vport->vport, err);
@@ -1223,7 +1224,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 2);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress spoofchk flow group, err(%d)\n",
                          vport->vport, err);
@@ -1236,7 +1237,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
         MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 3);
 
         g = mlx5_create_flow_group(acl, flow_group_in);
-        if (IS_ERR_OR_NULL(g)) {
+        if (IS_ERR(g)) {
                 err = PTR_ERR(g);
                 esw_warn(dev, "Failed to create E-Switch vport[%d] ingress drop flow group, err(%d)\n",
                          vport->vport, err);
@@ -1259,7 +1260,7 @@ out:
                         mlx5_destroy_flow_table(vport->ingress.acl);
         }
 
-        kfree(flow_group_in);
+        kvfree(flow_group_in);
 }
 
 static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,
@@ -1363,7 +1364,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_ALLOW,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->ingress.allow_rule)) {
+        if (IS_ERR(vport->ingress.allow_rule)) {
                 err = PTR_ERR(vport->ingress.allow_rule);
                 pr_warn("vport[%d] configure ingress allow rule, err(%d)\n",
                         vport->vport, err);
@@ -1380,7 +1381,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_DROP,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->ingress.drop_rule)) {
+        if (IS_ERR(vport->ingress.drop_rule)) {
                 err = PTR_ERR(vport->ingress.drop_rule);
                 pr_warn("vport[%d] configure ingress drop rule, err(%d)\n",
                         vport->vport, err);
@@ -1439,7 +1440,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_ALLOW,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->egress.allowed_vlan)) {
+        if (IS_ERR(vport->egress.allowed_vlan)) {
                 err = PTR_ERR(vport->egress.allowed_vlan);
                 pr_warn("vport[%d] configure egress allowed vlan rule failed, err(%d)\n",
                         vport->vport, err);
@@ -1457,7 +1458,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw,
                                    match_v,
                                    MLX5_FLOW_CONTEXT_ACTION_DROP,
                                    0, NULL);
-        if (IS_ERR_OR_NULL(vport->egress.drop_rule)) {
+        if (IS_ERR(vport->egress.drop_rule)) {
                 err = PTR_ERR(vport->egress.drop_rule);
                 pr_warn("vport[%d] configure egress drop rule failed, err(%d)\n",
                         vport->vport, err);
@@ -1491,14 +1492,11 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, int vport_num,
 
         /* Sync with current vport context */
         vport->enabled_events = enable_events;
-        esw_vport_change_handle_locked(vport);
-
         vport->enabled = true;
 
         /* only PF is trusted by default */
         vport->trusted = (vport_num) ? false : true;
-
-        arm_vport_context_events_cmd(esw->dev, vport_num, enable_events);
+        esw_vport_change_handle_locked(vport);
 
         esw->enabled_vports++;
         esw_debug(esw->dev, "Enabled VPORT(%d)\n", vport_num);
@@ -1728,11 +1726,24 @@ void mlx5_eswitch_vport_event(struct mlx5_eswitch *esw, struct mlx5_eqe *eqe)
         (esw && MLX5_CAP_GEN(esw->dev, vport_group_manager) && mlx5_core_is_pf(esw->dev))
 #define LEGAL_VPORT(esw, vport) (vport >= 0 && vport < esw->total_vports)
 
+static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN])
+{
+        ((u8 *)node_guid)[7] = mac[0];
+        ((u8 *)node_guid)[6] = mac[1];
+        ((u8 *)node_guid)[5] = mac[2];
+        ((u8 *)node_guid)[4] = 0xff;
+        ((u8 *)node_guid)[3] = 0xfe;
+        ((u8 *)node_guid)[2] = mac[3];
+        ((u8 *)node_guid)[1] = mac[4];
+        ((u8 *)node_guid)[0] = mac[5];
+}
+
 int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
                                int vport, u8 mac[ETH_ALEN])
 {
-        int err = 0;
         struct mlx5_vport *evport;
+        u64 node_guid;
+        int err = 0;
 
         if (!ESW_ALLOWED(esw))
                 return -EPERM;
@@ -1756,11 +1767,17 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
                 return err;
         }
 
+        node_guid_gen_from_mac(&node_guid, mac);
+        err = mlx5_modify_nic_vport_node_guid(esw->dev, vport, node_guid);
+        if (err)
+                mlx5_core_warn(esw->dev,
+                               "Failed to set vport %d node guid, err = %d. RDMA_CM will not function properly for this VF.\n",
+                               vport, err);
+
         mutex_lock(&esw->state_lock);
         if (evport->enabled)
                 err = esw_vport_ingress_config(esw, evport);
         mutex_unlock(&esw->state_lock);
-
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 8b5f0b2c0d5c..e912a3d2505e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1292,8 +1292,8 @@ static int update_root_ft_destroy(struct mlx5_flow_table *ft)
                                        ft->id);
                         return err;
                 }
-                root->root_ft = new_root_ft;
         }
+        root->root_ft = new_root_ft;
         return 0;
 }
 
@@ -1767,6 +1767,9 @@ static void cleanup_root_ns(struct mlx5_core_dev *dev)
 
 void mlx5_cleanup_fs(struct mlx5_core_dev *dev)
 {
+        if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
+                return;
+
         cleanup_root_ns(dev);
         cleanup_single_prio_root_ns(dev, dev->priv.fdb_root_ns);
         cleanup_single_prio_root_ns(dev, dev->priv.esw_egress_root_ns);
@@ -1828,29 +1831,36 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)
 {
         int err = 0;
 
+        if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
+                return 0;
+
         err = mlx5_init_fc_stats(dev);
         if (err)
                 return err;
 
-        if (MLX5_CAP_GEN(dev, nic_flow_table)) {
+        if (MLX5_CAP_GEN(dev, nic_flow_table) &&
+            MLX5_CAP_FLOWTABLE_NIC_RX(dev, ft_support)) {
                 err = init_root_ns(dev);
                 if (err)
                         goto err;
         }
+
         if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
-                err = init_fdb_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
-                err = init_egress_acl_root_ns(dev);
-                if (err)
-                        goto err;
-        }
-        if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
-                err = init_ingress_acl_root_ns(dev);
-                if (err)
-                        goto err;
+                if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {
+                        err = init_fdb_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support)) {
+                        err = init_egress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
+                if (MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support)) {
+                        err = init_ingress_acl_root_ns(dev);
+                        if (err)
+                                goto err;
+                }
         }
 
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
index b720a274220d..b82d65802d96 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
@@ -418,7 +418,7 @@ int mlx5_core_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn)
         if (out.hdr.status)
                 err = mlx5_cmd_status_to_err(&out.hdr);
         else
-                *xrcdn = be32_to_cpu(out.xrcdn);
+                *xrcdn = be32_to_cpu(out.xrcdn) & 0xffffff;
 
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index b69dadcfb897..daf44cd4c566 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -508,6 +508,44 @@ int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid)
 }
 EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_node_guid);
 
+int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
+                                    u32 vport, u64 node_guid)
+{
+        int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);
+        void *nic_vport_context;
+        u8 *guid;
+        void *in;
+        int err;
+
+        if (!vport)
+                return -EINVAL;
+        if (!MLX5_CAP_GEN(mdev, vport_group_manager))
+                return -EACCES;
+        if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify))
+                return -ENOTSUPP;
+
+        in = mlx5_vzalloc(inlen);
+        if (!in)
+                return -ENOMEM;
+
+        MLX5_SET(modify_nic_vport_context_in, in,
+                 field_select.node_guid, 1);
+        MLX5_SET(modify_nic_vport_context_in, in, vport_number, vport);
+        MLX5_SET(modify_nic_vport_context_in, in, other_vport, !!vport);
+
+        nic_vport_context = MLX5_ADDR_OF(modify_nic_vport_context_in,
+                                         in, nic_vport_context);
+        guid = MLX5_ADDR_OF(nic_vport_context, nic_vport_context,
+                            node_guid);
+        MLX5_SET64(nic_vport_context, nic_vport_context, node_guid, node_guid);
+
+        err = mlx5_modify_nic_vport_context(mdev, in, inlen);
+
+        kvfree(in);
+
+        return err;
+}
+
 int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
                                         u16 *qkey_viol_cntr)
 {
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 035abdf62cfe..73a48479892d 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -1240,8 +1240,6 @@ struct mlx5_destroy_psv_out {
         u8                      rsvd[8];
 };
 
-#define MLX5_CMD_OP_MAX 0x920
-
 enum {
         VPORT_STATE_DOWN                = 0x0,
         VPORT_STATE_UP                  = 0x1,
@@ -1369,6 +1367,12 @@ enum mlx5_cap_type {
 #define MLX5_CAP_FLOWTABLE_MAX(mdev, cap) \
         MLX5_GET(flow_table_nic_cap, mdev->hca_caps_max[MLX5_CAP_FLOW_TABLE], cap)
 
+#define MLX5_CAP_FLOWTABLE_NIC_RX(mdev, cap) \
+        MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_receive.cap)
+
+#define MLX5_CAP_FLOWTABLE_NIC_RX_MAX(mdev, cap) \
+        MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive.cap)
+
 #define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \
         MLX5_GET(flow_table_eswitch_cap, \
                  mdev->hca_caps_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 9a05cd7e5890..e955a2859009 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -205,7 +205,8 @@ enum {
         MLX5_CMD_OP_ALLOC_FLOW_COUNTER            = 0x939,
         MLX5_CMD_OP_DEALLOC_FLOW_COUNTER          = 0x93a,
         MLX5_CMD_OP_QUERY_FLOW_COUNTER            = 0x93b,
-        MLX5_CMD_OP_MODIFY_FLOW_TABLE             = 0x93c
+        MLX5_CMD_OP_MODIFY_FLOW_TABLE             = 0x93c,
+        MLX5_CMD_OP_MAX
 };
 
 struct mlx5_ifc_flow_table_fields_supported_bits {
@@ -500,7 +501,9 @@ struct mlx5_ifc_e_switch_cap_bits {
         u8         vport_svlan_insert[0x1];
         u8         vport_cvlan_insert_if_not_exist[0x1];
         u8         vport_cvlan_insert_overwrite[0x1];
-        u8         reserved_at_5[0x1b];
+        u8         reserved_at_5[0x19];
+        u8         nic_vport_node_guid_modify[0x1];
+        u8         nic_vport_port_guid_modify[0x1];
 
         u8         reserved_at_20[0x7e0];
 };
@@ -4583,7 +4586,10 @@ struct mlx5_ifc_modify_nic_vport_context_out_bits {
 };
 
 struct mlx5_ifc_modify_nic_vport_field_select_bits {
-        u8         reserved_at_0[0x19];
+        u8         reserved_at_0[0x16];
+        u8         node_guid[0x1];
+        u8         port_guid[0x1];
+        u8         reserved_at_18[0x1];
         u8         mtu[0x1];
         u8         change_event[0x1];
         u8         promisc[0x1];
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 64221027bf1f..1532dcf6fc5e 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -560,6 +560,7 @@ struct mlx5_modify_qp_mbox_in {
         __be32                  optparam;
         u8                      rsvd0[4];
         struct mlx5_qp_context  ctx;
+        u8                      rsvd2[16];
 };
 
 struct mlx5_modify_qp_mbox_out {
diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h
index 301da4a5e6bf..6c16c198f680 100644
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
@@ -50,6 +50,8 @@ int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu);
 int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
                                            u64 *system_image_guid);
 int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);
+int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
+                                    u32 vport, u64 node_guid);
 int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
                                         u16 *qkey_viol_cntr);
 int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,