please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a bunch of fixes to the new mlx4 driver. This pull is bigger than I would have liked after -rc5, but Mellanox discovered a problem that required a firmware change and also some driver help to fix. Since this is a new driver for 2.6.22, which is for new hardware that no one has in production yet, I think it's better to merge this early even if it risks introducing a bug, rather than have a driver in 2.6.22 that doesn't work at all with current adapter firmware.
Jack Morgenstein (1):
IB/mlx4: Handle buffer wraparound in __mlx4_ib_cq_clean()
Roland Dreier (6):
IB/mlx4: Fix handling of wq->tail for send completions IB/mlx4: Fix warning in rounding up queue sizes
IB/mlx4: Handle new FW requirement for send request prefetching IB/mlx4: Get rid of max_inline_data calculation
IB/mlx4: Handle FW command interface rev 3
IB/mlx4: Make sure inline data segments don't cross a 64 byte boundary
drivers/infiniband/hw/mlx4/cq.c | 19 ++-- drivers/infiniband/hw/mlx4/main.c | 16 ++- drivers/infiniband/hw/mlx4/mlx4_ib.h | 5 +- drivers/infiniband/hw/mlx4/qp.c | 196 ++++++++++++++++++++++------------ drivers/infiniband/hw/mlx4/user.h | 9 +- drivers/net/mlx4/fw.c | 110 +++++++++++++------- drivers/net/mlx4/fw.h | 10 +- drivers/net/mlx4/main.c | 14 ++- include/linux/mlx4/cmd.h | 1 + include/linux/mlx4/device.h | 13 ++- include/linux/mlx4/qp.h | 4 + 11 files changed, 259 insertions(+), 138 deletions(-)
drivers/infiniband/hw/mlx4/cq.c +12 -7
@@ -354,8 +354,8 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,if (is_send) { wq = &(*cur_qp)->sq; wqe_ctr =be16_to_cpu (cqe->wqe_index); - wq->tail += wqe_ctr - (u16 ) wq->tail; - wc->wr_id = wq->wrid[wq->tail & (wq->max -1 )]; + wq->tail += (u16) (wqe_ctr - (u16 ) wq->tail); + wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt -1 )]; ++wq->tail; }else if ((*cur_qp)->ibqp.srq) { srq =to_msrq ((*cur_qp)->ibqp.srq);
@@ -364,7 +364,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,mlx4_ib_free_srq_wqe (srq, wqe_ctr); }else { wq = &(*cur_qp)->rq; - wc->wr_id = wq->wrid[wq->tail & (wq->max -1 )]; + wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt -1 )]; ++wq->tail; }
@@ -478,7 +478,8 @@ void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq) {u32 prod_index;int nfreed =0 ; -struct mlx4_cqe *cqe; +struct mlx4_cqe *cqe, *dest; +u8 owner_bit;/* * First we need to find the current producer index, so we
@@ -501,9 +502,13 @@ void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq)if (srq && !(cqe->owner_sr_opcode &MLX4_CQE_IS_SEND_MASK ))mlx4_ib_free_srq_wqe (srq,be16_to_cpu (cqe->wqe_index)); ++nfreed; - }else if (nfreed) -memcpy (get_cqe (cq, (prod_index + nfreed) & cq->ibcq.cqe), - cqe,sizeof *cqe); + }else if (nfreed) { + dest =get_cqe (cq, (prod_index + nfreed) & cq->ibcq.cqe); + owner_bit = dest->owner_sr_opcode &MLX4_CQE_OWNER_MASK ; +memcpy (dest, cqe,sizeof *cqe); + dest->owner_sr_opcode = owner_bit | + (dest->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK ); + } }if (nfreed) {
drivers/infiniband/hw/mlx4/main.c +11 -5
@@ -125,7 +125,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, props->local_ca_ack_delay = dev->dev->caps.local_ca_ack_delay; props->atomic_cap = dev->dev->caps.flags &MLX4_DEV_CAP_FLAG_ATOMIC ?IB_ATOMIC_HCA :IB_ATOMIC_NONE ; - props->max_pkeys = dev->dev->caps.pkey_table_len; + props->max_pkeys = dev->dev->caps.pkey_table_len[1 ]; props->max_mcast_grp = dev->dev->caps.num_mgms + dev->dev->caps.num_amgms; props->max_mcast_qp_attach = dev->dev->caps.num_qp_per_mgm; props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
@@ -168,9 +168,9 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port, props->state = out_mad->data[32 ] &0xf ; props->phys_state = out_mad->data[33 ] >>4 ; props->port_cap_flags =be32_to_cpup ((__be32 *) (out_mad->data +20 )); - props->gid_tbl_len =to_mdev (ibdev)->dev->caps.gid_table_len; + props->gid_tbl_len =to_mdev (ibdev)->dev->caps.gid_table_len[port]; props->max_msg_sz =0x80000000 ; - props->pkey_tbl_len =to_mdev (ibdev)->dev->caps.pkey_table_len; + props->pkey_tbl_len =to_mdev (ibdev)->dev->caps.pkey_table_len[port]; props->bad_pkey_cntr =be16_to_cpup ((__be16 *) (out_mad->data +46 )); props->qkey_viol_cntr =be16_to_cpup ((__be16 *) (out_mad->data +48 )); props->active_width = out_mad->data[31 ] &0xf ;
@@ -280,8 +280,14 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,return PTR_ERR (mailbox);memset (mailbox->buf,0 ,256 ); - *(u8 *) mailbox->buf = !!reset_qkey_viols <<6 ; - ((__be32 *) mailbox->buf)[2 ] =cpu_to_be32 (cap_mask); + +if (dev->dev->flags &MLX4_FLAG_OLD_PORT_CMDS ) { + *(u8 *) mailbox->buf = !!reset_qkey_viols <<6 ; + ((__be32 *) mailbox->buf)[2 ] =cpu_to_be32 (cap_mask); + }else { + ((u8 *) mailbox->buf)[3 ] = !!reset_qkey_viols; + ((__be32 *) mailbox->buf)[1 ] =cpu_to_be32 (cap_mask); + } err =mlx4_cmd (dev->dev, mailbox->dma, port,0 ,MLX4_CMD_SET_PORT ,MLX4_CMD_TIME_CLASS_B );
drivers/infiniband/hw/mlx4/mlx4_ib.h +4 -1
@@ -95,7 +95,8 @@ struct mlx4_ib_mr {struct mlx4_ib_wq {u64 *wrid;spinlock_t lock; -int max; +int wqe_cnt; +int max_post;int max_gs;int offset;int wqe_shift;
@@ -113,6 +114,7 @@ struct mlx4_ib_qp {u32 doorbell_qpn;__be32 sq_signal_bits; +int sq_spare_wqes;struct mlx4_ib_wq sq;struct ib_umem *umem;
@@ -123,6 +125,7 @@ struct mlx4_ib_qp {u8 alt_port;u8 atomic_rd_en;u8 resp_depth; +u8 sq_no_prefetch;u8 state; };
drivers/infiniband/hw/mlx4/qp.c +128 -68
389 lines not on this page · raw message
drivers/infiniband/hw/mlx4/user.h +5 -4
@@ -39,7 +39,7 @@* Increment this value if any changes that break userspace ABI * compatibility are made. */ -#define MLX4_IB_UVERBS_ABI_VERSION 2 +#define MLX4_IB_UVERBS_ABI_VERSION 3/* * Make sure that all structs defined in this file remain laid out so
@@ -87,9 +87,10 @@ struct mlx4_ib_create_srq_resp {struct mlx4_ib_create_qp {__u64 buf_addr;__u64 db_addr; -__u8 log_sq_bb_count; -__u8 log_sq_stride; -__u8 reserved[6 ]; +__u8 log_sq_bb_count; +__u8 log_sq_stride; +__u8 sq_no_prefetch; +__u8 reserved[5 ]; };#endif /* MLX4_IB_USER_H */
drivers/net/mlx4/fw.c +73 -37
189 lines not on this page · raw message
drivers/net/mlx4/fw.h +5 -5
@@ -59,13 +59,13 @@ struct mlx4_dev_cap {int max_responder_per_qp;int max_rdma_global;int local_ca_ack_delay; -int max_mtu; -int max_port_width; -int max_vl;int num_ports; -int max_gids; +int max_mtu[MLX4_MAX_PORTS +1 ]; +int max_port_width[MLX4_MAX_PORTS +1 ]; +int max_vl[MLX4_MAX_PORTS +1 ]; +int max_gids[MLX4_MAX_PORTS +1 ]; +int max_pkeys[MLX4_MAX_PORTS +1 ];u16 stat_rate_support; -int max_pkeys;u32 flags;int reserved_uars;int uar_size;
drivers/net/mlx4/main.c +9 -5
@@ -88,6 +88,7 @@ static struct mlx4_profile default_profile = {static int __devinit mlx4_dev_cap (struct mlx4_dev *dev,struct mlx4_dev_cap *dev_cap) {int err; +int i; err =mlx4_QUERY_DEV_CAP (dev, dev_cap);if (err) {
@@ -117,11 +118,15 @@ static int __devinit mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev } dev->caps.num_ports = dev_cap->num_ports; +for (i =1 ; i <= dev->caps.num_ports; ++i) { + dev->caps.vl_cap[i] = dev_cap->max_vl[i]; + dev->caps.mtu_cap[i] = dev_cap->max_mtu[i]; + dev->caps.gid_table_len[i] = dev_cap->max_gids[i]; + dev->caps.pkey_table_len[i] = dev_cap->max_pkeys[i]; + dev->caps.port_width_cap[i] = dev_cap->max_port_width[i]; + } + dev->caps.num_uars = dev_cap->uar_size /PAGE_SIZE ; - dev->caps.vl_cap = dev_cap->max_vl; - dev->caps.mtu_cap = dev_cap->max_mtu; - dev->caps.gid_table_len = dev_cap->max_gids; - dev->caps.pkey_table_len = dev_cap->max_pkeys; dev->caps.local_ca_ack_delay = dev_cap->local_ca_ack_delay; dev->caps.bf_reg_size = dev_cap->bf_reg_size; dev->caps.bf_regs_per_page = dev_cap->bf_regs_per_page;
@@ -148,7 +153,6 @@ static int __devinit mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev dev->caps.reserved_mrws = dev_cap->reserved_mrws; dev->caps.reserved_uars = dev_cap->reserved_uars; dev->caps.reserved_pds = dev_cap->reserved_pds; - dev->caps.port_width_cap = dev_cap->max_port_width; dev->caps.mtt_entry_sz =MLX4_MTT_ENTRY_PER_SEG * dev_cap->mtt_entry_sz; dev->caps.page_size_cap = ~(u32) (dev_cap->min_page_sz -1 ); dev->caps.flags = dev_cap->flags;
include/linux/mlx4/cmd.h +1 -0
@@ -54,6 +54,7 @@ enum {MLX4_CMD_INIT_PORT =0x9 ,MLX4_CMD_CLOSE_PORT =0xa ,MLX4_CMD_QUERY_HCA =0xb , +MLX4_CMD_QUERY_PORT =0x43 ,MLX4_CMD_SET_PORT =0xc ,MLX4_CMD_ACCESS_DDR =0x2e , MLX4_CMD_MAP_ICM = 0xffa,
include/linux/mlx4/device.h +7 -6
@@ -41,6 +41,7 @@enum {MLX4_FLAG_MSI_X =1 <<0 , +MLX4_FLAG_OLD_PORT_CMDS =1 <<1 , };enum {
@@ -131,10 +132,10 @@ enum {struct mlx4_caps {u64 fw_ver;int num_ports; -int vl_cap; -int mtu_cap; -int gid_table_len; -int pkey_table_len; +int vl_cap[MLX4_MAX_PORTS +1 ]; +int mtu_cap[MLX4_MAX_PORTS +1 ]; +int gid_table_len[MLX4_MAX_PORTS +1 ]; +int pkey_table_len[MLX4_MAX_PORTS +1 ];int local_ca_ack_delay;int num_uars;int bf_reg_size;
@@ -174,7 +175,7 @@ struct mlx4_caps {u32 page_size_cap;u32 flags;u16 stat_rate_support; -u8 port_width_cap; +u8 port_width_cap[MLX4_MAX_PORTS +1 ]; };struct mlx4_buf_list {
@@ -322,7 +323,7 @@ int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, struct mlx4_mtt *mtt,void mlx4_srq_free (struct mlx4_dev *dev,struct mlx4_srq *srq);int mlx4_srq_arm (struct mlx4_dev *dev,struct mlx4_srq *srq,int limit_watermark); -int mlx4_INIT_PORT (struct mlx4_dev *dev,struct mlx4_init_port_param *param,int port); +int mlx4_INIT_PORT (struct mlx4_dev *dev,int port);int mlx4_CLOSE_PORT (struct mlx4_dev *dev,int port);int mlx4_multicast_attach (struct mlx4_dev *dev,struct mlx4_qp *qp,u8 gid[16 ]);
include/linux/mlx4/qp.h +4 -0
@@ -269,6 +269,10 @@ struct mlx4_wqe_data_seg {__be64 addr; }; +enum { +MLX4_INLINE_ALIGN =64 , +}; +struct mlx4_wqe_inline_seg {__be32 byte_count; };