504255f12 parents 2be6053 615eb71 f7cc25d d32ae39 a5e12df 3e60a77 787adb9 caf6e3f cb29688 0f0bee8 16d9981 42849b283 files · +4737 −980Browse filesShowing the changes to include/linux (2 of 83 files). Show all
Unified · Split
| @@ -61,6 +61,7 @@ enum { · 60 unmodified lines | ||
| 61 | 61 | MLX4_DEV_CAP_FLAG_RC = 1LL << 0, |
| 62 | 62 | MLX4_DEV_CAP_FLAG_UC = 1LL << 1, |
| 63 | 63 | MLX4_DEV_CAP_FLAG_UD = 1LL << 2, |
| 64 | + MLX4_DEV_CAP_FLAG_XRC = 1LL << 3, | |
| 64 | 65 | MLX4_DEV_CAP_FLAG_SRQ = 1LL << 6, |
| 65 | 66 | MLX4_DEV_CAP_FLAG_IPOIB_CSUM = 1LL << 7, |
| 66 | 67 | MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1LL << 8, |
| @@ -82,6 +83,12 @@ enum { · 15 unmodified lines | ||
| 82 | 83 | MLX4_DEV_CAP_FLAG_COUNTERS = 1LL << 48 |
| 83 | 84 | }; |
| 84 | 85 | |
| 86 | +#define MLX4_ATTR_EXTENDED_PORT_INFO cpu_to_be16(0xff90) | |
| 87 | + | |
| 88 | +enum { | |
| 89 | + MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO = 1 << 0 | |
| 90 | +}; | |
| 91 | + | |
| 85 | 92 | enum { |
| 86 | 93 | MLX4_BMME_FLAG_LOCAL_INV = 1 << 6, |
| 87 | 94 | MLX4_BMME_FLAG_REMOTE_INV = 1 << 7, |
| @@ -256,6 +263,8 @@ struct mlx4_caps { · 168 unmodified lines | ||
| 256 | 263 | int num_qp_per_mgm; |
| 257 | 264 | int num_pds; |
| 258 | 265 | int reserved_pds; |
| 266 | + int max_xrcds; | |
| 267 | + int reserved_xrcds; | |
| 259 | 268 | int mtt_entry_sz; |
| 260 | 269 | u32 max_msg_sz; |
| 261 | 270 | u32 page_size_cap; |
| @@ -276,6 +285,7 @@ struct mlx4_caps { · 14 unmodified lines | ||
| 276 | 285 | u32 port_mask; |
| 277 | 286 | enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1]; |
| 278 | 287 | u32 max_counters; |
| 288 | + u8 ext_port_cap[MLX4_MAX_PORTS + 1]; | |
| 279 | 289 | }; |
| 280 | 290 | |
| 281 | 291 | struct mlx4_buf_list { |
| @@ -499,6 +509,8 @@ static inline void *mlx4_buf_offset(struct mlx4_buf *buf, int offset) · 217 unmodified lines | ||
| 499 | 509 | |
| 500 | 510 | int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn); |
| 501 | 511 | void mlx4_pd_free(struct mlx4_dev *dev, u32 pdn); |
| 512 | +int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn); | |
| 513 | +void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn); | |
| 502 | 514 | |
| 503 | 515 | int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar); |
| 504 | 516 | void mlx4_uar_free(struct mlx4_dev *dev, struct mlx4_uar *uar); |
| @@ -538,8 +550,8 @@ void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt); · 33 unmodified lines | ||
| 538 | 550 | int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp); |
| 539 | 551 | void mlx4_qp_free(struct mlx4_dev *dev, struct mlx4_qp *qp); |
| 540 | 552 | |
| 541 | −int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, struct mlx4_mtt *mtt, | |
| 542 | − u64 db_rec, struct mlx4_srq *srq); | |
| 553 | +int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcdn, | |
| 554 | + struct mlx4_mtt *mtt, u64 db_rec, struct mlx4_srq *srq); | |
| 543 | 555 | void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq); |
| 544 | 556 | int mlx4_srq_arm(struct mlx4_dev *dev, struct mlx4_srq *srq, int limit_watermark); |
| 545 | 557 | int mlx4_srq_query(struct mlx4_dev *dev, struct mlx4_srq *srq, int *limit_watermark); |
| @@ -75,6 +75,7 @@ enum { · 74 unmodified lines | ||
| 75 | 75 | MLX4_QP_ST_UC = 0x1, |
| 76 | 76 | MLX4_QP_ST_RD = 0x2, |
| 77 | 77 | MLX4_QP_ST_UD = 0x3, |
| 78 | + MLX4_QP_ST_XRC = 0x6, | |
| 78 | 79 | MLX4_QP_ST_MLX = 0x7 |
| 79 | 80 | }; |
| 80 | 81 | |
| @@ -137,7 +138,7 @@ struct mlx4_qp_context { · 56 unmodified lines | ||
| 137 | 138 | __be32 ssn; |
| 138 | 139 | __be32 params2; |
| 139 | 140 | __be32 rnr_nextrecvpsn; |
| 140 | − __be32 srcd; | |
| 141 | + __be32 xrcd; | |
| 141 | 142 | __be32 cqn_recv; |
| 142 | 143 | __be64 db_rec_addr; |
| 143 | 144 | __be32 qkey; |