From dfcfb5eb15df245a9f0c29663dccd3dd60c2f8e2 Mon Sep 17 00:00:00 2001 From: Phil Cayton Date: Mon, 16 Mar 2015 16:04:26 +0200 Subject: [PATCH] Updated XEON-Phi patches Add CCL-Direct (ibp) drivers to Infiniband Add ibscif to the Infiniband HW directory Signed-off-by: Phil Cayton --- ...CCL-Direct-ibp-drivers-to-Infiniband.patch | 149 ++++++++++-------- ...bscif-to-the-Infiniband-HW-directory.patch | 106 ++++++------- 2 files changed, 134 insertions(+), 121 deletions(-) diff --git a/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch b/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch index 86e2eef..9a6458a 100644 --- a/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch +++ b/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch @@ -8,9 +8,9 @@ the server modules for sa and cm Signed-off-by: Phil Cayton --- -diff -urN a6/drivers/infiniband/ibp/cm/cm_ibp_abi.h a7/drivers/infiniband/ibp/cm/cm_ibp_abi.h +diff -ruN a6/drivers/infiniband/ibp/cm/cm_ibp_abi.h a7/drivers/infiniband/ibp/cm/cm_ibp_abi.h --- a6/drivers/infiniband/ibp/cm/cm_ibp_abi.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/cm_ibp_abi.h 2015-02-23 10:01:30.289769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/cm_ibp_abi.h 2015-03-11 11:05:40.651368454 -0700 @@ -0,0 +1,399 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -411,9 +411,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/cm_ibp_abi.h a7/drivers/infiniband/ibp/cm +}; + +#endif /* CM_IBP_ABI_H */ -diff -urN a6/drivers/infiniband/ibp/cm/cm_server_msg.c a7/drivers/infiniband/ibp/cm/cm_server_msg.c +diff -ruN a6/drivers/infiniband/ibp/cm/cm_server_msg.c a7/drivers/infiniband/ibp/cm/cm_server_msg.c --- a6/drivers/infiniband/ibp/cm/cm_server_msg.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/cm_server_msg.c 2015-02-23 10:18:09.042820508 -0800 ++++ a7/drivers/infiniband/ibp/cm/cm_server_msg.c 2015-03-11 11:05:40.651368454 -0700 @@ -0,0 +1,1058 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -1473,9 +1473,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/cm_server_msg.c a7/drivers/infiniband/ibp + + return ibp_send(client->ep, msg, len); +} -diff -urN a6/drivers/infiniband/ibp/cm/common.h a7/drivers/infiniband/ibp/cm/common.h +diff -ruN a6/drivers/infiniband/ibp/cm/common.h a7/drivers/infiniband/ibp/cm/common.h --- a6/drivers/infiniband/ibp/cm/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/common.h 2015-02-23 10:01:30.289769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/common.h 2015-03-11 11:05:40.651368454 -0700 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -1583,9 +1583,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/common.h a7/drivers/infiniband/ibp/cm/com +int ibp_recv(scif_epd_t ep, void *buf, size_t len); + +#endif /* COMMON_H */ -diff -urN a6/drivers/infiniband/ibp/cm/ibp-abi.h a7/drivers/infiniband/ibp/cm/ibp-abi.h +diff -ruN a6/drivers/infiniband/ibp/cm/ibp-abi.h a7/drivers/infiniband/ibp/cm/ibp-abi.h --- a6/drivers/infiniband/ibp/cm/ibp-abi.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/ibp-abi.h 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/ibp-abi.h 2015-03-11 11:05:40.652368454 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -1681,9 +1681,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/ibp-abi.h a7/drivers/infiniband/ibp/cm/ib +}; + +#endif /* IBP_ABI_H */ -diff -urN a6/drivers/infiniband/ibp/cm/ibp_exports.h a7/drivers/infiniband/ibp/cm/ibp_exports.h +diff -ruN a6/drivers/infiniband/ibp/cm/ibp_exports.h a7/drivers/infiniband/ibp/cm/ibp_exports.h --- a6/drivers/infiniband/ibp/cm/ibp_exports.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/ibp_exports.h 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/ibp_exports.h 2015-03-11 11:05:40.652368454 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -1735,14 +1735,19 @@ diff -urN a6/drivers/infiniband/ibp/cm/ibp_exports.h a7/drivers/infiniband/ibp/c + + +#endif /* IBP_EXPORTS_H */ -diff -urN a6/drivers/infiniband/ibp/cm/Makefile a7/drivers/infiniband/ibp/cm/Makefile +diff -ruN a6/drivers/infiniband/ibp/cm/Makefile a7/drivers/infiniband/ibp/cm/Makefile --- a6/drivers/infiniband/ibp/cm/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/Makefile 2015-02-23 10:01:30.290769309 -0800 -@@ -0,0 +1,21 @@ -+KDIR ?= /lib/modules/`uname -r`/build ++++ a7/drivers/infiniband/ibp/cm/Makefile 2015-03-11 11:06:09.751367228 -0700 +@@ -0,0 +1,26 @@ ++KERNEL_V := $(shell uname -r) ++ ++KDIR ?= /lib/modules/$(KERNEL_V)/build ++ ++SCIF_INCL := /usr/src/kernels/$(KERNEL_V)/include/modules/ + +obj-$(CONFIG_IBP_SERVER) += ibp_cm_server.o + ++ccflags-y += -I$(SCIF_INCL) +ccflags-$(CONFIG_IBP_DEBUG) += -g -DIBP_DEBUG + +ibp_cm_server-y := server.o \ @@ -1760,9 +1765,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/Makefile a7/drivers/infiniband/ibp/cm/Mak + +unix: + dos2unix *.[ch] Kconfig Makefile -diff -urN a6/drivers/infiniband/ibp/cm/server.c a7/drivers/infiniband/ibp/cm/server.c +diff -ruN a6/drivers/infiniband/ibp/cm/server.c a7/drivers/infiniband/ibp/cm/server.c --- a6/drivers/infiniband/ibp/cm/server.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/server.c 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/server.c 2015-03-11 11:05:40.652368454 -0700 @@ -0,0 +1,221 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -1985,9 +1990,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/server.c a7/drivers/infiniband/ibp/cm/ser + +module_init(ibp_cm_server_init); +module_exit(ibp_cm_server_exit); -diff -urN a6/drivers/infiniband/ibp/cm/server.h a7/drivers/infiniband/ibp/cm/server.h +diff -ruN a6/drivers/infiniband/ibp/cm/server.h a7/drivers/infiniband/ibp/cm/server.h --- a6/drivers/infiniband/ibp/cm/server.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/server.h 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/server.h 2015-03-11 11:05:40.652368454 -0700 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -2117,9 +2122,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/server.h a7/drivers/infiniband/ibp/cm/ser + struct ibp_msg_header *hdr); + +#endif /* SERVER_H */ -diff -urN a6/drivers/infiniband/ibp/cm/server_msg.c a7/drivers/infiniband/ibp/cm/server_msg.c +diff -ruN a6/drivers/infiniband/ibp/cm/server_msg.c a7/drivers/infiniband/ibp/cm/server_msg.c --- a6/drivers/infiniband/ibp/cm/server_msg.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/cm/server_msg.c 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/cm/server_msg.c 2015-03-11 11:05:40.652368454 -0700 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -2297,9 +2302,9 @@ diff -urN a6/drivers/infiniband/ibp/cm/server_msg.c a7/drivers/infiniband/ibp/cm + + return ret; +} -diff -urN a6/drivers/infiniband/ibp/drv/common.h a7/drivers/infiniband/ibp/drv/common.h +diff -ruN a6/drivers/infiniband/ibp/drv/common.h a7/drivers/infiniband/ibp/drv/common.h --- a6/drivers/infiniband/ibp/drv/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/common.h 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/common.h 2015-03-11 11:05:40.653368454 -0700 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -2410,9 +2415,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/common.h a7/drivers/infiniband/ibp/drv/c +void ibp_cleanup(void); + +#endif /* COMMON_H */ -diff -urN a6/drivers/infiniband/ibp/drv/ibp-abi.h a7/drivers/infiniband/ibp/drv/ibp-abi.h +diff -ruN a6/drivers/infiniband/ibp/drv/ibp-abi.h a7/drivers/infiniband/ibp/drv/ibp-abi.h --- a6/drivers/infiniband/ibp/drv/ibp-abi.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/ibp-abi.h 2015-02-23 10:01:30.290769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/ibp-abi.h 2015-03-11 11:05:40.653368454 -0700 @@ -0,0 +1,649 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -3063,9 +3068,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/ibp-abi.h a7/drivers/infiniband/ibp/drv/ +}; + +#endif /* IBP_ABI_H */ -diff -urN a6/drivers/infiniband/ibp/drv/ibp.h a7/drivers/infiniband/ibp/drv/ibp.h +diff -ruN a6/drivers/infiniband/ibp/drv/ibp.h a7/drivers/infiniband/ibp/drv/ibp.h --- a6/drivers/infiniband/ibp/drv/ibp.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/ibp.h 2015-02-23 10:01:30.291769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/ibp.h 2015-03-11 11:05:40.653368454 -0700 @@ -0,0 +1,257 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -3324,14 +3329,19 @@ diff -urN a6/drivers/infiniband/ibp/drv/ibp.h a7/drivers/infiniband/ibp/drv/ibp. + union ib_gid *gid, u16 lid); + +#endif /* IBP_H */ -diff -urN a6/drivers/infiniband/ibp/drv/Makefile a7/drivers/infiniband/ibp/drv/Makefile +diff -ruN a6/drivers/infiniband/ibp/drv/Makefile a7/drivers/infiniband/ibp/drv/Makefile --- a6/drivers/infiniband/ibp/drv/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/Makefile 2015-02-23 10:01:30.291769309 -0800 -@@ -0,0 +1,21 @@ -+KDIR ?= /lib/modules/`uname -r`/build ++++ a7/drivers/infiniband/ibp/drv/Makefile 2015-03-11 11:06:14.420367031 -0700 +@@ -0,0 +1,26 @@ ++KERNEL_V := $(shell uname -r) ++ ++KDIR ?= /lib/modules/$(KERNEL_V)/build + -+obj-$(CONFIG_IBP_SERVER) += ibp_server.o ++SCIF_INCL := /usr/src/kernels/$(KERNEL_V)/include/modules/ + ++obj-$(CONFIG_IBP_SERVER) += ibp_server.o ++ ++ccflags-y += -I$(SCIF_INCL) +ccflags-$(CONFIG_IBP_DEBUG) += -g -DIBP_DEBUG + +ibp_server-y := server.o \ @@ -3349,9 +3359,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/Makefile a7/drivers/infiniband/ibp/drv/M + +unix: + dos2unix *.[ch] Kconfig Makefile -diff -urN a6/drivers/infiniband/ibp/drv/server.c a7/drivers/infiniband/ibp/drv/server.c +diff -ruN a6/drivers/infiniband/ibp/drv/server.c a7/drivers/infiniband/ibp/drv/server.c --- a6/drivers/infiniband/ibp/drv/server.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/server.c 2015-02-23 10:01:30.291769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/server.c 2015-03-11 11:05:40.653368454 -0700 @@ -0,0 +1,548 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -3901,9 +3911,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/server.c a7/drivers/infiniband/ibp/drv/s + +module_init(ibp_server_init); +module_exit(ibp_server_exit); -diff -urN a6/drivers/infiniband/ibp/drv/server.h a7/drivers/infiniband/ibp/drv/server.h +diff -ruN a6/drivers/infiniband/ibp/drv/server.h a7/drivers/infiniband/ibp/drv/server.h --- a6/drivers/infiniband/ibp/drv/server.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/server.h 2015-02-23 10:01:30.291769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/server.h 2015-03-11 11:05:40.654368454 -0700 @@ -0,0 +1,191 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -4096,9 +4106,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/server.h a7/drivers/infiniband/ibp/drv/s +void ibp_put_device(struct ibp_device *device); + +#endif /* SERVER_H */ -diff -urN a6/drivers/infiniband/ibp/drv/server_msg.c a7/drivers/infiniband/ibp/drv/server_msg.c +diff -ruN a6/drivers/infiniband/ibp/drv/server_msg.c a7/drivers/infiniband/ibp/drv/server_msg.c --- a6/drivers/infiniband/ibp/drv/server_msg.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/server_msg.c 2015-02-23 10:01:30.292769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/server_msg.c 2015-03-11 11:05:40.655368454 -0700 @@ -0,0 +1,3098 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7198,9 +7208,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/server_msg.c a7/drivers/infiniband/ibp/d +out: + return ret; +} -diff -urN a6/drivers/infiniband/ibp/drv/stack.c a7/drivers/infiniband/ibp/drv/stack.c +diff -ruN a6/drivers/infiniband/ibp/drv/stack.c a7/drivers/infiniband/ibp/drv/stack.c --- a6/drivers/infiniband/ibp/drv/stack.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/stack.c 2015-02-23 10:01:30.292769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/stack.c 2015-03-11 11:05:40.655368454 -0700 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7304,9 +7314,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/stack.c a7/drivers/infiniband/ibp/drv/st + + return p; +} -diff -urN a6/drivers/infiniband/ibp/drv/stack.h a7/drivers/infiniband/ibp/drv/stack.h +diff -ruN a6/drivers/infiniband/ibp/drv/stack.h a7/drivers/infiniband/ibp/drv/stack.h --- a6/drivers/infiniband/ibp/drv/stack.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/drv/stack.h 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/drv/stack.h 2015-03-11 11:05:40.655368454 -0700 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7365,9 +7375,9 @@ diff -urN a6/drivers/infiniband/ibp/drv/stack.h a7/drivers/infiniband/ibp/drv/st +void ibp_clear_stack(struct ibp_stack *s); + +#endif /* _IBP_STACK_H_ */ -diff -urN a6/drivers/infiniband/ibp/Kconfig a7/drivers/infiniband/ibp/Kconfig +diff -ruN a6/drivers/infiniband/ibp/Kconfig a7/drivers/infiniband/ibp/Kconfig --- a6/drivers/infiniband/ibp/Kconfig 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/Kconfig 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/Kconfig 2015-03-11 11:05:40.655368454 -0700 @@ -0,0 +1,16 @@ +config IBP_SERVER + tristate "CCL Direct IB Server drivers" @@ -7385,16 +7395,16 @@ diff -urN a6/drivers/infiniband/ibp/Kconfig a7/drivers/infiniband/ibp/Kconfig + default y + ---help--- + This option causes debug code to be compiled into the CCL Direct drivers. -diff -urN a6/drivers/infiniband/ibp/Makefile a7/drivers/infiniband/ibp/Makefile +diff -ruN a6/drivers/infiniband/ibp/Makefile a7/drivers/infiniband/ibp/Makefile --- a6/drivers/infiniband/ibp/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/Makefile 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/Makefile 2015-03-11 11:05:40.655368454 -0700 @@ -0,0 +1,3 @@ +obj-$(CONFIG_IBP_SERVER) += drv/ +obj-$(CONFIG_IBP_SERVER) += cm/ +obj-$(CONFIG_IBP_SERVER) += sa/ -diff -urN a6/drivers/infiniband/ibp/sa/common.h a7/drivers/infiniband/ibp/sa/common.h +diff -ruN a6/drivers/infiniband/ibp/sa/common.h a7/drivers/infiniband/ibp/sa/common.h --- a6/drivers/infiniband/ibp/sa/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/common.h 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/common.h 2015-03-11 11:05:40.656368454 -0700 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7504,9 +7514,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/common.h a7/drivers/infiniband/ibp/sa/com +int ibp_recv(scif_epd_t ep, void *buf, size_t len); + +#endif /* COMMON_H */ -diff -urN a6/drivers/infiniband/ibp/sa/ibp-abi.h a7/drivers/infiniband/ibp/sa/ibp-abi.h +diff -ruN a6/drivers/infiniband/ibp/sa/ibp-abi.h a7/drivers/infiniband/ibp/sa/ibp-abi.h --- a6/drivers/infiniband/ibp/sa/ibp-abi.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/ibp-abi.h 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/ibp-abi.h 2015-03-11 11:05:40.656368454 -0700 @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7609,9 +7619,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/ibp-abi.h a7/drivers/infiniband/ibp/sa/ib +}; + +#endif /* IBP_ABI_H */ -diff -urN a6/drivers/infiniband/ibp/sa/ibp_exports.h a7/drivers/infiniband/ibp/sa/ibp_exports.h +diff -ruN a6/drivers/infiniband/ibp/sa/ibp_exports.h a7/drivers/infiniband/ibp/sa/ibp_exports.h --- a6/drivers/infiniband/ibp/sa/ibp_exports.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/ibp_exports.h 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/ibp_exports.h 2015-03-11 11:05:40.656368454 -0700 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7662,14 +7672,19 @@ diff -urN a6/drivers/infiniband/ibp/sa/ibp_exports.h a7/drivers/infiniband/ibp/s +u64 ibp_resolve_ib_device(struct ib_device *ibdev); + +#endif /* IBP_EXPORTS_H */ -diff -urN a6/drivers/infiniband/ibp/sa/Makefile a7/drivers/infiniband/ibp/sa/Makefile +diff -ruN a6/drivers/infiniband/ibp/sa/Makefile a7/drivers/infiniband/ibp/sa/Makefile --- a6/drivers/infiniband/ibp/sa/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/Makefile 2015-02-23 10:01:30.293769309 -0800 -@@ -0,0 +1,21 @@ -+KDIR ?= /lib/modules/`uname -r`/build ++++ a7/drivers/infiniband/ibp/sa/Makefile 2015-03-11 11:06:22.521366690 -0700 +@@ -0,0 +1,26 @@ ++KERNEL_V := $(shell uname -r) ++ ++KDIR ?= /lib/modules/$(KERNEL_V)/build ++ ++SCIF_INCL := /usr/src/kernels/$(KERNEL_V)/include/modules/ + +obj-$(CONFIG_IBP_SERVER) += ibp_sa_server.o + ++ccflags-y += -I$(SCIF_INCL) +ccflags-$(CONFIG_IBP_DEBUG) += -g -DIBP_DEBUG + +ibp_sa_server-y := server.o \ @@ -7687,9 +7702,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/Makefile a7/drivers/infiniband/ibp/sa/Mak + +unix: + dos2unix *.[ch] Kconfig Makefile -diff -urN a6/drivers/infiniband/ibp/sa/sa_ibp_abi.h a7/drivers/infiniband/ibp/sa/sa_ibp_abi.h +diff -ruN a6/drivers/infiniband/ibp/sa/sa_ibp_abi.h a7/drivers/infiniband/ibp/sa/sa_ibp_abi.h --- a6/drivers/infiniband/ibp/sa/sa_ibp_abi.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/sa_ibp_abi.h 2015-02-23 10:01:30.293769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/sa_ibp_abi.h 2015-03-11 11:05:40.656368454 -0700 @@ -0,0 +1,251 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -7942,9 +7957,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/sa_ibp_abi.h a7/drivers/infiniband/ibp/sa +}; + +#endif /* SA_IBP_ABI_H */ -diff -urN a6/drivers/infiniband/ibp/sa/sa_server_msg.c a7/drivers/infiniband/ibp/sa/sa_server_msg.c +diff -ruN a6/drivers/infiniband/ibp/sa/sa_server_msg.c a7/drivers/infiniband/ibp/sa/sa_server_msg.c --- a6/drivers/infiniband/ibp/sa/sa_server_msg.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/sa_server_msg.c 2015-02-23 10:01:30.294769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/sa_server_msg.c 2015-03-11 11:05:40.657368454 -0700 @@ -0,0 +1,970 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -8916,9 +8931,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/sa_server_msg.c a7/drivers/infiniband/ibp + + return ret; +} -diff -urN a6/drivers/infiniband/ibp/sa/sa_table.h a7/drivers/infiniband/ibp/sa/sa_table.h +diff -ruN a6/drivers/infiniband/ibp/sa/sa_table.h a7/drivers/infiniband/ibp/sa/sa_table.h --- a6/drivers/infiniband/ibp/sa/sa_table.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/sa_table.h 2015-02-23 10:01:30.294769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/sa_table.h 2015-03-11 11:05:40.657368454 -0700 @@ -0,0 +1,131 @@ +/*" + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -9051,9 +9066,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/sa_table.h a7/drivers/infiniband/ibp/sa/s + .offset_bits = 16, + .size_bits = 48 }, +}; -diff -urN a6/drivers/infiniband/ibp/sa/server.c a7/drivers/infiniband/ibp/sa/server.c +diff -ruN a6/drivers/infiniband/ibp/sa/server.c a7/drivers/infiniband/ibp/sa/server.c --- a6/drivers/infiniband/ibp/sa/server.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/server.c 2015-02-23 10:01:30.294769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/server.c 2015-03-11 11:05:40.657368454 -0700 @@ -0,0 +1,221 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -9276,9 +9291,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/server.c a7/drivers/infiniband/ibp/sa/ser + +module_init(ibp_sa_server_init); +module_exit(ibp_sa_server_exit); -diff -urN a6/drivers/infiniband/ibp/sa/server.h a7/drivers/infiniband/ibp/sa/server.h +diff -ruN a6/drivers/infiniband/ibp/sa/server.h a7/drivers/infiniband/ibp/sa/server.h --- a6/drivers/infiniband/ibp/sa/server.h 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/server.h 2015-02-23 10:01:30.294769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/server.h 2015-03-11 11:05:40.657368454 -0700 @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. @@ -9452,9 +9467,9 @@ diff -urN a6/drivers/infiniband/ibp/sa/server.h a7/drivers/infiniband/ibp/sa/ser + struct ibp_msg_header *hdr); + +#endif /* SERVER_H */ -diff -urN a6/drivers/infiniband/ibp/sa/server_msg.c a7/drivers/infiniband/ibp/sa/server_msg.c +diff -ruN a6/drivers/infiniband/ibp/sa/server_msg.c a7/drivers/infiniband/ibp/sa/server_msg.c --- a6/drivers/infiniband/ibp/sa/server_msg.c 1969-12-31 16:00:00.000000000 -0800 -+++ a7/drivers/infiniband/ibp/sa/server_msg.c 2015-02-23 10:01:30.294769309 -0800 ++++ a7/drivers/infiniband/ibp/sa/server_msg.c 2015-03-11 11:05:40.657368454 -0700 @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. diff --git a/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch b/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch index b34ff02..689695e 100644 --- a/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch +++ b/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch @@ -5,9 +5,9 @@ Subject: [PATCH 08/13] Add ibscif to the Infiniband HW directory Signed-off-by: Phil Cayton --- -diff -urN a7/drivers/infiniband/hw/scif/ibscif_ah.c a8/drivers/infiniband/hw/scif/ibscif_ah.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_ah.c a8/drivers/infiniband/hw/scif/ibscif_ah.c --- a7/drivers/infiniband/hw/scif/ibscif_ah.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_ah.c 2015-02-23 10:14:37.482809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_ah.c 2015-03-10 13:56:38.840575818 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -59,9 +59,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_ah.c a8/drivers/infiniband/hw/sci + kfree(to_ah(ibah)); + return 0; +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_cm.c a8/drivers/infiniband/hw/scif/ibscif_cm.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_cm.c a8/drivers/infiniband/hw/scif/ibscif_cm.c --- a7/drivers/infiniband/hw/scif/ibscif_cm.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_cm.c 2015-02-23 10:14:37.482809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_cm.c 2015-03-10 13:56:38.828575818 -0700 @@ -0,0 +1,515 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -578,9 +578,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_cm.c a8/drivers/infiniband/hw/sci + return 0; +} + -diff -urN a7/drivers/infiniband/hw/scif/ibscif_cq.c a8/drivers/infiniband/hw/scif/ibscif_cq.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_cq.c a8/drivers/infiniband/hw/scif/ibscif_cq.c --- a7/drivers/infiniband/hw/scif/ibscif_cq.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_cq.c 2015-02-23 10:14:37.483809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_cq.c 2015-03-10 13:56:38.838575818 -0700 @@ -0,0 +1,313 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -895,9 +895,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_cq.c a8/drivers/infiniband/hw/sci + + spin_unlock_bh(&cq->lock); +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_driver.h a8/drivers/infiniband/hw/scif/ibscif_driver.h +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_driver.h a8/drivers/infiniband/hw/scif/ibscif_driver.h --- a7/drivers/infiniband/hw/scif/ibscif_driver.h 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_driver.h 2015-02-23 10:14:37.483809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_driver.h 2015-03-10 13:56:38.840575818 -0700 @@ -0,0 +1,787 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -1686,9 +1686,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_driver.h a8/drivers/infiniband/hw +int ibscif_send_cm_rtu(struct ibscif_cm *cm_ctx); + +#endif /* IBSCIF_DRIVER_H */ -diff -urN a7/drivers/infiniband/hw/scif/ibscif_loopback.c a8/drivers/infiniband/hw/scif/ibscif_loopback.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_loopback.c a8/drivers/infiniband/hw/scif/ibscif_loopback.c --- a7/drivers/infiniband/hw/scif/ibscif_loopback.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_loopback.c 2015-02-23 10:14:37.484809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_loopback.c 2015-03-10 13:56:38.838575818 -0700 @@ -0,0 +1,582 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -2272,9 +2272,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_loopback.c a8/drivers/infiniband/ + goto again; + } +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_main.c a8/drivers/infiniband/hw/scif/ibscif_main.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_main.c a8/drivers/infiniband/hw/scif/ibscif_main.c --- a7/drivers/infiniband/hw/scif/ibscif_main.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_main.c 2015-02-23 10:14:37.484809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_main.c 2015-03-10 13:56:38.829575818 -0700 @@ -0,0 +1,357 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -2633,9 +2633,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_main.c a8/drivers/infiniband/hw/s + +module_init(ibscif_init); +module_exit(ibscif_exit); -diff -urN a7/drivers/infiniband/hw/scif/ibscif_mr.c a8/drivers/infiniband/hw/scif/ibscif_mr.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_mr.c a8/drivers/infiniband/hw/scif/ibscif_mr.c --- a7/drivers/infiniband/hw/scif/ibscif_mr.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_mr.c 2015-02-23 10:14:37.484809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_mr.c 2015-03-10 13:56:38.828575818 -0700 @@ -0,0 +1,559 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -3196,9 +3196,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_mr.c a8/drivers/infiniband/hw/sci + up(&conn->dev->mr_list_mutex); +} + -diff -urN a7/drivers/infiniband/hw/scif/ibscif_pd.c a8/drivers/infiniband/hw/scif/ibscif_pd.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_pd.c a8/drivers/infiniband/hw/scif/ibscif_pd.c --- a7/drivers/infiniband/hw/scif/ibscif_pd.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_pd.c 2015-02-23 10:14:37.484809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_pd.c 2015-03-10 13:56:38.841575818 -0700 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -3256,9 +3256,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_pd.c a8/drivers/infiniband/hw/sci + kfree(to_pd(ibpd)); + return 0; +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_post.c a8/drivers/infiniband/hw/scif/ibscif_post.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_post.c a8/drivers/infiniband/hw/scif/ibscif_post.c --- a7/drivers/infiniband/hw/scif/ibscif_post.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_post.c 2015-02-23 10:14:37.485809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_post.c 2015-03-10 13:56:38.828575818 -0700 @@ -0,0 +1,306 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -3566,9 +3566,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_post.c a8/drivers/infiniband/hw/s + + return err; +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_procfs.c a8/drivers/infiniband/hw/scif/ibscif_procfs.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_procfs.c a8/drivers/infiniband/hw/scif/ibscif_procfs.c --- a7/drivers/infiniband/hw/scif/ibscif_procfs.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_procfs.c 2015-02-23 10:14:37.485809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_procfs.c 2015-03-10 13:56:38.840575818 -0700 @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -3750,9 +3750,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_procfs.c a8/drivers/infiniband/hw + remove_proc_entry("stats", dev->procfs); + remove_proc_entry(dev->ibdev.name, init_net.proc_net); +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_protocol.c a8/drivers/infiniband/hw/scif/ibscif_protocol.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_protocol.c a8/drivers/infiniband/hw/scif/ibscif_protocol.c --- a7/drivers/infiniband/hw/scif/ibscif_protocol.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_protocol.c 2015-02-23 10:14:37.487809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_protocol.c 2015-03-10 13:56:38.839575818 -0700 @@ -0,0 +1,2816 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -6570,9 +6570,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_protocol.c a8/drivers/infiniband/ + while (poll_thread_running) + schedule(); +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_protocol.h a8/drivers/infiniband/hw/scif/ibscif_protocol.h +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_protocol.h a8/drivers/infiniband/hw/scif/ibscif_protocol.h --- a7/drivers/infiniband/hw/scif/ibscif_protocol.h 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_protocol.h 2015-02-23 10:14:37.487809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_protocol.h 2015-03-10 13:56:38.840575818 -0700 @@ -0,0 +1,395 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -6969,9 +6969,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_protocol.h a8/drivers/infiniband/ +#define ibscif_tx_window(tx) ((u32)window_size - ibscif_tx_unacked_window(tx)) + +#endif /* IBSCIF_PROTOCOL_H */ -diff -urN a7/drivers/infiniband/hw/scif/ibscif_provider.c a8/drivers/infiniband/hw/scif/ibscif_provider.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_provider.c a8/drivers/infiniband/hw/scif/ibscif_provider.c --- a7/drivers/infiniband/hw/scif/ibscif_provider.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_provider.c 2015-02-23 10:14:37.488809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_provider.c 2015-03-10 13:56:38.829575818 -0700 @@ -0,0 +1,406 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -7379,9 +7379,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_provider.c a8/drivers/infiniband/ + list_for_each_entry_safe(dev, next, &devlist, entry) + ibscif_remove_dev(dev); +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_qp.c a8/drivers/infiniband/hw/scif/ibscif_qp.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_qp.c a8/drivers/infiniband/hw/scif/ibscif_qp.c --- a7/drivers/infiniband/hw/scif/ibscif_qp.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_qp.c 2015-02-23 10:14:37.488809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_qp.c 2015-03-10 13:56:38.818575819 -0700 @@ -0,0 +1,868 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -8251,9 +8251,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_qp.c a8/drivers/infiniband/hw/sci + spin_unlock_bh(&qp->lock); +} + -diff -urN a7/drivers/infiniband/hw/scif/ibscif_scheduler.c a8/drivers/infiniband/hw/scif/ibscif_scheduler.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_scheduler.c a8/drivers/infiniband/hw/scif/ibscif_scheduler.c --- a7/drivers/infiniband/hw/scif/ibscif_scheduler.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_scheduler.c 2015-02-23 10:14:37.488809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_scheduler.c 2015-03-10 13:56:38.841575818 -0700 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -8450,9 +8450,9 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_scheduler.c a8/drivers/infiniband + list_del(&qp->iq.entry); + up(&dev->mutex); +} -diff -urN a7/drivers/infiniband/hw/scif/ibscif_util.c a8/drivers/infiniband/hw/scif/ibscif_util.c +diff -ruN a7/drivers/infiniband/hw/scif/ibscif_util.c a8/drivers/infiniband/hw/scif/ibscif_util.c --- a7/drivers/infiniband/hw/scif/ibscif_util.c 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/ibscif_util.c 2015-02-23 10:14:37.488809663 -0800 ++++ a8/drivers/infiniband/hw/scif/ibscif_util.c 2015-03-10 13:56:38.828575818 -0700 @@ -0,0 +1,623 @@ +/* + * Copyright (c) 2008 Intel Corporation. All rights reserved. @@ -9077,21 +9077,27 @@ diff -urN a7/drivers/infiniband/hw/scif/ibscif_util.c a8/drivers/infiniband/hw/s + } +} + -diff -urN a7/drivers/infiniband/hw/scif/Kconfig a8/drivers/infiniband/hw/scif/Kconfig +diff -ruN a7/drivers/infiniband/hw/scif/Kconfig a8/drivers/infiniband/hw/scif/Kconfig --- a7/drivers/infiniband/hw/scif/Kconfig 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/Kconfig 2015-02-23 10:14:37.489809663 -0800 ++++ a8/drivers/infiniband/hw/scif/Kconfig 2015-03-10 13:56:38.839575818 -0700 @@ -0,0 +1,4 @@ +config INFINIBAND_SCIF + tristate "SCIF RDMA driver support" + ---help--- + RDMA over SCIF driver. -diff -urN a7/drivers/infiniband/hw/scif/Makefile a8/drivers/infiniband/hw/scif/Makefile +diff -ruN a7/drivers/infiniband/hw/scif/Makefile a8/drivers/infiniband/hw/scif/Makefile --- a7/drivers/infiniband/hw/scif/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ a8/drivers/infiniband/hw/scif/Makefile 2015-02-23 10:14:37.489809663 -0800 -@@ -0,0 +1,41 @@ -+ifneq ($(KERNELRELEASE),) ++++ a8/drivers/infiniband/hw/scif/Makefile 2015-03-11 10:17:34.663490022 -0700 +@@ -0,0 +1,39 @@ ++KERNEL_V := $(shell uname -r) + -+# Original Make begins ++KDIR ?= /lib/modules/$(KERNEL_V)/build ++ ++SCIF_INCL := /usr/src/kernels/$(KERNEL_V)/include/modules/ ++SCIF_SYMS := /lib/modules/$(KERNEL_V)/scif.symvers ++ ++ccflags-y += -I$(SCIF_INCL) ++EXTRA_LDFLAGS += -L$(SCIF_SYMS) + +obj-$(CONFIG_INFINIBAND_SCIF) += ibscif.o + @@ -9110,23 +9116,15 @@ diff -urN a7/drivers/infiniband/hw/scif/Makefile a8/drivers/infiniband/hw/scif/M + ibscif_scheduler.o \ + ibscif_util.o + -+# Original Makefile ends -+ -+else -+ -+ifeq ($(KVER),) -+ ifeq ($(KDIR),) -+ KDIR := /lib/modules/$(shell uname -r)/build -+ endif -+else -+ KDIR := /lib/modules/$(KVER)/build -+endif ++default: ++ $(MAKE) -C $(KDIR) M=`pwd` + -+all: -+ $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) CONFIG_INFINIBAND_SCIF=m ++modules_install: ++ $(MAKE) -C $(KDIR) M=`pwd` modules_install + +clean: -+ rm -rf *.o *.ko *.mod.c .*.cmd Module.* .tmp_versions ++ rm -rf *.ko *.o .*.ko.cmd .*.o.cmd *.mod.c Module.* modules.order .tmp_versions + -+endif ++unix: ++ dos2unix *.[ch] Kconfig Makefile + -- 2.41.0