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

Commit 223cdc72 authored by Artemy Kovalyov's avatar Artemy Kovalyov Committed by David S. Miller
Browse files

net/mlx5: Update PAGE_FAULT_RESUME layout 



Update PAGE_FAULT_RESUME command layout.

Three bit fields describing page fault: rdma, rdma_write, req_res gave 8
possible combinations, while only a few were legal. Now they
are interpreted as three-bit type field, where former legal
combinations turns into corresponding types and unused were added as new
types.

Signed-off-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d0cc6ed

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

+2 −8
Original line number Diff line number Diff line
@@ -515,14 +515,8 @@ int mlx5_core_page_fault_resume(struct mlx5_core_dev *dev, u32 qpn, 


	MLX5_SET(page_fault_resume_in, in, opcode,

		 MLX5_CMD_OP_PAGE_FAULT_RESUME);

	MLX5_SET(page_fault_resume_in, in, qpn, qpn);



	if (flags & MLX5_PAGE_FAULT_RESUME_REQUESTOR)

		MLX5_SET(page_fault_resume_in, in, req_res, 1);

	if (flags & MLX5_PAGE_FAULT_RESUME_WRITE)

		MLX5_SET(page_fault_resume_in, in, read_write, 1);

	if (flags & MLX5_PAGE_FAULT_RESUME_RDMA)

		MLX5_SET(page_fault_resume_in, in, rdma, 1);

	MLX5_SET(page_fault_resume_in, in, wq_number, qpn);

	MLX5_SET(page_fault_resume_in, in, page_fault_type, flags);

	if (error)

		MLX5_SET(page_fault_resume_in, in, error, 1);

include/linux/mlx5/mlx5_ifc.h

+4 −5
Original line number Diff line number Diff line
@@ -4775,12 +4775,11 @@ struct mlx5_ifc_page_fault_resume_in_bits { 


	u8         error[0x1];

	u8         reserved_at_41[0x4];

	u8         rdma[0x1];

	u8         read_write[0x1];

	u8         req_res[0x1];

	u8         qpn[0x18];

	u8         page_fault_type[0x3];

	u8         wq_number[0x18];



	u8         reserved_at_60[0x20];

	u8         reserved_at_60[0x8];

	u8         token[0x18];

};



struct mlx5_ifc_nop_out_bits {