iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] IB: move include files to include/rdma

Browse Source 
Move the InfiniBand headers from drivers/infiniband/include to include/rdma.
This allows InfiniBand-using code to live elsewhere, and lets us remove the
ugly EXTRA_CFLAGS include path from the InfiniBand Makefiles.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier 2005-08-25 13:40:04 -07:00 committed by Roland Dreier
parent 1ad62a19f1
commit a4d61e8480
41 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/core/Makefile
View File

@ -1,5 +1,3 @@
EXTRA_CFLAGS += -Idrivers/infiniband/include
obj-$(CONFIG_INFINIBAND) += ib_core.o ib_mad.o ib_sa.o \ obj-$(CONFIG_INFINIBAND) += ib_core.o ib_mad.o ib_sa.o \
ib_cm.o ib_umad.o ib_ucm.o ib_cm.o ib_umad.o ib_ucm.o
obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o

2
drivers/infiniband/core/agent.c
View File

@ -41,7 +41,7 @@
#include <asm/bug.h> #include <asm/bug.h>
#include <ib_smi.h> #include <rdma/ib_smi.h>
#include "smi.h" #include "smi.h"
#include "agent_priv.h" #include "agent_priv.h"

2
drivers/infiniband/core/cache.c
View File

@ -39,7 +39,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include "core_priv.h" #include "core_priv.h"

4
drivers/infiniband/core/cm.c
View File

@ -43,8 +43,8 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include <ib_cm.h> #include <rdma/ib_cm.h>
#include "cm_msgs.h" #include "cm_msgs.h"
MODULE_AUTHOR("Sean Hefty"); MODULE_AUTHOR("Sean Hefty");

2
drivers/infiniband/core/cm_msgs.h
View File

