Commit d324a46b authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

Merge branch 'mlx5-next' into wip/leon-for-next 

Perform merge of Mellanox shared branch.

* mlx5-next:
  RDMA/mlx5: Move function mlx5_core_query_ib_ppcnt() to mlx5_ib
parents b021d82e 8a2dd123

drivers/infiniband/hw/mlx5/mad.c

+23 −2
Original line number Diff line number Diff line
@@ -147,6 +147,28 @@ static void pma_cnt_assign(struct ib_pma_portcounters *pma_cnt, 
			     vl_15_dropped);

}



static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, void *out,

			  size_t sz)

{

	u32 *in;

	int err;



	in  = kvzalloc(sz, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		return err;

	}



	MLX5_SET(ppcnt_reg, in, local_port, port_num);



	MLX5_SET(ppcnt_reg, in, grp, MLX5_INFINIBAND_PORT_COUNTERS_GROUP);

	err = mlx5_core_access_reg(dev, in, sz, out,

				   sz, MLX5_REG_PPCNT, 0, 0);



	kvfree(in);

	return err;

}



static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,

			   const struct ib_mad *in_mad, struct ib_mad *out_mad)

{
@@ -202,8 +224,7 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num, 
			goto done;

		}



		err = mlx5_core_query_ib_ppcnt(mdev, mdev_port_num,

					       out_cnt, sz);

		err = query_ib_ppcnt(mdev, mdev_port_num, out_cnt, sz);

		if (!err)

			pma_cnt_assign(pma_cnt, out_cnt);

	}

drivers/net/ethernet/mellanox/mlx5/core/port.c

+0 −23
Original line number Diff line number Diff line
@@ -493,29 +493,6 @@ int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev, 
}

EXPORT_SYMBOL_GPL(mlx5_query_port_vl_hw_cap);



int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev,

			     u8 port_num, void *out, size_t sz)

{

	u32 *in;

	int err;



	in  = kvzalloc(sz, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		return err;

	}



	MLX5_SET(ppcnt_reg, in, local_port, port_num);



	MLX5_SET(ppcnt_reg, in, grp, MLX5_INFINIBAND_PORT_COUNTERS_GROUP);

	err = mlx5_core_access_reg(dev, in, sz, out,

				   sz, MLX5_REG_PPCNT, 0, 0);



	kvfree(in);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_core_query_ib_ppcnt);



static int mlx5_query_pfcc_reg(struct mlx5_core_dev *dev, u32 *out,

			       u32 out_size)

{

include/linux/mlx5/driver.h

+0 −2
Original line number Diff line number Diff line
@@ -1084,8 +1084,6 @@ int mlx5_core_destroy_psv(struct mlx5_core_dev *dev, int psv_num); 
void mlx5_core_put_rsc(struct mlx5_core_rsc_common *common);

int mlx5_query_odp_caps(struct mlx5_core_dev *dev,

			struct mlx5_odp_caps *odp_caps);

int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev,

			     u8 port_num, void *out, size_t sz);



int mlx5_init_rl_table(struct mlx5_core_dev *dev);

void mlx5_cleanup_rl_table(struct mlx5_core_dev *dev);