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:
32f1bc0f3d
Revert "ipv4: restore rt->fi for reference counting"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
cf680179c1
|
@ -1789,9 +1789,17 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
if (!(dev->persist->state & MLX4_DEVICE_STATE_INTERNAL_ERROR))
|
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",
|
mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with error:%d, status %d\n",
|
||||||
vhcr->op, slave, vhcr->errno, err);
|
vhcr->op, slave, vhcr->errno, err);
|
||||||
|
}
|
||||||
vhcr_cmd->status = mlx4_errno_to_status(err);
|
vhcr_cmd->status = mlx4_errno_to_status(err);
|
||||||
goto out_status;
|
goto out_status;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1562,6 +1562,11 @@ static int mlx4_en_flow_replace(struct net_device *dev,
|
||||||
qpn = priv->drop_qp.qpn;
|
qpn = priv->drop_qp.qpn;
|
||||||
else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
|
else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
|
||||||
qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
|
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 {
|
} else {
|
||||||
if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
|
if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
|
||||||
en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",
|
en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",
|
||||||
|
|
|
@ -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",
|
en_dbg(DRV, priv, "Rx buffer scatter-list (effective-mtu:%d num_frags:%d):\n",
|
||||||
eff_mtu, priv->num_frags);
|
eff_mtu, priv->num_frags);
|
||||||
for (i = 0; i < priv->num_frags; i++) {
|
for (i = 0; i < priv->num_frags; i++) {
|
||||||
en_err(priv,
|
en_dbg(DRV,
|
||||||
|
priv,
|
||||||
" frag:%d - size:%d stride:%d\n",
|
" frag:%d - size:%d stride:%d\n",
|
||||||
i,
|
i,
|
||||||
priv->frag_info[i].frag_size,
|
priv->frag_info[i].frag_size,
|
||||||
|
|
|
@ -311,7 +311,7 @@ static inline int mlx4_grant_resource(struct mlx4_dev *dev, int slave,
|
||||||
struct mlx4_priv *priv = mlx4_priv(dev);
|
struct mlx4_priv *priv = mlx4_priv(dev);
|
||||||
struct resource_allocator *res_alloc =
|
struct resource_allocator *res_alloc =
|
||||||
&priv->mfunc.master.res_tracker.res_alloc[res_type];
|
&priv->mfunc.master.res_tracker.res_alloc[res_type];
|
||||||
int err = -EINVAL;
|
int err = -EDQUOT;
|
||||||
int allocated, free, reserved, guaranteed, from_free;
|
int allocated, free, reserved, guaranteed, from_free;
|
||||||
int from_rsvd;
|
int from_rsvd;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue