Commit 0cdf6990 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (76 commits)
  IB: Update MAINTAINERS with Hal's new email address
  IB/mlx4: Implement query SRQ
  IB/mlx4: Implement query QP
  IB/cm: Send no match if a SIDR REQ does not match a listen
  IB/cm: Fix handling of duplicate SIDR REQs
  IB/cm: cm_msgs.h should include ib_cm.h
  IB/cm: Include HCA ACK delay in local ACK timeout
  IB/cm: Use spin_lock_irq() instead of spin_lock_irqsave() when possible
  IB/sa: Make sure SA queries use default P_Key
  IPoIB: Recycle loopback skbs instead of freeing and reallocating
  IB/mthca: Replace memset(<addr>, 0, PAGE_SIZE) with clear_page(<addr>)
  IPoIB/cm: Fix warning if IPV6 is not enabled
  IB/core: Take sizeof the correct pointer when calling kmalloc()
  IB/ehca: Improve latency by unlocking after triggering the hardware
  IB/ehca: Notify consumers of LID/PKEY/SM changes after nondisruptive events
  IB/ehca: Return QP pointer in poll_cq()
  IB/ehca: Change idr spinlocks into rwlocks
  IB/ehca: Refactor sync between completions and destroy_cq using atomic_t
  IB/ehca: Lock renaming, static initializers
  IB/ehca: Report RDMA atomic attributes in query_qp()
  ...
parents de081fa5 cec7c893

MAINTAINERS

+8 −7
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ P: Tom Tucker 
M:	tom@opengridcomputing.com

P:	Steve Wise

M:	swise@opengridcomputing.com

L:	openib-general@openib.org

L:	general@lists.openfabrics.org

S:	Maintained



AOA (Apple Onboard Audio) ALSA DRIVER
@@ -1395,7 +1395,7 @@ P: Hoang-Nam Nguyen 
M:	hnguyen@de.ibm.com

P:	Christoph Raisch

M:	raisch@de.ibm.com

L:	openib-general@openib.org

L:	general@lists.openfabrics.org

S:	Supported



EMU10K1 SOUND DRIVER
@@ -1849,8 +1849,8 @@ M: rolandd@cisco.com 
P:	Sean Hefty

M:	mshefty@ichips.intel.com

P:	Hal Rosenstock

M:	halr@voltaire.com

L:	openib-general@openib.org

M:	hal.rosenstock@gmail.com 

L:	general@lists.openfabrics.org

W:	http://www.openib.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git

S:	Supported
@@ -1988,9 +1988,10 @@ M: jjciarla@raiz.uncu.edu.ar 
S:	Maintained



IPATH DRIVER:

P:	Bryan O'Sullivan

M:	support@pathscale.com

L:	openib-general@openib.org

P:	Arthur Jones

M:	infinipath@qlogic.com

L:	general@lists.openfabrics.org

T:	git git://git.qlogic.com/ipath-linux-2.6

S:	Supported



IPMI SUBSYSTEM

drivers/infiniband/Kconfig

+7 −8
Original line number Diff line number Diff line 
menu "InfiniBand support"

	depends on HAS_IOMEM



config INFINIBAND

	depends on PCI || BROKEN

menuconfig INFINIBAND

	tristate "InfiniBand support"

	depends on PCI || BROKEN

	depends on HAS_IOMEM

	---help---

	  Core support for InfiniBand (IB).  Make sure to also select

	  any protocols you wish to use as well as drivers for your

	  InfiniBand hardware.



if INFINIBAND



config INFINIBAND_USER_MAD

	tristate "InfiniBand userspace MAD support"

	depends on INFINIBAND
@@ -20,7 +20,6 @@ config INFINIBAND_USER_MAD 


config INFINIBAND_USER_ACCESS

	tristate "InfiniBand userspace access (verbs and CM)"

	depends on INFINIBAND

	---help---

	  Userspace InfiniBand access support.  This enables the

	  kernel side of userspace verbs and the userspace
@@ -37,7 +36,7 @@ config INFINIBAND_USER_MEM 


config INFINIBAND_ADDR_TRANS

	bool

	depends on INFINIBAND && INET

	depends on INET

	default y



source "drivers/infiniband/hw/mthca/Kconfig"
@@ -54,4 +53,4 @@ source "drivers/infiniband/ulp/srp/Kconfig" 


source "drivers/infiniband/ulp/iser/Kconfig"



endmenu
 
endif # INFINIBAND

drivers/infiniband/core/agent.c

+16 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2004, 2005 Infinicon Corporation.  All rights reserved.

 * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.

 * Copyright (c) 2004, 2005 Topspin Corporation.  All rights reserved.

 * Copyright (c) 2004, 2005 Voltaire Corporation.  All rights reserved.

 * Copyright (c) 2004-2007 Voltaire Corporation.  All rights reserved.

 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two
@@ -34,7 +34,6 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 * $Id: agent.c 1389 2004-12-27 22:56:47Z roland $

 */



#include <linux/slab.h>
@@ -42,6 +41,7 @@ 


#include "agent.h"

#include "smi.h"

#include "mad_priv.h"



#define SPFX "ib_agent: "
@@ -87,8 +87,13 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh, 
	struct ib_mad_send_buf *send_buf;

	struct ib_ah *ah;

	int ret;

	struct ib_mad_send_wr_private *mad_send_wr;



	if (device->node_type == RDMA_NODE_IB_SWITCH)

		port_priv = ib_get_agent_port(device, 0);

	else

		port_priv = ib_get_agent_port(device, port_num);



	if (!port_priv) {

		printk(KERN_ERR SPFX "Unable to find port agent\n");

		return -ENODEV;
@@ -113,6 +118,14 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh, 


	memcpy(send_buf->mad, mad, sizeof *mad);

	send_buf->ah = ah;



	if (device->node_type == RDMA_NODE_IB_SWITCH) {

		mad_send_wr = container_of(send_buf,

					   struct ib_mad_send_wr_private,

					   send_buf);

		mad_send_wr->send_wr.wr.ud.port_num = port_num;

	}



	if ((ret = ib_post_send_mad(send_buf, NULL))) {

		printk(KERN_ERR SPFX "ib_post_send_mad error:%d\n", ret);

		goto err2;

drivers/infiniband/core/cm.c

+134 −113

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/core/cm_msgs.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define CM_MSGS_H



#include <rdma/ib_mad.h>

#include <rdma/ib_cm.h>



/*

 * Parameters to routines below should be in network-byte order, and values

CRA Git | Maintained and supported by SUSTech CRA and CCSE