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

Commit 212f2a87 authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Jason Gunthorpe
Browse files

IB/mlx5: Route MADs for dual port RoCE 



Route performance query MADs to the correct mlx5_core_dev when using
dual port RoCE mode.

Signed-off-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent cfe4e37f

drivers/infiniband/hw/mlx5/mad.c

+14 −7
Original line number Diff line number Diff line
@@ -197,10 +197,9 @@ static void pma_cnt_assign(struct ib_pma_portcounters *pma_cnt, 
			     vl_15_dropped);

}



static int process_pma_cmd(struct ib_device *ibdev, u8 port_num,

static int process_pma_cmd(struct mlx5_core_dev *mdev, u8 port_num,

			   const struct ib_mad *in_mad, struct ib_mad *out_mad)

{

	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	int err;

	void *out_cnt;
@@ -222,7 +221,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;



		err = mlx5_core_query_vport_counter(dev->mdev, 0, 0,

		err = mlx5_core_query_vport_counter(mdev, 0, 0,

						    port_num, out_cnt, sz);

		if (!err)

			pma_cnt_ext_assign(pma_cnt_ext, out_cnt);
@@ -235,7 +234,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;



		err = mlx5_core_query_ib_ppcnt(dev->mdev, port_num,

		err = mlx5_core_query_ib_ppcnt(mdev, port_num,

					       out_cnt, sz);

		if (!err)

			pma_cnt_assign(pma_cnt, out_cnt);
@@ -255,9 +254,11 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
			u16 *out_mad_pkey_index)

{

	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	struct mlx5_core_dev *mdev = dev->mdev;

	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;

	struct mlx5_core_dev *mdev;

	u8 mdev_port_num;

	int ret;



	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))
@@ -265,14 +266,20 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 


	memset(out_mad->data, 0, sizeof(out_mad->data));



	mdev = mlx5_ib_get_native_port_mdev(dev, port_num, &mdev_port_num);

	if (!mdev)

		return IB_MAD_RESULT_FAILURE;



	if (MLX5_CAP_GEN(mdev, vport_counters) &&

	    in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT &&

	    in_mad->mad_hdr.method == IB_MGMT_METHOD_GET) {

		return process_pma_cmd(ibdev, port_num, in_mad, out_mad);

		ret = process_pma_cmd(mdev, mdev_port_num, in_mad, out_mad);

	} else {

		return process_mad(ibdev, mad_flags, port_num, in_wc, in_grh,

		ret =  process_mad(ibdev, mad_flags, port_num, in_wc, in_grh,

				   in_mad, out_mad);

	}

	mlx5_ib_put_native_port_mdev(dev, port_num);

	return ret;

}



int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, u8 port)