11 files changed, 675 insertions, 120 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index f0612645de99..7567437dbd34 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -177,18 +177,18 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
 
         props->max_mr_size         = ~0ull;
         props->page_size_cap       = dev->dev->caps.page_size_cap;
-        props->max_qp              = dev->dev->caps.num_qps - dev->dev->caps.reserved_qps;
+        props->max_qp              = dev->dev->quotas.qp;
         props->max_qp_wr           = dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE;
         props->max_sge             = min(dev->dev->caps.max_sq_sg,
                                          dev->dev->caps.max_rq_sg);
-        props->max_cq              = dev->dev->caps.num_cqs - dev->dev->caps.reserved_cqs;
+        props->max_cq              = dev->dev->quotas.cq;
         props->max_cqe             = dev->dev->caps.max_cqes;
-        props->max_mr              = dev->dev->caps.num_mpts - dev->dev->caps.reserved_mrws;
+        props->max_mr              = dev->dev->quotas.mpt;
         props->max_pd              = dev->dev->caps.num_pds - dev->dev->caps.reserved_pds;
         props->max_qp_rd_atom      = dev->dev->caps.max_qp_dest_rdma;
         props->max_qp_init_rd_atom = dev->dev->caps.max_qp_init_rdma;
         props->max_res_rd_atom     = props->max_qp_rd_atom * props->max_qp;
-        props->max_srq             = dev->dev->caps.num_srqs - dev->dev->caps.reserved_srqs;
+        props->max_srq             = dev->dev->quotas.srq;
         props->max_srq_wr          = dev->dev->caps.max_srq_wqes - 1;
         props->max_srq_sge         = dev->dev->caps.max_srq_sge;
         props->max_fast_reg_page_list_len = MLX4_MAX_FAST_REG_PAGES;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index ae8eb4c4fb6c..65d41b76fa2c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1687,7 +1687,7 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave
                 vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
                 if (NO_INDX != vp_oper->vlan_idx) {
                         __mlx4_unregister_vlan(&priv->dev,
-                                               port, vp_oper->vlan_idx);
+                                               port, vp_oper->state.default_vlan);
                         vp_oper->vlan_idx = NO_INDX;
                 }
                 if (NO_INDX != vp_oper->mac_idx) {
@@ -1718,6 +1718,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         if (cmd == MLX4_COMM_CMD_RESET) {
                 mlx4_warn(dev, "Received reset from slave:%d\n", slave);
                 slave_state[slave].active = false;
+                slave_state[slave].old_vlan_api = false;
                 mlx4_master_deactivate_admin_state(priv, slave);
                 for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i) {
                                 slave_state[slave].event_eq[i].eqn = -1;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 85d91665d400..b5554121aca4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -417,7 +417,6 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         int err;
-        int idx;
 
         en_dbg(HW, priv, "Killing VID:%d\n", vid);
 
@@ -425,10 +424,7 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
 
         /* Remove VID from port VLAN filter */
         mutex_lock(&mdev->state_lock);
-        if (!mlx4_find_cached_vlan(mdev->dev, priv->port, vid, &idx))
-                mlx4_unregister_vlan(mdev->dev, priv->port, idx);
-        else
-                en_dbg(HW, priv, "could not find vid %d in cache\n", vid);
+        mlx4_unregister_vlan(mdev->dev, priv->port, vid);
 
         if (mdev->device_up && priv->port_up) {
                 err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index c151e7a6710a..c3e70bc2d875 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -177,6 +177,7 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
                                 struct mlx4_cmd_mailbox *outbox,
                                 struct mlx4_cmd_info *cmd)
 {
+        struct mlx4_priv *priv = mlx4_priv(dev);
         u8      field;
         u32     size;
         int     err = 0;
@@ -185,18 +186,26 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 #define QUERY_FUNC_CAP_NUM_PORTS_OFFSET         0x1
 #define QUERY_FUNC_CAP_PF_BHVR_OFFSET           0x4
 #define QUERY_FUNC_CAP_FMR_OFFSET               0x8
-#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET          0x10
-#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET          0x14
-#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET         0x18
-#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET         0x20
-#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET         0x24
-#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET         0x28
+#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET_DEP      0x10
+#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET_DEP      0x14
+#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET_DEP     0x18
+#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET_DEP     0x20
+#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET_DEP     0x24
+#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET_DEP     0x28
 #define QUERY_FUNC_CAP_MAX_EQ_OFFSET            0x2c
 #define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET       0x30
 
+#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET          0x50
+#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET          0x54
+#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET         0x58
+#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET         0x60
+#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET         0x64
+#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET         0x68
+
 #define QUERY_FUNC_CAP_FMR_FLAG                 0x80
 #define QUERY_FUNC_CAP_FLAG_RDMA                0x40
 #define QUERY_FUNC_CAP_FLAG_ETH                 0x80
+#define QUERY_FUNC_CAP_FLAG_QUOTAS              0x10
 
 /* when opcode modifier = 1 */
 #define QUERY_FUNC_CAP_PHYS_PORT_OFFSET         0x3
@@ -237,8 +246,9 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
                 MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP1_PROXY);
 
         } else if (vhcr->op_modifier == 0) {
-                /* enable rdma and ethernet interfaces */
-                field = (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA);
+                /* enable rdma and ethernet interfaces, and new quota locations */
+                field = (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA |
+                         QUERY_FUNC_CAP_FLAG_QUOTAS);
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);
 
                 field = dev->caps.num_ports;
@@ -250,14 +260,20 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
                 field = 0; /* protected FMR support not available as yet */
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FMR_OFFSET);
 
-                size = dev->caps.num_qps;
+                size = priv->mfunc.master.res_tracker.res_alloc[RES_QP].quota[slave];
                 MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);
+                size = dev->caps.num_qps;
+                MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET_DEP);