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

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

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

Pull main rdma updates from Doug Ledford:
 "This is the main pull request for the rdma stack this release.  The
  code has been through 0day and I had it tagged for linux-next testing
  for a couple days.

  Summary:

   - updates to mlx5

   - updates to mlx4 (two conflicts, both minor and easily resolved)

   - updates to iw_cxgb4 (one conflict, not so obvious to resolve,
     proper resolution is to keep the code in cxgb4_main.c as it is in
     Linus' tree as attach_uld was refactored and moved into
     cxgb4_uld.c)

   - improvements to uAPI (moved vendor specific API elements to uAPI
     area)

   - add hns-roce driver and hns and hns-roce ACPI reset support

   - conversion of all rdma code away from deprecated
     create_singlethread_workqueue

   - security improvement: remove unsafe ib_get_dma_mr (breaks lustre in
     staging)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (75 commits)
  staging/lustre: Disable InfiniBand support
  iw_cxgb4: add fast-path for small REG_MR operations
  cxgb4: advertise support for FR_NSMR_TPTE_WR
  IB/core: correctly handle rdma_rw_init_mrs() failure
  IB/srp: Fix infinite loop when FMR sg[0].offset != 0
  IB/srp: Remove an unused argument
  IB/core: Improve ib_map_mr_sg() documentation
  IB/mlx4: Fix possible vl/sl field mismatch in LRH header in QP1 packets
  IB/mthca: Move user vendor structures
  IB/nes: Move user vendor structures
  IB/ocrdma: Move user vendor structures
  IB/mlx4: Move user vendor structures
  IB/cxgb4: Move user vendor structures
  IB/cxgb3: Move user vendor structures
  IB/mlx5: Move and decouple user vendor structures
  IB/{core,hw}: Add constant for node_desc
  ipoib: Make ipoib_warn ratelimited
  IB/mlx4/alias_GUID: Remove deprecated create_singlethread_workqueue
  IB/ipoib_verbs: Remove deprecated create_singlethread_workqueue
  IB/ipoib: Remove deprecated create_singlethread_workqueue
  ...
parents 1fde76f1 2937f375

Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt

0 → 100644
+107 −0
Original line number Diff line number Diff line 
Hisilicon RoCE DT description



Hisilicon RoCE engine is a part of network subsystem.

It works depending on other part of network wubsytem, such as, gmac and

dsa fabric.



Additional properties are described here:



Required properties:

- compatible: Should contain "hisilicon,hns-roce-v1".

- reg: Physical base address of the RoCE driver and

length of memory mapped region.

- eth-handle: phandle, specifies a reference to a node

representing a ethernet device.

- dsaf-handle: phandle, specifies a reference to a node

representing a dsaf device.

- #address-cells: must be 2

- #size-cells: must be 2

Optional properties:

- dma-coherent: Present if DMA operations are coherent.

- interrupt-parent: the interrupt parent of this device.

- interrupts: should contain 32 completion event irq,1 async event irq

and 1 event overflow irq.

- interrupt-names:should be one of 34 irqs for roce device

  - hns-roce-comp-0 ~ hns-roce-comp-31: 32 complete event irq

  - hns-roce-async: 1 async event irq

  - hns-roce-common: named common exception warning irq

Example:

	infiniband@c4000000 {

			compatible = "hisilicon,hns-roce-v1";

			reg = <0x0 0xc4000000 0x0 0x100000>;

			dma-coherent;

			eth-handle = <&eth2 &eth3 &eth4 &eth5 &eth6 &eth7>;

			dsaf-handle = <&soc0_dsa>;

			#address-cells = <2>;

			#size-cells = <2>;

			interrupt-parent = <&mbigen_dsa>;

			interrupts = <722 1>,

					<723 1>,

					<724 1>,

					<725 1>,

					<726 1>,

					<727 1>,

					<728 1>,

					<729 1>,

					<730 1>,

					<731 1>,

					<732 1>,

					<733 1>,

					<734 1>,

					<735 1>,

					<736 1>,

					<737 1>,

					<738 1>,

					<739 1>,

					<740 1>,

					<741 1>,

					<742 1>,

					<743 1>,

					<744 1>,

					<745 1>,

					<746 1>,

					<747 1>,

					<748 1>,

					<749 1>,

					<750 1>,

					<751 1>,

					<752 1>,

					<753 1>,

					<785 1>,

					<754 4>;



			interrupt-names = "hns-roce-comp-0",

					"hns-roce-comp-1",

					"hns-roce-comp-2",

					"hns-roce-comp-3",

					"hns-roce-comp-4",

					"hns-roce-comp-5",

					"hns-roce-comp-6",

					"hns-roce-comp-7",

					"hns-roce-comp-8",

					"hns-roce-comp-9",

					"hns-roce-comp-10",

					"hns-roce-comp-11",

					"hns-roce-comp-12",

					"hns-roce-comp-13",

					"hns-roce-comp-14",

					"hns-roce-comp-15",

					"hns-roce-comp-16",

					"hns-roce-comp-17",

					"hns-roce-comp-18",

					"hns-roce-comp-19",

					"hns-roce-comp-20",

					"hns-roce-comp-21",

					"hns-roce-comp-22",

					"hns-roce-comp-23",

					"hns-roce-comp-24",

					"hns-roce-comp-25",

					"hns-roce-comp-26",

					"hns-roce-comp-27",

					"hns-roce-comp-28",

					"hns-roce-comp-29",

					"hns-roce-comp-30",

					"hns-roce-comp-31",

					"hns-roce-async",

					"hns-roce-common";

		};

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,7 @@ L: linux-rdma@vger.kernel.org 
W:	http://www.openfabrics.org

