From: Shiraz Saleem <shiraz.sal...@intel.com>
Add Kconfig and Makefile to build irdma driver and mark i40iw
deprecated/obsolete, since the irdma driver is replacing it and supports
x722 devices.
Signed-off-by: Shiraz Saleem <shiraz.sal...@intel.com>
---
drivers/infiniband/Kconfig | 1 +
drivers/infiniband/hw/Makefile | 1 +
drivers/infiniband/hw/i40iw/Kconfig | 4 +++-
drivers/infiniband/hw/irdma/Kconfig | 11 ++++++++++
drivers/infiniband/hw/irdma/Makefile | 31 ++++++++++++++++++++++++++++
5 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 drivers/infiniband/hw/irdma/Kconfig
create mode 100644 drivers/infiniband/hw/irdma/Makefile
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 0fe6f76e8fdc..40b032a764f5 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -84,6 +84,7 @@ source "drivers/infiniband/hw/cxgb3/Kconfig"
source "drivers/infiniband/hw/cxgb4/Kconfig"
source "drivers/infiniband/hw/efa/Kconfig"
source "drivers/infiniband/hw/i40iw/Kconfig"
+source "drivers/infiniband/hw/irdma/Kconfig"
source "drivers/infiniband/hw/mlx4/Kconfig"
source "drivers/infiniband/hw/mlx5/Kconfig"
source "drivers/infiniband/hw/ocrdma/Kconfig"
diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile
index 433fca59febd..d61d690ec0d4 100644
--- a/drivers/infiniband/hw/Makefile
+++ b/drivers/infiniband/hw/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/
obj-$(CONFIG_INFINIBAND_CXGB4) += cxgb4/
obj-$(CONFIG_INFINIBAND_EFA) += efa/
obj-$(CONFIG_INFINIBAND_I40IW) += i40iw/
+obj-$(CONFIG_INFINIBAND_IRDMA) += irdma/
obj-$(CONFIG_MLX4_INFINIBAND) += mlx4/
obj-$(CONFIG_MLX5_INFINIBAND) += mlx5/
obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/
diff --git a/drivers/infiniband/hw/i40iw/Kconfig
b/drivers/infiniband/hw/i40iw/Kconfig
index d867ef1ac72a..7454b84b74be 100644
--- a/drivers/infiniband/hw/i40iw/Kconfig
+++ b/drivers/infiniband/hw/i40iw/Kconfig
@@ -1,8 +1,10 @@
config INFINIBAND_I40IW
- tristate "Intel(R) Ethernet X722 iWARP Driver"
+ tristate "Intel(R) Ethernet X722 iWARP Driver (DEPRECATED)"
depends on INET && I40E
depends on IPV6 || !IPV6
depends on PCI
+ depends on !(INFINBAND_IRDMA=y || INFINIBAND_IRDMA=m)
select GENERIC_ALLOCATOR
---help---
Intel(R) Ethernet X722 iWARP Driver
+ This driver is being replaced by irdma.
diff --git a/drivers/infiniband/hw/irdma/Kconfig
b/drivers/infiniband/hw/irdma/Kconfig
new file mode 100644
index 000000000000..652f5f978ce2
--- /dev/null
+++ b/drivers/infiniband/hw/irdma/Kconfig
@@ -0,0 +1,11 @@
+config INFINIBAND_IRDMA
+ tristate "Intel(R) Ethernet Connection RDMA Driver"
+ depends on INET && (I40E || ICE)
+ depends on IPV6 || !IPV6
+ depends on PCI
+ select GENERIC_ALLOCATOR
+ ---help---
+ This is an Ethernet RDMA driver that supports E810 (iWARP/RoCE)
+ and X722 (iWARP) network devices.
+ To compile this driver as a module, choose M here. The module
+ will be called irdma.
diff --git a/drivers/infiniband/hw/irdma/Makefile
b/drivers/infiniband/hw/irdma/Makefile
new file mode 100644
index 000000000000..455940d7cc69
--- /dev/null
+++ b/drivers/infiniband/hw/irdma/Makefile
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+# Copyright (c) 2019, Intel Corporation.
+
+#
+# Makefile for the Intel(R) Ethernet Connection RDMA Linux Driver
+#
+
+ccflags-y := -I $(srctree)/drivers/net/ethernet/intel/i40e
+ccflags-y += -I $(srctree)/drivers/net/ethernet/intel/ice
+
+obj-$(CONFIG_INFINIBAND_IRDMA) += irdma.o
+
+irdma-objs := cm.o \
+ ctrl.o \
+ hmc.o \
+ hw.o \
+ i40iw_hw.o \
+ i40iw_if.o \
+ icrdma_hw.o \
+ irdma_if.o \
+ main.o \
+ pble.o \
+ puda.o \
+ trace.o \
+ uda.o \
+ uk.o \
+ utils.o \
+ verbs.o \
+ ws.o \
+
+CFLAGS_trace.o = -I$(src)
--
2.21.0
