Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IB/mlx4: Move user vendor structures

This patch moves mlx4 vendor's specific structures to
common UAPI folder which will be visible to all consumers.

These structures are used by user-space library driver
(libmlx4) and currently manually copied to that library.

This move will allow cross-compile against these files and
simplify introduction of vendor specific data.

Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Leon Romanovsky and committed by
Doug Ledford
9ce28a20 e44ee2fd

+9 -7
+1
MAINTAINERS
··· 7801 7801 S: Supported 7802 7802 F: drivers/net/ethernet/mellanox/mlx4/ 7803 7803 F: include/linux/mlx4/ 7804 + F: include/uapi/rdma/mlx4-abi.h 7804 7805 7805 7806 MELLANOX MLX4 IB driver 7806 7807 M: Yishai Hadas <yishaih@mellanox.com>
+1 -1
drivers/infiniband/hw/mlx4/cq.c
··· 37 37 #include <linux/slab.h> 38 38 39 39 #include "mlx4_ib.h" 40 - #include "user.h" 40 + #include <rdma/mlx4-abi.h> 41 41 42 42 static void mlx4_ib_cq_comp(struct mlx4_cq *cq) 43 43 {
+1 -1
drivers/infiniband/hw/mlx4/main.c
··· 55 55 #include <linux/mlx4/qp.h> 56 56 57 57 #include "mlx4_ib.h" 58 - #include "user.h" 58 + #include <rdma/mlx4-abi.h> 59 59 60 60 #define DRV_NAME MLX4_IB_DRV_NAME 61 61 #define DRV_VERSION "2.2-1"
+1 -1
drivers/infiniband/hw/mlx4/qp.c
··· 47 47 #include <linux/mlx4/qp.h> 48 48 49 49 #include "mlx4_ib.h" 50 - #include "user.h" 50 + #include <rdma/mlx4-abi.h> 51 51 52 52 static void mlx4_ib_lock_cqs(struct mlx4_ib_cq *send_cq, 53 53 struct mlx4_ib_cq *recv_cq);
+1 -1
drivers/infiniband/hw/mlx4/srq.c
··· 37 37 #include <linux/vmalloc.h> 38 38 39 39 #include "mlx4_ib.h" 40 - #include "user.h" 40 + #include <rdma/mlx4-abi.h> 41 41 42 42 static void *get_wqe(struct mlx4_ib_srq *srq, int n) 43 43 {
+3 -3
drivers/infiniband/hw/mlx4/user.h include/uapi/rdma/mlx4-abi.h
··· 31 31 * SOFTWARE. 32 32 */ 33 33 34 - #ifndef MLX4_IB_USER_H 35 - #define MLX4_IB_USER_H 34 + #ifndef MLX4_ABI_USER_H 35 + #define MLX4_ABI_USER_H 36 36 37 37 #include <linux/types.h> 38 38 ··· 104 104 __u8 reserved[5]; 105 105 }; 106 106 107 - #endif /* MLX4_IB_USER_H */ 107 + #endif /* MLX4_ABI_USER_H */
+1
include/uapi/rdma/Kbuild
··· 9 9 header-y += rdma_user_rxe.h 10 10 header-y += cxgb3-abi.h 11 11 header-y += cxgb4-abi.h 12 + header-y += mlx4-abi.h 12 13 header-y += mlx5-abi.h