please pull infiniband.git
Subsystems (2)
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 the following changes; mostly low-level hardware changes plus a couple of small patches that fix IPoIB crashes.
Chien Tung (2):
RDMA/nes: Correct handling of PBL resources
RDMA/nes: Mitigate compatibility issue regarding PCIe write credits
Ilpo Järvinen (1):
RDMA/nes: Reindent mis-indented spinlocks
Ralph Campbell (1):
IB/ipath: Fix RDMA write with immediate copy of last packet
Roland Dreier (3):
RDMA/cxgb3: Fix too-big reserved field zeroing in iwch_post_zb_read()
mlx4_core: Fix unused variable warning
Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mlx4' and 'nes' into for-next
Stefan Roscher (1):
IB/ehca: Remove reference to special QP in case of port activation failure
Vadim Makhervaks (1):
RDMA/nes: Fix CQ allocation scheme for multicast receive queue apps
Yossi Etigin (3):
IPoIB: Don't enable napi when it's already enabled
IPoIB: Fix hang in ipoib_flush_paths()
IPoIB: Fix crash in path_rec_completion()
drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 - drivers/infiniband/hw/ehca/ehca_irq.c | 7 ++- drivers/infiniband/hw/ehca/ehca_qp.c | 5 ++ drivers/infiniband/hw/ipath/ipath_ruc.c | 10 ++-- drivers/infiniband/hw/nes/nes.c | 16 +++++++ drivers/infiniband/hw/nes/nes_hw.h | 1 + drivers/infiniband/hw/nes/nes_verbs.c | 64 +++++++++++++++++++--------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 ++- drivers/net/mlx4/mlx4.h | 9 +--- 9 files changed, 82 insertions(+), 37 deletions(-)
drivers/infiniband/hw/cxgb3/iwch_qp.c +0 -1
@@ -745,7 +745,6 @@ int iwch_post_zb_read(struct iwch_qp *qhp) wqe->read.rdmaop =T3_READ_REQ ; wqe->read.reserved[0 ] =0 ; wqe->read.reserved[1 ] =0 ; - wqe->read.reserved[2 ] =0 ; wqe->read.rem_stag =cpu_to_be32 (1 ); wqe->read.rem_to =cpu_to_be64 (1 ); wqe->read.local_stag =cpu_to_be32 (1 );
drivers/infiniband/hw/ehca/ehca_irq.c +5 -2
@@ -370,6 +370,10 @@ static void parse_ec(struct ehca_shca *shca, u64 eqe)switch (ec) {case 0x30 :/* port availability change */ if (EHCA_BMASK_GET (NEQE_PORT_AVAILABILITY , eqe)) { +/* only for autodetect mode important */ +if (ehca_nr_ports >=0 ) +break ; +int suppress_event;/* replay modify_qp for sqps */ spin_lock_irqsave (&sport->mod_sqp_lock, flags);
@@ -387,8 +391,7 @@ static void parse_ec(struct ehca_shca *shca, u64 eqe) sport->port_state =IB_PORT_ACTIVE ;dispatch_port_event (shca, port,IB_EVENT_PORT_ACTIVE ,"is active" ); -ehca_query_sma_attr (shca, port, - &sport->saved_attr); +ehca_query_sma_attr (shca, port, &sport->saved_attr); }else { sport->port_state =IB_PORT_DOWN ; dispatch_port_event(shca, port, IB_EVENT_PORT_ERR,
drivers/infiniband/hw/ehca/ehca_qp.c +5 -0
@@ -860,6 +860,11 @@ static struct ehca_qp *internal_create_qp(if (qp_type ==IB_QPT_GSI ) { h_ret =ehca_define_sqp (shca, my_qp, init_attr);if (h_ret !=H_SUCCESS ) { +kfree (my_qp->mod_qp_parm); + my_qp->mod_qp_parm =NULL ; +/* the QP pointer is no longer valid */ + shca->sport[init_attr->port_num -1 ].ibqp_sqp[qp_type] = +NULL ; ret =ehca2ib_return_code (h_ret); goto create_qp_exit6; }
drivers/infiniband/hw/ipath/ipath_ruc.c +5 -5
@@ -156,7 +156,7 @@ bail:/** * ipath_get_rwqe - copy the next RWQE into the QP's RWQE * @qp: the QP -* @wr_id_only: update wr_id only, not SGEs +* @wr_id_only: update qp->r_wr_id only, not qp->r_sge * * Return 0 if no RWQE is available, otherwise return 1. *
@@ -173,8 +173,6 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)u32 tail;int ret; - qp->r_sge.sg_list = qp->r_sg_list; -if (qp->ibqp.srq) { srq =to_isrq (qp->ibqp.srq); handler = srq->ibsrq.event_handler;
@@ -206,8 +204,10 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) wqe =get_rwqe_ptr (rq, tail);if (++tail >= rq->size) tail =0 ; - }while (!wr_id_only && !ipath_init_sge (qp, wqe, &qp->r_len, - &qp->r_sge)); +if (wr_id_only) +break ; + qp->r_sge.sg_list = qp->r_sg_list; + }while (!ipath_init_sge (qp, wqe, &qp->r_len, &qp->r_sge)); qp->r_wr_id = wqe->wr_id; wq->tail = tail;
drivers/infiniband/hw/nes/nes.c +16 -0
@@ -95,6 +95,10 @@ unsigned int wqm_quanta = 0x10000;module_param (wqm_quanta, int,0644 );MODULE_PARM_DESC (wqm_quanta,"WQM quanta" ); +static unsigned int limit_maxrdreqsz; +module_param (limit_maxrdreqsz, bool,0644 ); +MODULE_PARM_DESC (limit_maxrdreqsz,"Limit max read request size to 256 Bytes" ); +LIST_HEAD (nes_adapter_list);static LIST_HEAD (nes_dev_list);
@@ -588,6 +592,18 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i nesdev->nesadapter->port_count; } +if ((limit_maxrdreqsz || + ((nesdev->nesadapter->phy_type[0 ] ==NES_PHY_TYPE_GLADIUS ) && + (hw_rev ==NE020_REV1 ))) && + (pcie_get_readrq (pcidev) >256 )) { +if (pcie_set_readrq (pcidev,256 )) + printk(KERN_ERR PFX "Unable to set max read request" +" to 256 bytes\n" ); +else +nes_debug (NES_DBG_INIT ,"Max read request size set" +" to 256 bytes\n" ); + } +tasklet_init (&nesdev->dpc_tasklet, nes_dpc, (unsigned long )nesdev);/* bring up the Control QP */
drivers/infiniband/hw/nes/nes_hw.h +1 -0
@@ -40,6 +40,7 @@#define NES_PHY_TYPE_ARGUS 4#define NES_PHY_TYPE_PUMA_1G 5#define NES_PHY_TYPE_PUMA_10G 6 +#define NES_PHY_TYPE_GLADIUS 7#define NES_MULTICAST_PF_MAX 8
drivers/infiniband/hw/nes/nes_verbs.c +43 -21
173 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_main.c +4 -2
@@ -106,12 +106,13 @@ int ipoib_open(struct net_device *dev)ipoib_dbg (priv,"bringing up interface\n" ); -napi_enable (&priv->napi);set_bit (IPOIB_FLAG_ADMIN_UP , &priv->flags);if (ipoib_pkey_dev_delay_open (dev))return 0 ; +napi_enable (&priv->napi); +if (ipoib_ib_dev_open (dev)) {napi_disable (&priv->napi);return -EINVAL ;
@@ -546,6 +547,7 @@ static int path_rec_start(struct net_device *dev,if (path->query_id <0 ) {ipoib_warn (priv,"ib_sa_path_rec_get failed: %d\n" , path->query_id); path->query =NULL ; +complete (&path->done);return path->query_id; }
@@ -662,7 +664,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,skb_push (skb,sizeof *phdr);__skb_queue_tail (&path->queue, skb); -if (path_rec_start (dev, path)) { +if (!path->query &&path_rec_start (dev, path)) {spin_unlock_irqrestore (&priv->lock, flags);path_free (dev, path);return ;
drivers/net/mlx4/mlx4.h +3 -6
@@ -87,6 +87,9 @@ enum {#ifdef CONFIG_MLX4_DEBUG extern int mlx4_debug_level; +#else /* CONFIG_MLX4_DEBUG */ +#define mlx4_debug_level (0) +#endif /* CONFIG_MLX4_DEBUG */ #define mlx4_dbg(mdev, format, arg...) \ do { \
@@ -94,12 +97,6 @@ extern int mlx4_debug_level; dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ## arg); \ }while (0 ) -#else /* CONFIG_MLX4_DEBUG */ - -#define mlx4_dbg(mdev, format, arg...) do { (void) mdev; } while (0) - -#endif /* CONFIG_MLX4_DEBUG */ - #define mlx4_err(mdev, format, arg...) \ dev_err(&mdev->pdev->dev, format, ## arg) #define mlx4_info(mdev, format, arg...) \