Merge branch 'mlx4-misc-fixes'

Tariq Toukan says:

====================
mlx4 misc fixes

This patchset contains misc bug fixes from the team
to the mlx4 Core and Eth drivers.

Series generated against net commit:
32f1bc0f3d26 Revert "ipv4: restore rt->fi for reference counting"
====================

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

4 files changed, 19 insertions, 5 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 0e0fa7030565..c1af47e45d3f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1789,9 +1789,17 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
         }
 
         if (err) {
-                if (!(dev->persist->state & MLX4_DEVICE_STATE_INTERNAL_ERROR))
-                        mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with error:%d, status %d\n",
-                                  vhcr->op, slave, vhcr->errno, err);
+                if (!(dev->persist->state & MLX4_DEVICE_STATE_INTERNAL_ERROR)) {
+                        if (vhcr->op == MLX4_CMD_ALLOC_RES &&
+                            (vhcr->in_modifier & 0xff) == RES_COUNTER &&
+                            err == -EDQUOT)
+                                mlx4_dbg(dev,
+                                         "Unable to allocate counter for slave %d (%d)\n",
+                                         slave, err);
+                        else
+                                mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with error:%d, status %d\n",
+                                          vhcr->op, slave, vhcr->errno, err);
+                }
                 vhcr_cmd->status = mlx4_errno_to_status(err);
                 goto out_status;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index ffbcb27c05e5..ae5fdc2df654 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1562,6 +1562,11 @@ static int mlx4_en_flow_replace(struct net_device *dev,
                 qpn = priv->drop_qp.qpn;
         else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
                 qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
+                if (qpn < priv->rss_map.base_qpn ||
+                    qpn >= priv->rss_map.base_qpn + priv->rx_ring_num) {
+                        en_warn(priv, "rxnfc: QP (0x%x) doesn't exist\n", qpn);
+                        return -EINVAL;
+                }
         } else {
                 if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
                         en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index aa074e57ce06..77abd1813047 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -997,7 +997,8 @@ void mlx4_en_calc_rx_buf(struct net_device *dev)
         en_dbg(DRV, priv, "Rx buffer scatter-list (effective-mtu:%d num_frags:%d):\n",
                eff_mtu, priv->num_frags);
         for (i = 0; i < priv->num_frags; i++) {
-                en_err(priv,
+                en_dbg(DRV,
+                       priv,
                        "  frag:%d - size:%d stride:%d\n",
                        i,
                        priv->frag_info[i].frag_size,
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 4aa29ee93013..07516545474f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -311,7 +311,7 @@ static inline int mlx4_grant_resource(struct mlx4_dev *dev, int slave,
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct resource_allocator *res_alloc =
                 &priv->mfunc.master.res_tracker.res_alloc[res_type];
-        int err = -EINVAL;
+        int err = -EDQUOT;
         int allocated, free, reserved, guaranteed, from_free;
         int from_rsvd;