History

Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next

Roland Dreier committed 15 years ago

Showing the changes to include/linux (2 of 83 files). Show all

Unified · Split

2 files
  1. include/linux/mlx4/device.h +14 −2
  2. include/linux/mlx4/qp.h +2 −1
include/linux/mlx4/device.h+14−2
@@ -61,6 +61,7 @@ enum { · 60 unmodified lines
6161 MLX4_DEV_CAP_FLAG_RC = 1LL << 0,
6262 MLX4_DEV_CAP_FLAG_UC = 1LL << 1,
6363 MLX4_DEV_CAP_FLAG_UD = 1LL << 2,
64+ MLX4_DEV_CAP_FLAG_XRC = 1LL << 3,
6465 MLX4_DEV_CAP_FLAG_SRQ = 1LL << 6,
6566 MLX4_DEV_CAP_FLAG_IPOIB_CSUM = 1LL << 7,
6667 MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1LL << 8,
@@ -82,6 +83,12 @@ enum { · 15 unmodified lines
8283 MLX4_DEV_CAP_FLAG_COUNTERS = 1LL << 48
8384 };
8485
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+
8592 enum {
8693 MLX4_BMME_FLAG_LOCAL_INV = 1 << 6,
8794 MLX4_BMME_FLAG_REMOTE_INV = 1 << 7,
@@ -256,6 +263,8 @@ struct mlx4_caps { · 168 unmodified lines
256263 int num_qp_per_mgm;
257264 int num_pds;
258265 int reserved_pds;
266+ int max_xrcds;
267+ int reserved_xrcds;
259268 int mtt_entry_sz;
260269 u32 max_msg_sz;
261270 u32 page_size_cap;
@@ -276,6 +285,7 @@ struct mlx4_caps { · 14 unmodified lines
276285 u32 port_mask;
277286 enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1];
278287 u32 max_counters;
288+ u8 ext_port_cap[MLX4_MAX_PORTS + 1];
279289 };
280290
281291 struct mlx4_buf_list {
@@ -499,6 +509,8 @@ static inline void *mlx4_buf_offset(struct mlx4_buf *buf, int offset) · 217 unmodified lines
499509
500510 int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn);
501511 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);
502514
503515 int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar);
504516 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
538550 int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp);
539551 void mlx4_qp_free(struct mlx4_dev *dev, struct mlx4_qp *qp);
540552
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);
543555 void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq);
544556 int mlx4_srq_arm(struct mlx4_dev *dev, struct mlx4_srq *srq, int limit_watermark);
545557 int mlx4_srq_query(struct mlx4_dev *dev, struct mlx4_srq *srq, int *limit_watermark);
include/linux/mlx4/qp.h+2−1
@@ -75,6 +75,7 @@ enum { · 74 unmodified lines
7575 MLX4_QP_ST_UC = 0x1,
7676 MLX4_QP_ST_RD = 0x2,
7777 MLX4_QP_ST_UD = 0x3,
78+ MLX4_QP_ST_XRC = 0x6,
7879 MLX4_QP_ST_MLX = 0x7
7980 };
8081
@@ -137,7 +138,7 @@ struct mlx4_qp_context { · 56 unmodified lines
137138 __be32 ssn;
138139 __be32 params2;
139140 __be32 rnr_nextrecvpsn;
140− __be32 srcd;
141+ __be32 xrcd;
141142 __be32 cqn_recv;
142143 __be64 db_rec_addr;
143144 __be32 qkey;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t