Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e585a6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull infiniband updates from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.14:
   - Flow steering for InfiniBand UD traffic
   - IP-based addressing for IBoE aka RoCE
   - Pass SRP submaintainership from Dave to Bart
   - SRP transport fixes from Bart
   - Add the new Cisco usNIC low-level device driver
   - Various other fixes"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (75 commits)
  IB/mlx5: Verify reserved fields are cleared
  IB/mlx5: Remove old field for create mkey mailbox
  IB/mlx5: Abort driver cleanup if teardown hca fails
  IB/mlx5: Allow creation of QPs with zero-length work queues
  mlx5_core: Fix PowerPC support
  mlx5_core: Improve debugfs readability
  IB/mlx5: Add support for resize CQ
  IB/mlx5: Implement modify CQ
  IB/mlx5: Make sure doorbell record is visible before doorbell
  mlx5_core: Use mlx5 core style warning
  IB/mlx5: Clear out struct before create QP command
  mlx5_core: Fix out arg size in access_register command
  RDMA/nes: Slight optimization of Ethernet address compare
  IB/qib: Fix QP check when looping back to/from QP1
  RDMA/cxgb4: Fix gcc warning on 32-bit arch
  IB/usnic: Remove unused includes of <linux/version.h>
  RDMA/amso1100: Add check if cache memory was allocated before freeing it
  IPoIB: Report operstate consistently when brought up without a link
  IB/core: Fix unused variable warning
  RDMA/cma: Handle global/non-linklocal IPv6 addresses in cma_check_linklocal()
  ...
parents 1b59bab5 fb1b5034

Documentation/scsi/scsi_transport_srp/Makefile

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
all: rport_state_diagram.svg rport_state_diagram.png



rport_state_diagram.svg: rport_state_diagram.dot

	dot -Tsvg -o $@ $<



rport_state_diagram.png: rport_state_diagram.dot

	dot -Tpng -o $@ $<

Documentation/scsi/scsi_transport_srp/rport_state_diagram.dot

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
digraph srp_initiator {

	node [shape = doublecircle]; running lost;

	node [shape = circle];



	{

	  rank = min;

	  running_rta	[ label = "running;\nreconnect\ntimer\nactive" ];

	};

	running		[ label = "running;\nreconnect\ntimer\nstopped" ];

	blocked;

	failfast	[ label = "fail I/O\nfast" ];

	lost;



	running -> running_rta		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nsrp_start_tl_fail_timers()" ];

	running_rta -> running		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nreconnecting succeeded" ];

	running -> blocked		[ label = "fast_io_fail_tmo >= 0 or\ndev_loss_tmo >= 0;\nsrp_start_tl_fail_timers()" ];

	running -> failfast		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nreconnecting failed\n" ];

	blocked -> failfast		[ label = "fast_io_fail_tmo\nexpired or\nreconnecting\nfailed" ];

	blocked -> lost			[ label = "dev_loss_tmo\nexpired or\nsrp_stop_rport_timers()" ];

	failfast -> lost		[ label = "dev_loss_tmo\nexpired or\nsrp_stop_rport_timers()" ];

	blocked -> running		[ label = "reconnecting\nsucceeded" ];

	failfast -> failfast		[ label = "reconnecting\nfailed" ];

	failfast -> running		[ label = "reconnecting\nsucceeded" ];

	running -> lost			[ label = "srp_stop_rport_timers()" ];

	running_rta -> lost		[ label = "srp_stop_rport_timers()" ];

}

MAINTAINERS

+6 −1
Original line number Original line Diff line number Diff line
@@ -2195,6 +2195,11 @@ M: Nishank Trivedi <nistrive@cisco.com> 
S:	Supported

S:	Supported

F:	drivers/net/ethernet/cisco/enic/

F:	drivers/net/ethernet/cisco/enic/





CISCO VIC LOW LATENCY NIC DRIVER

M:      Upinder Malhi <umalhi@cisco.com>

S:      Supported

F:      drivers/infiniband/hw/usnic



CIRRUS LOGIC EP93XX ETHERNET DRIVER

CIRRUS LOGIC EP93XX ETHERNET DRIVER

M:	Hartley Sweeten <hsweeten@visionengravers.com>

M:	Hartley Sweeten <hsweeten@visionengravers.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org
@@ -7528,7 +7533,7 @@ S: Maintained 
F:	drivers/scsi/sr*

F:	drivers/scsi/sr*





SCSI RDMA PROTOCOL (SRP) INITIATOR

SCSI RDMA PROTOCOL (SRP) INITIATOR

M:	David Dillow <dillowda@ornl.gov>

M:	Bart Van Assche <bvanassche@acm.org>

L:	linux-rdma@vger.kernel.org

L:	linux-rdma@vger.kernel.org

S:	Supported

S:	Supported

W:	http://www.openfabrics.org

W:	http://www.openfabrics.org

drivers/infiniband/Kconfig

+4 −2
Original line number Original line Diff line number Diff line
@@ -3,6 +3,8 @@ menuconfig INFINIBAND 
	depends on PCI || BROKEN

	depends on PCI || BROKEN

	depends on HAS_IOMEM

	depends on HAS_IOMEM

	depends on NET

	depends on NET

	depends on INET

	depends on m || IPV6 != m

	---help---

	---help---

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

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

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

	  any protocols you wish to use as well as drivers for your
@@ -38,8 +40,7 @@ config INFINIBAND_USER_MEM 




config INFINIBAND_ADDR_TRANS

config INFINIBAND_ADDR_TRANS

	bool

	bool

	depends on INET

	depends on INFINIBAND

	depends on !(INFINIBAND = y && IPV6 = m)

	default y

	default y





source "drivers/infiniband/hw/mthca/Kconfig"

source "drivers/infiniband/hw/mthca/Kconfig"
@@ -53,6 +54,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig" 
source "drivers/infiniband/hw/mlx5/Kconfig"

source "drivers/infiniband/hw/mlx5/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"

source "drivers/infiniband/hw/usnic/Kconfig"





source "drivers/infiniband/ulp/ipoib/Kconfig"

source "drivers/infiniband/ulp/ipoib/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ 
obj-$(CONFIG_MLX5_INFINIBAND)		+= hw/mlx5/

obj-$(CONFIG_MLX5_INFINIBAND)		+= hw/mlx5/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

obj-$(CONFIG_INFINIBAND_USNIC)		+= hw/usnic/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/