diff options
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/uts/common/sys/ib/ibtl/ibti_common.h | 41 | ||||
-rw-r--r-- | usr/src/uts/common/sys/ib/ibtl/ibtl_types.h | 55 | ||||
-rw-r--r-- | usr/src/xmod/xmod_files | 2 |
3 files changed, 56 insertions, 42 deletions
diff --git a/usr/src/uts/common/sys/ib/ibtl/ibti_common.h b/usr/src/uts/common/sys/ib/ibtl/ibti_common.h index 6df7deefbe..f5ab67df37 100644 --- a/usr/src/uts/common/sys/ib/ibtl/ibti_common.h +++ b/usr/src/uts/common/sys/ib/ibtl/ibti_common.h @@ -44,47 +44,6 @@ extern "C" { #endif /* - * Endian Macros - * h2b - host endian to big endian protocol - * b2h - big endian protocol to host endian - * h2l - host endian to little endian protocol - * l2h - little endian protocol to host endian - */ -#if defined(_LITTLE_ENDIAN) -#define h2b16(x) (htons(x)) -#define h2b32(x) (htonl(x)) -#define h2b64(x) (ddi_swap64(x)) -#define b2h16(x) (ntohs(x)) -#define b2h32(x) (ntohl(x)) -#define b2h64(x) (ddi_swap64(x)) - -#define h2l16(x) (x) -#define h2l32(x) (x) -#define h2l64(x) (x) -#define l2h16(x) (x) -#define l2h32(x) (x) -#define l2h64(x) (x) - -#elif defined(_BIG_ENDIAN) -#define h2b16(x) (x) -#define h2b32(x) (x) -#define h2b64(x) (x) -#define b2h16(x) (x) -#define b2h32(x) (x) -#define b2h64(x) (x) - -#define h2l16(x) (ddi_swap16(x)) -#define h2l32(x) (ddi_swap32(x)) -#define h2l64(x) (ddi_swap64(x)) -#define l2h16(x) (ddi_swap16(x)) -#define l2h32(x) (ddi_swap32(x)) -#define l2h64(x) (ddi_swap64(x)) - -#else -#error "what endian is this machine?" -#endif - -/* * Max number of paths that can be requested in an ibt_get_paths() call, * if IBT_PATH_PERF or IBT_PATH_AVAIL flag (ibt_path_flags_t) is set. */ diff --git a/usr/src/uts/common/sys/ib/ibtl/ibtl_types.h b/usr/src/uts/common/sys/ib/ibtl/ibtl_types.h index 0e786a5ae4..c584557c44 100644 --- a/usr/src/uts/common/sys/ib/ibtl/ibtl_types.h +++ b/usr/src/uts/common/sys/ib/ibtl/ibtl_types.h @@ -47,6 +47,47 @@ extern "C" { #endif /* + * Endian Macros + * h2b - host endian to big endian protocol + * b2h - big endian protocol to host endian + * h2l - host endian to little endian protocol + * l2h - little endian protocol to host endian + */ +#if defined(_LITTLE_ENDIAN) +#define h2b16(x) (htons(x)) +#define h2b32(x) (htonl(x)) +#define h2b64(x) (ddi_swap64(x)) +#define b2h16(x) (ntohs(x)) +#define b2h32(x) (ntohl(x)) +#define b2h64(x) (ddi_swap64(x)) + +#define h2l16(x) (x) +#define h2l32(x) (x) +#define h2l64(x) (x) +#define l2h16(x) (x) +#define l2h32(x) (x) +#define l2h64(x) (x) + +#elif defined(_BIG_ENDIAN) +#define h2b16(x) (x) +#define h2b32(x) (x) +#define h2b64(x) (x) +#define b2h16(x) (x) +#define b2h32(x) (x) +#define b2h64(x) (x) + +#define h2l16(x) (ddi_swap16(x)) +#define h2l32(x) (ddi_swap32(x)) +#define h2l64(x) (ddi_swap64(x)) +#define l2h16(x) (ddi_swap16(x)) +#define l2h32(x) (ddi_swap32(x)) +#define l2h64(x) (ddi_swap64(x)) + +#else +#error "what endian is this machine?" +#endif + +/* * Define Internal IBTL handles */ typedef struct ibtl_clnt_s *ibt_clnt_hdl_t; /* ibt_attach() */ @@ -1316,6 +1357,20 @@ typedef enum ibt_object_type_e { } ibt_object_type_t; /* + * Standard information for ibt_ci_data_in() for memory regions. + * + * IBT_MR_DATA_IN_IF_VERSION is the value used in the mr_rev member. + * mr_func is the callback handler. mr_arg1 and mr_arg2 are its arguments. + */ +#define IBT_MR_DATA_IN_IF_VERSION 1 +typedef struct ibt_mr_data_in_s { + uint_t mr_rev; + void (*mr_func)(void *, void *); + void *mr_arg1; + void *mr_arg2; +} ibt_mr_data_in_t; + +/* * Memory error handler data structures; code, and payload data. */ typedef enum ibt_mem_code_s { diff --git a/usr/src/xmod/xmod_files b/usr/src/xmod/xmod_files index b567177da2..c5f3f05cae 100644 --- a/usr/src/xmod/xmod_files +++ b/usr/src/xmod/xmod_files @@ -46,6 +46,7 @@ cmd/cmd-inet/usr.sbin/bootconfchk ../closed/uts/sparc/tavor ../closed/uts/intel/tavor ../closed/uts/common/io/ib/adapters/tavor +../closed/uts/common/sys/ib/adapters/mlnx_umap.h ../closed/uts/common/sys/ib/adapters/tavor/tavor.h ../closed/uts/common/sys/ib/adapters/tavor/tavor_agents.h ../closed/uts/common/sys/ib/adapters/tavor/tavor_cfg.h @@ -59,7 +60,6 @@ cmd/cmd-inet/usr.sbin/bootconfchk ../closed/uts/common/sys/ib/adapters/tavor/tavor_rsrc.h ../closed/uts/common/sys/ib/adapters/tavor/tavor_srq.h ../closed/uts/common/sys/ib/adapters/tavor/tavor_typedef.h -../closed/uts/common/sys/ib/adapters/tavor/tavor_umap.h ../closed/uts/common/sys/ib/adapters/tavor/tavor_wr.h ../closed/uts/sun4/forthdebug/tavor.fdbg ../closed/uts/sparc/daplt |