@ -34,7 +34,7 @@
#if !defined(CM_MSGS_H) #if !defined(CM_MSGS_H)
#define CM_MSGS_H #define CM_MSGS_H
#include <ib_mad.h> #include <rdma/ib_mad.h>
/* /*
* Parameters to routines below should be in network-byte order, and values * Parameters to routines below should be in network-byte order, and values

2
drivers/infiniband/core/core_priv.h
View File

@ -38,7 +38,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
int ib_device_register_sysfs(struct ib_device *device); int ib_device_register_sysfs(struct ib_device *device);
void ib_device_unregister_sysfs(struct ib_device *device); void ib_device_unregister_sysfs(struct ib_device *device);

2
drivers/infiniband/core/fmr_pool.c
View File

@ -39,7 +39,7 @@
#include <linux/jhash.h> #include <linux/jhash.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <ib_fmr_pool.h> #include <rdma/ib_fmr_pool.h>
#include "core_priv.h" #include "core_priv.h"

4
drivers/infiniband/core/mad_priv.h
View File

@ -40,8 +40,8 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <ib_mad.h> #include <rdma/ib_mad.h>
#include <ib_smi.h> #include <rdma/ib_smi.h>
#define PFX "ib_mad: " #define PFX "ib_mad: "

2
drivers/infiniband/core/packer.c
View File

@ -33,7 +33,7 @@
* $Id: packer.c 1349 2004-12-16 21:09:43Z roland $ * $Id: packer.c 1349 2004-12-16 21:09:43Z roland $
*/ */
#include <ib_pack.h> #include <rdma/ib_pack.h>
static u64 value_read(int offset, int size, void *structure) static u64 value_read(int offset, int size, void *structure)
{ {

4
drivers/infiniband/core/sa_query.c
View File

@ -44,8 +44,8 @@
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#include <ib_sa.h> #include <rdma/ib_sa.h>
MODULE_AUTHOR("Roland Dreier"); MODULE_AUTHOR("Roland Dreier");
MODULE_DESCRIPTION("InfiniBand subnet administration query support"); MODULE_DESCRIPTION("InfiniBand subnet administration query support");

2
drivers/infiniband/core/smi.c
View File

@ -37,7 +37,7 @@
* $Id: smi.c 1389 2004-12-27 22:56:47Z roland $ * $Id: smi.c 1389 2004-12-27 22:56:47Z roland $
*/ */
#include <ib_smi.h> #include <rdma/ib_smi.h>
#include "smi.h" #include "smi.h"
/* /*

2
drivers/infiniband/core/sysfs.c
View File

@ -36,7 +36,7 @@
#include "core_priv.h" #include "core_priv.h"
#include <ib_mad.h> #include <rdma/ib_mad.h>
struct ib_port { struct ib_port {
struct kobject kobj; struct kobject kobj;

4
drivers/infiniband/core/ucm.h
View File

@ -40,8 +40,8 @@
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <ib_cm.h> #include <rdma/ib_cm.h>
#include <ib_user_cm.h> #include <rdma/ib_user_cm.h>
#define IB_UCM_CM_ID_INVALID 0xffffffff #define IB_UCM_CM_ID_INVALID 0xffffffff

2
drivers/infiniband/core/ud_header.c
View File

@ -35,7 +35,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#define STRUCT_FIELD(header, field) \ #define STRUCT_FIELD(header, field) \
.struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field), \ .struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field), \

4
drivers/infiniband/core/user_mad.c
View File

@ -49,8 +49,8 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <ib_mad.h> #include <rdma/ib_mad.h>
#include <ib_user_mad.h> #include <rdma/ib_user_mad.h>
MODULE_AUTHOR("Roland Dreier"); MODULE_AUTHOR("Roland Dreier");
MODULE_DESCRIPTION("InfiniBand userspace MAD packet access"); MODULE_DESCRIPTION("InfiniBand userspace MAD packet access");

4
drivers/infiniband/core/uverbs.h
View File

@ -45,8 +45,8 @@
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_user_verbs.h> #include <rdma/ib_user_verbs.h>
struct ib_uverbs_device { struct ib_uverbs_device {
int devnum; int devnum;

4
drivers/infiniband/core/verbs.c
View File

@ -41,8 +41,8 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/err.h> #include <linux/err.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
/* Protection domains */ /* Protection domains */

2
drivers/infiniband/hw/mthca/Makefile
View File

@ -1,5 +1,3 @@
EXTRA_CFLAGS += -Idrivers/infiniband/include
ifdef CONFIG_INFINIBAND_MTHCA_DEBUG ifdef CONFIG_INFINIBAND_MTHCA_DEBUG
EXTRA_CFLAGS += -DDEBUG EXTRA_CFLAGS += -DDEBUG
endif endif

4
drivers/infiniband/hw/mthca/mthca_av.c
View File

@ -35,8 +35,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include "mthca_dev.h" #include "mthca_dev.h"

2
drivers/infiniband/hw/mthca/mthca_cmd.c
View File

@ -37,7 +37,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/io.h> #include <asm/io.h>
#include <ib_mad.h> #include <rdma/ib_mad.h>
#include "mthca_dev.h" #include "mthca_dev.h"
#include "mthca_config_reg.h" #include "mthca_config_reg.h"

2
drivers/infiniband/hw/mthca/mthca_cmd.h
View File

@ -36,7 +36,7 @@
#ifndef MTHCA_CMD_H #ifndef MTHCA_CMD_H
#define MTHCA_CMD_H #define MTHCA_CMD_H
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#define MTHCA_MAILBOX_SIZE 4096 #define MTHCA_MAILBOX_SIZE 4096

2
drivers/infiniband/hw/mthca/mthca_cq.c
View File

@ -39,7 +39,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#include "mthca_dev.h" #include "mthca_dev.h"
#include "mthca_cmd.h" #include "mthca_cmd.h"

6
drivers/infiniband/hw/mthca/mthca_mad.c
View File

@ -34,9 +34,9 @@
* $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $ * $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $
*/ */
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_mad.h> #include <rdma/ib_mad.h>
#include <ib_smi.h> #include <rdma/ib_smi.h>
#include "mthca_dev.h" #include "mthca_dev.h"
#include "mthca_cmd.h" #include "mthca_cmd.h"

2
drivers/infiniband/hw/mthca/mthca_provider.c
View File

@ -36,7 +36,7 @@
* $Id: mthca_provider.c 1397 2004-12-28 05:09:00Z roland $ * $Id: mthca_provider.c 1397 2004-12-28 05:09:00Z roland $
*/ */
#include <ib_smi.h> #include <rdma/ib_smi.h>
#include <linux/mm.h> #include <linux/mm.h>
#include "mthca_dev.h" #include "mthca_dev.h"

4
drivers/infiniband/hw/mthca/mthca_provider.h
View File

@ -37,8 +37,8 @@
#ifndef MTHCA_PROVIDER_H #ifndef MTHCA_PROVIDER_H
#define MTHCA_PROVIDER_H #define MTHCA_PROVIDER_H
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#define MTHCA_MPT_FLAG_ATOMIC (1 << 14) #define MTHCA_MPT_FLAG_ATOMIC (1 << 14)
#define MTHCA_MPT_FLAG_REMOTE_WRITE (1 << 13) #define MTHCA_MPT_FLAG_REMOTE_WRITE (1 << 13)

6
drivers/infiniband/hw/mthca/mthca_qp.c
View File

@ -37,9 +37,9 @@
#include <linux/init.h> #include <linux/init.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#include "mthca_dev.h" #include "mthca_dev.h"
#include "mthca_cmd.h" #include "mthca_cmd.h"

2
drivers/infiniband/ulp/ipoib/Makefile
View File

@ -1,5 +1,3 @@
EXTRA_CFLAGS += -Idrivers/infiniband/include
obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o
ib_ipoib-y := ipoib_main.o \ ib_ipoib-y := ipoib_main.o \

6
drivers/infiniband/ulp/ipoib/ipoib.h
View File

@ -51,9 +51,9 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_pack.h> #include <rdma/ib_pack.h>
#include <ib_sa.h> #include <rdma/ib_sa.h>
/* constants */ /* constants */

2
drivers/infiniband/ulp/ipoib/ipoib_ib.c
View File

@ -38,7 +38,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include "ipoib.h" #include "ipoib.h"

2
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
View File

@ -33,7 +33,7 @@
* $Id: ipoib_verbs.c 1349 2004-12-16 21:09:43Z roland $ * $Id: ipoib_verbs.c 1349 2004-12-16 21:09:43Z roland $
*/ */
#include <ib_cache.h> #include <rdma/ib_cache.h>
#include "ipoib.h" #include "ipoib.h"

2
drivers/infiniband/include/ib_cache.h → include/rdma/ib_cache.h
View File

@ -37,7 +37,7 @@
#ifndef _IB_CACHE_H #ifndef _IB_CACHE_H
#define _IB_CACHE_H #define _IB_CACHE_H
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
/** /**
* ib_get_cached_gid - Returns a cached GID table entry * ib_get_cached_gid - Returns a cached GID table entry

4
drivers/infiniband/include/ib_cm.h → include/rdma/ib_cm.h
View File

@ -37,8 +37,8 @@
#if !defined(IB_CM_H) #if !defined(IB_CM_H)
#define IB_CM_H #define IB_CM_H
#include <ib_mad.h> #include <rdma/ib_mad.h>
#include <ib_sa.h> #include <rdma/ib_sa.h>
enum ib_cm_state { enum ib_cm_state {
IB_CM_IDLE, IB_CM_IDLE,

2
drivers/infiniband/include/ib_fmr_pool.h → include/rdma/ib_fmr_pool.h
View File

@ -36,7 +36,7 @@
#if !defined(IB_FMR_POOL_H) #if !defined(IB_FMR_POOL_H)
#define IB_FMR_POOL_H #define IB_FMR_POOL_H
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
struct ib_fmr_pool; struct ib_fmr_pool;

2
drivers/infiniband/include/ib_mad.h → include/rdma/ib_mad.h
View File

@ -41,7 +41,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
/* Management base version */ /* Management base version */
#define IB_MGMT_BASE_VERSION 1 #define IB_MGMT_BASE_VERSION 1

2
drivers/infiniband/include/ib_pack.h → include/rdma/ib_pack.h
View File

@ -35,7 +35,7 @@
#ifndef IB_PACK_H #ifndef IB_PACK_H
#define IB_PACK_H #define IB_PACK_H
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
enum { enum {
IB_LRH_BYTES = 8, IB_LRH_BYTES = 8,

4
drivers/infiniband/include/ib_sa.h → include/rdma/ib_sa.h
View File

@ -38,8 +38,8 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <ib_verbs.h> #include <rdma/ib_verbs.h>
#include <ib_mad.h> #include <rdma/ib_mad.h>
enum { enum {
IB_SA_CLASS_VERSION = 2, /* IB spec version 1.1/1.2 */ IB_SA_CLASS_VERSION = 2, /* IB spec version 1.1/1.2 */

2
drivers/infiniband/include/ib_smi.h → include/rdma/ib_smi.h
View File

@ -39,7 +39,7 @@
#if !defined( IB_SMI_H ) #if !defined( IB_SMI_H )
#define IB_SMI_H #define IB_SMI_H
#include <ib_mad.h> #include <rdma/ib_mad.h>
#define IB_SMP_DATA_SIZE 64 #define IB_SMP_DATA_SIZE 64
#define IB_SMP_MAX_PATH_HOPS 64 #define IB_SMP_MAX_PATH_HOPS 64

0
drivers/infiniband/include/ib_user_cm.h → include/rdma/ib_user_cm.h
View File

0
drivers/infiniband/include/ib_user_mad.h → include/rdma/ib_user_mad.h
View File

0
drivers/infiniband/include/ib_user_verbs.h → include/rdma/ib_user_verbs.h
View File

0
drivers/infiniband/include/ib_verbs.h → include/rdma/ib_verbs.h
View File