Commit d7688697 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma updates from Jason Gunthorpe:
 "Again another fairly quiet cycle with few notable core code changes
  and the usual variety of driver bug fixes and small improvements.

   - Various driver updates and bug fixes for siw, bnxt_re, hns, qedr,
     iw_cxgb4, vmw_pvrdma, mlx5

   - Improvements in SRPT from working with iWarp

   - SRIOV VF support for bnxt_re

   - Skeleton kernel-doc files for drivers/infiniband

   - User visible counters for events related to ODP

   - Common code for tracking of mmap lifetimes so that drivers can link
     HW object liftime to a VMA

   - ODP bug fixes and rework

   - RDMA READ support for efa

   - Removal of the very old cxgb3 driver"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (168 commits)
  RDMA/hns: Delete unnecessary callback functions for cq
  RDMA/hns: Rename the functions used inside creating cq
  RDMA/hns: Redefine the member of hns_roce_cq struct
  RDMA/hns: Redefine interfaces used in creating cq
  RDMA/efa: Expose RDMA read related attributes
  RDMA/efa: Support remote read access in MR registration
  RDMA/efa: Store network attributes in device attributes
  IB/hfi1: remove redundant assignment to variable ret
  RDMA/bnxt_re: Fix missing le16_to_cpu
  RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices
  RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series
  RDMA/bnxt_re: Fix Kconfig indentation
  IB/mlx5: Implement callbacks for getting VFs GUID attributes
  IB/ipoib: Add ndo operation for getting VFs GUID attributes
  IB/core: Add interfaces to get VF node and port GUIDs
  net/core: Add support for getting VF GUIDs
  RDMA/qedr: Fix null-pointer dereference when calling rdma_user_mmap_get_offset
  RDMA/cm: Use refcount_t type for refcount variable
  IB/mlx5: Support extended number of strides for Striding RQ
  IB/mlx4: Update HW GID table while adding vlan GID
  ...
parents 0e45384c f295e4ce

Documentation/ABI/stable/sysfs-class-infiniband

+0 −19
Original line number Diff line number Diff line
@@ -314,25 +314,6 @@ Description: 
		board_id:	(RO) Manufacturing board ID





sysfs interface for Chelsio T3 RDMA Driver (cxgb3)

--------------------------------------------------



What:		/sys/class/infiniband/cxgb3_X/hw_rev

What:		/sys/class/infiniband/cxgb3_X/hca_type

What:		/sys/class/infiniband/cxgb3_X/board_id

Date:		Feb, 2007

KernelVersion:	v2.6.21

Contact:	linux-rdma@vger.kernel.org

Description:

		hw_rev:		(RO) Hardware revision number



		hca_type:	(RO) HCA type. Here it is a driver short name.

				It should normally match the name in its bus

				driver structure (e.g.  pci_driver::name).



		board_id:	(RO) Manufacturing board id





sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)

----------------------------------------------------------

Documentation/ABI/stable/sysfs-driver-ib_srp

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ Description: Interface for making ib_srp connect to a new target. 
		  initiator is allowed to queue per SCSI host. The default

		  value for this parameter is 62. The lowest supported value

		  is 2.

		* max_it_iu_size, a decimal number specifying the maximum

		  initiator to target information unit length.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006

Documentation/DMA-attributes.txt

+0 −18
Original line number Diff line number Diff line
@@ -5,24 +5,6 @@ DMA attributes 
This document describes the semantics of the DMA attributes that are

defined in linux/dma-mapping.h.



DMA_ATTR_WRITE_BARRIER

----------------------



DMA_ATTR_WRITE_BARRIER is a (write) barrier attribute for DMA.  DMA

to a memory region with the DMA_ATTR_WRITE_BARRIER attribute forces

all pending DMA writes to complete, and thus provides a mechanism to

strictly order DMA from a device across all intervening busses and

bridges.  This barrier is not specific to a particular type of

interconnect, it applies to the system as a whole, and so its

implementation must account for the idiosyncrasies of the system all

the way from the DMA device to memory.



As an example of a situation where DMA_ATTR_WRITE_BARRIER would be

useful, suppose that a device does a DMA write to indicate that data is

ready and available in memory.  The DMA of the "completion indication"

could race with data DMA.  Mapping the memory used for completion

indications with DMA_ATTR_WRITE_BARRIER would prevent the race.



DMA_ATTR_WEAK_ORDERING

----------------------

Documentation/driver-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ available subsections can be seen below. 
   device_link

   component

   message-based

   infiniband

   sound

   frame-buffer

   regulator

Documentation/driver-api/infiniband.rst

0 → 100644
+127 −0
Original line number Diff line number Diff line 
===========================================

InfiniBand and Remote DMA (RDMA) Interfaces

===========================================



Introduction and Overview

=========================



TBD



InfiniBand core interfaces

==========================



.. kernel-doc:: drivers/infiniband/core/iwpm_util.h

    :internal:



.. kernel-doc:: drivers/infiniband/core/cq.c

    :export:



.. kernel-doc:: drivers/infiniband/core/cm.c

    :export:



.. kernel-doc:: drivers/infiniband/core/rw.c

    :export:



.. kernel-doc:: drivers/infiniband/core/device.c

    :export:



.. kernel-doc:: drivers/infiniband/core/verbs.c

    :export:



.. kernel-doc:: drivers/infiniband/core/packer.c

    :export:



.. kernel-doc:: drivers/infiniband/core/sa_query.c

    :export:



.. kernel-doc:: drivers/infiniband/core/ud_header.c

    :export:



.. kernel-doc:: drivers/infiniband/core/fmr_pool.c

    :export:



.. kernel-doc:: drivers/infiniband/core/umem.c

    :export:



.. kernel-doc:: drivers/infiniband/core/umem_odp.c

    :export:



RDMA Verbs transport library

============================



.. kernel-doc:: drivers/infiniband/sw/rdmavt/mr.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/rc.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/ah.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/vt.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/cq.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/qp.c

    :export:



.. kernel-doc:: drivers/infiniband/sw/rdmavt/mcast.c

    :export:



Upper Layer Protocols

=====================



iSCSI Extensions for RDMA (iSER)

--------------------------------



.. kernel-doc:: drivers/infiniband/ulp/iser/iscsi_iser.h

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/iser/iscsi_iser.c

   :functions: iscsi_iser_pdu_alloc iser_initialize_task_headers \

	iscsi_iser_task_init iscsi_iser_mtask_xmit iscsi_iser_task_xmit \

	iscsi_iser_cleanup_task iscsi_iser_check_protection \

	iscsi_iser_conn_create iscsi_iser_conn_bind \

	iscsi_iser_conn_start iscsi_iser_conn_stop \

	iscsi_iser_session_destroy iscsi_iser_session_create \

	iscsi_iser_set_param iscsi_iser_ep_connect iscsi_iser_ep_poll \

	iscsi_iser_ep_disconnect



.. kernel-doc:: drivers/infiniband/ulp/iser/iser_initiator.c

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/iser/iser_verbs.c

   :internal:



Omni-Path (OPA) Virtual NIC support

-----------------------------------



.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c

   :internal:



InfiniBand SCSI RDMA protocol target support

--------------------------------------------



.. kernel-doc:: drivers/infiniband/ulp/srpt/ib_srpt.h

   :internal:



.. kernel-doc:: drivers/infiniband/ulp/srpt/ib_srpt.c

   :internal:



iSCSI Extensions for RDMA (iSER) target support

-----------------------------------------------



.. kernel-doc:: drivers/infiniband/ulp/isert/ib_isert.c

   :internal:

CRA Git | Maintained and supported by SUSTech CRA and CCSE