Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 531d9014 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

net/mlx4_core: Adjust port number in qp_attach wrapper when detaching 



When using single ported VFs and the VF is using port 2, we need
to adjust the port accordingly (change it from 1 to 2).

Fixes: 449fc488 ('net/mlx4: Adapt code for N-Port VF')
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarJack Morgenstein <jackm@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9becd707

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+23 −0
Original line number Original line Diff line number Diff line
@@ -3733,6 +3733,25 @@ static int qp_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, 
	}

	}

}

}





static int mlx4_adjust_port(struct mlx4_dev *dev, int slave,

			    u8 *gid, enum mlx4_protocol prot)

{

	int real_port;



	if (prot != MLX4_PROT_ETH)

		return 0;



	if (dev->caps.steering_mode == MLX4_STEERING_MODE_B0 ||

	    dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED) {

		real_port = mlx4_slave_convert_port(dev, slave, gid[5]);

		if (real_port < 0)

			return -EINVAL;

		gid[5] = real_port;

	}



	return 0;

}



int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,

int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,

			       struct mlx4_vhcr *vhcr,

			       struct mlx4_vhcr *vhcr,

			       struct mlx4_cmd_mailbox *inbox,

			       struct mlx4_cmd_mailbox *inbox,
@@ -3768,6 +3787,10 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave, 
		if (err)

		if (err)

			goto ex_detach;

			goto ex_detach;

	} else {

	} else {

		err = mlx4_adjust_port(dev, slave, gid, prot);

		if (err)

			goto ex_put;



		err = rem_mcg_res(dev, slave, rqp, gid, prot, type, &reg_id);

		err = rem_mcg_res(dev, slave, rqp, gid, prot, type, &reg_id);

		if (err)

		if (err)

			goto ex_put;

			goto ex_put;