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

Commit 48962f5c authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/mlx4: Move flag constants to uapi header 



MLX4_USER_DEV_CAP_LARGE_CQE (via mlx4_ib_alloc_ucontext_resp.dev_caps)
and MLX4_IB_QUERY_DEV_RESP_MASK_CORE_CLOCK_OFFSET (via
mlx4_uverbs_ex_query_device_resp.comp_mask) are copied directly to
userspace and form part of the uAPI.

Move them to the uapi header where they belong.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 0c43ab37

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, 
	if (uhw->outlen >= resp.response_length + sizeof(resp.hca_core_clock_offset)) {

		resp.response_length += sizeof(resp.hca_core_clock_offset);

		if (!err && !mlx4_is_slave(dev->dev)) {

			resp.comp_mask |= QUERY_DEVICE_RESP_MASK_TIMESTAMP;

			resp.comp_mask |= MLX4_IB_QUERY_DEV_RESP_MASK_CORE_CLOCK_OFFSET;

			resp.hca_core_clock_offset = clock_params.offset % PAGE_SIZE;

		}

	}

drivers/infiniband/hw/mlx4/mlx4_ib.h

+0 −4
Original line number Diff line number Diff line
@@ -641,10 +641,6 @@ struct mlx4_uverbs_ex_query_device { 
	__u32 reserved;

};



enum query_device_resp_mask {

	QUERY_DEVICE_RESP_MASK_TIMESTAMP = 1UL << 0,

};



static inline struct mlx4_ib_dev *to_mdev(struct ib_device *ibdev)

{

	return container_of(ibdev, struct mlx4_ib_dev, ib_dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/module.h>

#include <linux/cache.h>

#include <linux/kernel.h>

#include <uapi/rdma/mlx4-abi.h>



#include "fw.h"

#include "icm.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/etherdevice.h>

#include <net/devlink.h>



#include <uapi/rdma/mlx4-abi.h>

#include <linux/mlx4/device.h>

#include <linux/mlx4/doorbell.h>

include/linux/mlx4/device.h

+0 −4
Original line number Diff line number Diff line
@@ -256,10 +256,6 @@ enum { 
	MLX4_DEV_CAP_EQE_STRIDE_ENABLED	= 1LL << 3

};



enum {

	MLX4_USER_DEV_CAP_LARGE_CQE	= 1L << 0

};



enum {

	MLX4_FUNC_CAP_64B_EQE_CQE	= 1L << 0,

	MLX4_FUNC_CAP_EQE_CQE_STRIDE	= 1L << 1,