|
1 # This patch was developed in-house. Since it is Solaris-specific, |
|
2 # it is not suitable for upstream. |
|
3 # |
1 diff -r -u /tmp/libibumad-1.3.7/Makefile.in libibumad-1.3.7/Makefile.in |
4 diff -r -u /tmp/libibumad-1.3.7/Makefile.in libibumad-1.3.7/Makefile.in |
2 --- /tmp/libibumad-1.3.7/Makefile.in Mon Feb 14 06:18:00 2011 |
5 --- /tmp/libibumad-1.3.7/Makefile.in Mon Feb 14 06:18:00 2011 |
3 +++ libibumad-1.3.7/Makefile.in Fri Feb 25 03:11:40 2011 |
6 +++ libibumad-1.3.7/Makefile.in Fri Feb 25 03:11:40 2011 |
4 @@ -367,8 +367,8 @@ |
7 @@ -367,8 +367,8 @@ |
5 else :; fi; \ |
8 else :; fi; \ |
13 |
16 |
14 uninstall-libLTLIBRARIES: |
17 uninstall-libLTLIBRARIES: |
15 diff -r -u /tmp/libibumad-1.3.7/include/infiniband/umad.h libibumad-1.3.7/include/infiniband/umad.h |
18 diff -r -u /tmp/libibumad-1.3.7/include/infiniband/umad.h libibumad-1.3.7/include/infiniband/umad.h |
16 --- /tmp/libibumad-1.3.7/include/infiniband/umad.h Mon Feb 14 01:08:29 2011 |
19 --- /tmp/libibumad-1.3.7/include/infiniband/umad.h Mon Feb 14 01:08:29 2011 |
17 +++ libibumad-1.3.7/include/infiniband/umad.h Fri May 13 04:28:12 2011 |
20 +++ libibumad-1.3.7/include/infiniband/umad.h Fri May 13 04:28:12 2011 |
18 @@ -96,7 +96,11 @@ |
21 @@ -45,7 +45,15 @@ |
19 |
22 #endif /* __cplusplus */ |
20 #define UMAD_MAX_PORTS 64 |
23 |
|
24 BEGIN_C_DECLS |
|
25 -#define UMAD_MAX_DEVICES 32 |
|
26 +/* To accomodate max. of 16 PCIe slots and 63 VFs per HCA, */ |
|
27 +/* we define MAX_HCAS = (63VFs + 1PF) * 16HCAs */ |
|
28 +/* MAX_PORTS = MAX_HCAS * 2ports per HCA */ |
|
29 +#define MAX_HCAS (64*16) |
|
30 +#define MAX_PORTS (MAX_HCAS*2) |
|
31 +#define UMAD_MAX_DEVICES MAX_HCAS |
|
32 +#define UMAD_MAX_HCAS MAX_HCAS |
|
33 +#define UMAD_MAX_PORTS MAX_PORTS |
|
34 + |
|
35 #define UMAD_ANY_PORT 0 |
|
36 typedef struct ib_mad_addr { |
|
37 uint32_t qpn; |
|
38 @@ -94,9 +102,13 @@ |
|
39 #define SYS_IB_MAD_PORT "port" |
|
40 #define SYS_IB_MAD_DEV "ibdev" |
|
41 |
|
42 -#define UMAD_MAX_PORTS 64 |
|
43 +#define UMAD_MAX_PORTS MAX_PORTS |
21 |
44 |
22 +#if defined(__SVR4) && defined(__sun) |
45 +#if defined(__SVR4) && defined(__sun) |
23 +#define UMAD_DEV_DIR "/dev/infiniband/ofs" |
46 +#define UMAD_DEV_DIR "/dev/infiniband/ofs" |
24 +#else |
47 +#else |
25 #define UMAD_DEV_DIR "/dev/infiniband" |
48 #define UMAD_DEV_DIR "/dev/infiniband" |