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 includes various fixes found since 2.6.19-rc2:
Adrian Bunk:
RDMA/amso1100: Fix a NULL dereference in error path
Arthur Kepner:
IB/mthca: Use mmiowb after doorbell ring
Henrik Kretzschmar:
RDMA/amso1100: pci_module_init() conversion
Robert Walsh:
IB/ipath: Initialize diagpkt file on device init only
drivers/infiniband/hw/amso1100/c2.c | 2 - drivers/infiniband/hw/amso1100/c2_rnic.c | 4 +- drivers/infiniband/hw/ipath/ipath_diag.c | 65 ++++++++++++++++------------ drivers/infiniband/hw/ipath/ipath_driver.c | 10 ---- drivers/infiniband/hw/ipath/ipath_kernel.h | 3 - drivers/infiniband/hw/mthca/mthca_cq.c | 7 +++ drivers/infiniband/hw/mthca/mthca_qp.c | 19 ++++++++ drivers/infiniband/hw/mthca/mthca_srq.c | 8 +++ 8 files changed, 75 insertions(+), 43 deletions(-)
drivers/infiniband/hw/amso1100/c2.c +1 -1
@@ -1243,7 +1243,7 @@ static struct pci_driver c2_pci_driver =static int __init c2_init_module (void ) { -return pci_module_init (&c2_pci_driver); +return pci_register_driver (&c2_pci_driver); } static void __exit c2_exit_module(void)
drivers/infiniband/hw/amso1100/c2_rnic.c +2 -2
@@ -150,8 +150,8 @@ static int c2_rnic_query(struct c2_dev * (struct c2wr_rnic_query_rep *) (unsigned long ) (vq_req->reply_msg);if (!reply) err = -ENOMEM ; - - err =c2_errno (reply); +else + err =c2_errno (reply);if (err) goto bail2;
drivers/infiniband/hw/ipath/ipath_diag.c +38 -27
87 lines not on this page · raw message
drivers/infiniband/hw/ipath/ipath_driver.c +0 -10
@@ -2005,18 +2005,8 @@ static int __init infinipath_init(void) goto bail_group; } - ret =ipath_diagpkt_add (); -if (ret <0 ) { - printk(KERN_ERR IPATH_DRV_NAME ": Unable to create " - "diag data device: error %d\n", -ret); - goto bail_ipathfs; - } - goto bail; -bail_ipathfs: -ipath_exit_ipathfs (); - bail_group:ipath_driver_remove_group (&ipath_driver.driver);
drivers/infiniband/hw/ipath/ipath_kernel.h +0 -3
@@ -869,9 +869,6 @@ int ipath_device_create_group(struct devvoid ipath_device_remove_group (struct device *,struct ipath_devdata *);int ipath_expose_reset (struct device *); -int ipath_diagpkt_add (void ); -void ipath_diagpkt_remove (void ); -int ipath_init_ipathfs (void );void ipath_exit_ipathfs (void );int ipathfs_add_device (struct ipath_devdata *);
drivers/infiniband/hw/mthca/mthca_cq.c +7 -0
@@ -39,6 +39,8 @@#include <linux/init.h> #include <linux/hardirq.h> +#include <asm/io.h> +#include <rdma/ib_pack.h> #include "mthca_dev.h"
@@ -210,6 +212,11 @@ static inline void update_cons_index(strmthca_write64 (doorbell, dev->kar +MTHCA_CQ_DOORBELL ,MTHCA_GET_DOORBELL_LOCK (&dev->doorbell_lock)); +/* +* Make sure doorbells don't leak out of CQ spinlock +* and reach the HCA out of order: +*/ +mmiowb (); } }
drivers/infiniband/hw/mthca/mthca_qp.c +19 -0
@@ -39,6 +39,8 @@ #include <linux/init.h>#include <linux/string.h> #include <linux/slab.h> +#include <asm/io.h> +#include <rdma/ib_verbs.h> #include <rdma/ib_cache.h> #include <rdma/ib_pack.h>
@@ -1732,6 +1734,11 @@ out:mthca_write64 (doorbell, dev->kar +MTHCA_SEND_DOORBELL ,MTHCA_GET_DOORBELL_LOCK (&dev->doorbell_lock)); +/* +* Make sure doorbells don't leak out of SQ spinlock +* and reach the HCA out of order: +*/ +mmiowb (); } qp->sq.next_ind = ind;
@@ -1851,6 +1858,12 @@ out: qp->rq.next_ind = ind; qp->rq.head += nreq; +/* +* Make sure doorbells don't leak out of RQ spinlock and reach +* the HCA out of order: +*/ +mmiowb (); +spin_unlock_irqrestore (&qp->rq.lock, flags);return err; }
@@ -2112,6 +2125,12 @@ out: MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock)); } +/* +* Make sure doorbells don't leak out of SQ spinlock and reach +* the HCA out of order: +*/ +mmiowb (); +spin_unlock_irqrestore (&qp->sq.lock, flags);return err; }
drivers/infiniband/hw/mthca/mthca_srq.c +8 -0
@@ -35,6 +35,8 @@#include <linux/slab.h> #include <linux/string.h> +#include <asm/io.h> +#include "mthca_dev.h" #include "mthca_cmd.h" #include "mthca_memfree.h"
@@ -595,6 +597,12 @@ int mthca_tavor_post_srq_recv(struct ib_ MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock)); } +/* +* Make sure doorbells don't leak out of SRQ spinlock and +* reach the HCA out of order: +*/ +mmiowb (); +spin_unlock_irqrestore (&srq->lock, flags);return err; }