S:	Supported

F:	drivers/infiniband/hw/cxgb3/

F:	include/uapi/rdma/cxgb3-abi.h



CXGB4 ETHERNET DRIVER (CXGB4)

M:	Hariprasad S <hariprasad@chelsio.com>
@@ -3530,6 +3531,7 @@ L: linux-rdma@vger.kernel.org 
W:	http://www.openfabrics.org

S:	Supported

F:	drivers/infiniband/hw/cxgb4/

F:	include/uapi/rdma/cxgb4-abi.h



CXGB4VF ETHERNET DRIVER (CXGB4VF)

M:	Casey Leedom <leedom@chelsio.com>
@@ -5712,6 +5714,14 @@ S: Maintained 
F:	drivers/net/ethernet/hisilicon/

F:	Documentation/devicetree/bindings/net/hisilicon*.txt



HISILICON ROCE DRIVER

M:	Lijun Ou <oulijun@huawei.com>

M:	Wei Hu(Xavier) <xavier.huwei@huawei.com>

L:	linux-rdma@vger.kernel.org

S:	Maintained

F:	drivers/infiniband/hw/hns/

F:	Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt



HISILICON SAS Controller

M:	John Garry <john.garry@huawei.com>

W:	http://www.hisilicon.com
@@ -7970,6 +7980,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
S:	Supported

F:	drivers/net/ethernet/mellanox/mlx4/

F:	include/linux/mlx4/

F:	include/uapi/rdma/mlx4-abi.h



MELLANOX MLX4 IB driver

M:	Yishai Hadas <yishaih@mellanox.com>
@@ -7990,6 +8001,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
S:	Supported

F:	drivers/net/ethernet/mellanox/mlx5/core/

F:	include/linux/mlx5/

F:	include/uapi/rdma/mlx5-abi.h



MELLANOX MLX5 IB driver

M:	Matan Barak <matanb@mellanox.com>
@@ -8262,6 +8274,7 @@ L: linux-rdma@vger.kernel.org 
W:	http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm

S:	Supported

F:	drivers/infiniband/hw/nes/

F:	include/uapi/rdma/nes-abi.h



NETEM NETWORK EMULATOR

M:	Stephen Hemminger <stephen@networkplumber.org>
@@ -10821,6 +10834,7 @@ L: linux-rdma@vger.kernel.org 
W:	http://www.emulex.com

S:	Supported

F:	drivers/infiniband/hw/ocrdma/

F:	include/uapi/rdma/ocrdma-abi.h



SFC NETWORK DRIVER

M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ source "drivers/infiniband/hw/mlx5/Kconfig" 
source "drivers/infiniband/hw/nes/Kconfig"

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

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

source "drivers/infiniband/hw/hns/Kconfig"



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

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static struct notifier_block nb = { 


int addr_init(void)

{

	addr_wq = create_singlethread_workqueue("ib_addr");

	addr_wq = alloc_workqueue("ib_addr", WQ_MEM_RECLAIM, 0);

	if (!addr_wq)

		return -ENOMEM;

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -4369,7 +4369,7 @@ static int __init cma_init(void) 
{

	int ret;



	cma_wq = create_singlethread_workqueue("rdma_cm");

	cma_wq = alloc_ordered_workqueue("rdma_cm", WQ_MEM_RECLAIM);

	if (!cma_wq)

		return -ENOMEM;