IB/ipath: kbuild infrastructure

Integrate the ipath core and OpenIB drivers into the kernel build
infrastructure.  Add entry to MAINTAINERS.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c9465811addce19e2ca571afc4919b2aa7a7584a..f97657b7e2c712e54ab7d67f0ab671e6118b706d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1451,6 +1451,12 @@ P:       Juanjo Ciarlante
 M:     jjciarla@raiz.uncu.edu.ar
 S:     Maintained
 
+IPATH DRIVER:
+P:     Bryan O'Sullivan
+M:     support@pathscale.com
+L:     openib-general@openib.org
+S:     Supported
+
 IPX NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
 M:     acme@conectiva.com.br

diff --git a/drivers/Makefile b/drivers/Makefile
index 424955274e60c2db7fe50bb5c39ffc1d23d3dfbe..2449ec55ca28c806876e6c1a3bd0e49246b173d6 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_EISA)            += eisa/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
 obj-$(CONFIG_MMC)              += mmc/
 obj-$(CONFIG_INFINIBAND)       += infiniband/
+obj-$(CONFIG_IPATH_CORE)       += infiniband/
 obj-$(CONFIG_SGI_SN)           += sn/
 obj-y                          += firmware/
 obj-$(CONFIG_CRYPTO)           += crypto/

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index bdf0891a92dd5f27e2708dc961da5f2e9a7a04e9..afc612b8577dc6c6f673fb5d2913031256c49877 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -30,6 +30,7 @@ config INFINIBAND_USER_ACCESS
          <http://www.openib.org>.
 
 source "drivers/infiniband/hw/mthca/Kconfig"
+source "drivers/infiniband/hw/ipath/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 

diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index a43fb34cca94d01e47d3670bfefb4f35a4b45933..eea27322a22d645b27da95ab61cf2aa0e5d85717 100644 (file)
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_INFINIBAND)               += core/
 obj-$(CONFIG_INFINIBAND_MTHCA)         += hw/mthca/
+obj-$(CONFIG_IPATH_CORE)               += hw/ipath/
 obj-$(CONFIG_INFINIBAND_IPOIB)         += ulp/ipoib/
 obj-$(CONFIG_INFINIBAND_SRP)           += ulp/srp/

diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig
new file mode 100644 (file)
index 0000000..9ea67c4
--- /dev/null
+++ b/drivers/infiniband/hw/ipath/Kconfig
@@ -0,0 +1,16 @@
+config IPATH_CORE
+       tristate "PathScale InfiniPath Driver"
+       depends on 64BIT && PCI_MSI && NET
+       ---help---
+       This is a low-level driver for PathScale InfiniPath host channel
+       adapters (HCAs) based on the HT-400 and PE-800 chips.
+
+config INFINIBAND_IPATH
+       tristate "PathScale InfiniPath Verbs Driver"
+       depends on IPATH_CORE && INFINIBAND
+       ---help---
+       This is a driver that provides InfiniBand verbs support for
+       PathScale InfiniPath host channel adapters (HCAs).  This
+       allows these devices to be used with both kernel upper level
+       protocols such as IP-over-InfiniBand as well as with userspace
+       applications (in conjunction with InfiniBand userspace access).

diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
new file mode 100644 (file)
index 0000000..b4d084a
--- /dev/null
+++ b/drivers/infiniband/hw/ipath/Makefile
@@ -0,0 +1,36 @@
+EXTRA_CFLAGS += -DIPATH_IDSTR='"PathScale kernel.org driver"' \
+       -DIPATH_KERN_TYPE=0
+
+obj-$(CONFIG_IPATH_CORE) += ipath_core.o
+obj-$(CONFIG_INFINIBAND_IPATH) += ib_ipath.o
+
+ipath_core-y := \
+       ipath_diag.o \
+       ipath_driver.o \
+       ipath_eeprom.o \
+       ipath_file_ops.o \
+       ipath_fs.o \
+       ipath_ht400.o \
+       ipath_init_chip.o \
+       ipath_intr.o \
+       ipath_layer.o \
+       ipath_pe800.o \
+       ipath_stats.o \
+       ipath_sysfs.o \
+       ipath_user_pages.o
+
+ipath_core-$(CONFIG_X86_64) += ipath_wc_x86_64.o
+
+ib_ipath-y := \
+       ipath_cq.o \
+       ipath_keys.o \
+       ipath_mad.o \
+       ipath_mr.o \
+       ipath_qp.o \
+       ipath_rc.o \
+       ipath_ruc.o \
+       ipath_srq.o \
+       ipath_uc.o \
+       ipath_ud.o \
+       ipath_verbs.o \
+       ipath_verbs_mcast.o