14 else |
14 else |
15 mlx4libdir = $(libdir)/infiniband |
15 mlx4libdir = $(libdir)/infiniband |
16 diff -r -u /tmp/839450/libmlx4-1.0.1/src/mlx4-abi.h libmlx4-1.0.1/src/mlx4-abi.h |
16 diff -r -u /tmp/839450/libmlx4-1.0.1/src/mlx4-abi.h libmlx4-1.0.1/src/mlx4-abi.h |
17 --- /tmp/839450/libmlx4-1.0.1/src/mlx4-abi.h Thu Mar 10 04:48:34 2011 |
17 --- /tmp/839450/libmlx4-1.0.1/src/mlx4-abi.h Thu Mar 10 04:48:34 2011 |
18 +++ libmlx4-1.0.1/src/mlx4-abi.h Fri Feb 11 03:49:51 2011 |
18 +++ libmlx4-1.0.1/src/mlx4-abi.h Fri Feb 11 03:49:51 2011 |
19 @@ -35,6 +35,14 @@ |
19 @@ -35,6 +35,10 @@ |
20 |
20 |
21 #include <infiniband/kern-abi.h> |
21 #include <infiniband/kern-abi.h> |
22 |
22 |
23 +#if defined(__SVR4) && defined(__sun) |
23 +#if defined(__SVR4) && defined(__sun) |
24 +/* Restore once build systems are in sync |
|
25 + See 21170572 - libmlx4 should be built with the system mlnx_umap.h |
|
26 +#include <sys/ib/adapters/mlnx_umap.h> / * Opaque CI data out definitions * / |
24 +#include <sys/ib/adapters/mlnx_umap.h> / * Opaque CI data out definitions * / |
27 +*/ |
|
28 +#include "mlnx_umap.h" /* Opaque CI data out definitions */ |
|
29 +#endif |
25 +#endif |
30 + |
26 + |
31 #define MLX4_UVERBS_MIN_ABI_VERSION 2 |
27 #define MLX4_UVERBS_MIN_ABI_VERSION 2 |
32 #define MLX4_UVERBS_MAX_ABI_VERSION 3 |
28 #define MLX4_UVERBS_MAX_ABI_VERSION 3 |
33 |
29 |
34 @@ -43,6 +51,10 @@ |
30 @@ -43,6 +47,10 @@ |
35 __u32 qp_tab_size; |
31 __u32 qp_tab_size; |
36 __u16 bf_reg_size; |
32 __u16 bf_reg_size; |
37 __u16 bf_regs_per_page; |
33 __u16 bf_regs_per_page; |
38 +#if defined(__SVR4) && defined(__sun) |
34 +#if defined(__SVR4) && defined(__sun) |
39 + uint32_t muc_rev; |
35 + uint32_t muc_rev; |
40 + uint32_t muc_reserved; |
36 + uint32_t muc_reserved; |
41 +#endif |
37 +#endif |
42 }; |
38 }; |
43 |
39 |
44 struct mlx4_alloc_pd_resp { |
40 struct mlx4_alloc_pd_resp { |
45 @@ -51,23 +63,45 @@ |
41 @@ -51,23 +59,45 @@ |
46 __u32 reserved; |
42 __u32 reserved; |
47 }; |
43 }; |
48 |
44 |
49 +struct mlx4_share_pd_resp { |
45 +struct mlx4_share_pd_resp { |
50 + struct ibv_share_pd_resp ibv_resp; |
46 + struct ibv_share_pd_resp ibv_resp; |
86 + |
82 + |
87 + |
83 + |
88 #ifdef HAVE_IBV_XRC_OPS |
84 #ifdef HAVE_IBV_XRC_OPS |
89 struct mlx4_create_xrc_srq { |
85 struct mlx4_create_xrc_srq { |
90 struct ibv_create_xrc_srq ibv_cmd; |
86 struct ibv_create_xrc_srq ibv_cmd; |
91 @@ -78,18 +112,25 @@ |
87 @@ -78,18 +108,25 @@ |
92 |
88 |
93 struct mlx4_create_srq { |
89 struct mlx4_create_srq { |
94 struct ibv_create_srq ibv_cmd; |
90 struct ibv_create_srq ibv_cmd; |
95 +#if !(defined(__SVR4) && defined(__sun)) |
91 +#if !(defined(__SVR4) && defined(__sun)) |
96 __u64 buf_addr; |
92 __u64 buf_addr; |