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

Commit e431a80a authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5-next into rdma.git for-next 

From
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

For dependencies needed in the next ODP patches.

* branch 'mlx5-next':
  net/mlx5: Set ODP SRQ support in firmware
  net/mlx5: Add XRC transport to ODP device capabilities layout
parents da91ddfd 46861e3e

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

+53 −0
Original line number Diff line number Diff line
@@ -459,6 +459,53 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev) 
	return err;

}



static int handle_hca_cap_odp(struct mlx5_core_dev *dev)

{

	void *set_ctx;

	void *set_hca_cap;

	int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);

	int err;



	if (!MLX5_CAP_GEN(dev, pg))

		return 0;



	err = mlx5_core_get_caps(dev, MLX5_CAP_ODP);

	if (err)

		return err;



	/**

	 * If all bits are cleared we shouldn't try to set it

	 * or we might fail while trying to access a reserved bit.

	 */

	if (!(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive) ||

	      MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive) ||

	      MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)))

		return 0;



	set_ctx = kzalloc(set_sz, GFP_KERNEL);

	if (!set_ctx)

		return -ENOMEM;



	set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx, capability);

	memcpy(set_hca_cap, dev->caps.hca_cur[MLX5_CAP_ODP],

	       MLX5_ST_SZ_BYTES(odp_cap));



	/* set ODP SRQ support for RC/UD and XRC transports */

	MLX5_SET(odp_cap, set_hca_cap, ud_odp_caps.srq_receive,

		 (MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive)));



	MLX5_SET(odp_cap, set_hca_cap, rc_odp_caps.srq_receive,

		 (MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive)));



	MLX5_SET(odp_cap, set_hca_cap, xrc_odp_caps.srq_receive,

		 (MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)));



	err = set_caps(dev, set_ctx, set_sz, MLX5_SET_HCA_CAP_OP_MOD_ODP);



	kfree(set_ctx);

	return err;

}



static int handle_hca_cap(struct mlx5_core_dev *dev)

{

	void *set_ctx = NULL;
@@ -931,6 +978,12 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
		goto reclaim_boot_pages;

	}



	err = handle_hca_cap_odp(dev);

	if (err) {

		dev_err(&pdev->dev, "handle_hca_cap_odp failed\n");

		goto reclaim_boot_pages;

	}



	err = mlx5_satisfy_startup_pages(dev, 0);

	if (err) {

		dev_err(&pdev->dev, "failed to allocate init pages\n");

include/linux/mlx5/device.h

+3 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,9 @@ enum mlx5_qcam_feature_groups { 
#define MLX5_CAP_ODP(mdev, cap)\

	MLX5_GET(odp_cap, mdev->caps.hca_cur[MLX5_CAP_ODP], cap)



#define MLX5_CAP_ODP_MAX(mdev, cap)\

	MLX5_GET(odp_cap, mdev->caps.hca_max[MLX5_CAP_ODP], cap)



#define MLX5_CAP_VECTOR_CALC(mdev, cap) \

	MLX5_GET(vector_calc_cap, \

		 mdev->caps.hca_cur[MLX5_CAP_VECTOR_CALC], cap)

include/linux/mlx5/mlx5_ifc.h

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ enum { 


enum {

	MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE        = 0x0,

	MLX5_SET_HCA_CAP_OP_MOD_ODP                   = 0x2,

	MLX5_SET_HCA_CAP_OP_MOD_ATOMIC                = 0x3,

};
@@ -831,7 +832,9 @@ struct mlx5_ifc_odp_cap_bits { 


	struct mlx5_ifc_odp_per_transport_service_cap_bits ud_odp_caps;



	u8         reserved_at_e0[0x720];

	struct mlx5_ifc_odp_per_transport_service_cap_bits xrc_odp_caps;



	u8         reserved_at_100[0x700];

};



struct mlx5_ifc_calc_op {