lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/sa: Add new QoS fields to path record

Browse Source 
The QoS annex defines new fields for path records.  Add them to the
ib_sa for consumers that want to use them.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Reviewed-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Sean Hefty
2007-08-08 15:41:28 -07:00
committed by Roland Dreier
parent 81668838c4
commit 733d65fe33
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,14 +123,10 @@ static u32 tid;
.field_name = "sa_path_rec:" #field .field_name = "sa_path_rec:" #field
static const struct ib_field path_rec_table[] = { static const struct ib_field path_rec_table[] = {
{ RESERVED, { PATH_REC_FIELD(service_id),
.offset_words = 0, .offset_words = 0,
.offset_bits = 0, .offset_bits = 0,
.size_bits = 32 }, .size_bits = 64 },
{ RESERVED,
.offset_words = 1,
.offset_bits = 0,
.size_bits = 32 },
{ PATH_REC_FIELD(dgid), { PATH_REC_FIELD(dgid),
.offset_words = 2, .offset_words = 2,
.offset_bits = 0, .offset_bits = 0,
@@ -179,7 +175,7 @@ static const struct ib_field path_rec_table[] = {
.offset_words = 12, .offset_words = 12,
.offset_bits = 16, .offset_bits = 16,
.size_bits = 16 }, .size_bits = 16 },
{ RESERVED, { PATH_REC_FIELD(qos_class),
.offset_words = 13, .offset_words = 13,
.offset_bits = 0, .offset_bits = 0,
.size_bits = 12 }, .size_bits = 12 },

11
include/rdma/ib_sa.h
View File

@@ -109,8 +109,8 @@ enum ib_sa_selector {
* Reserved rows are indicated with comments to help maintainability. * Reserved rows are indicated with comments to help maintainability.
*/ */
/* reserved: 0 */ #define IB_SA_PATH_REC_SERVICE_ID (IB_SA_COMP_MASK( 0) |\
/* reserved: 1 */ IB_SA_COMP_MASK( 1))
#define IB_SA_PATH_REC_DGID IB_SA_COMP_MASK( 2) #define IB_SA_PATH_REC_DGID IB_SA_COMP_MASK( 2)
#define IB_SA_PATH_REC_SGID IB_SA_COMP_MASK( 3) #define IB_SA_PATH_REC_SGID IB_SA_COMP_MASK( 3)
#define IB_SA_PATH_REC_DLID IB_SA_COMP_MASK( 4) #define IB_SA_PATH_REC_DLID IB_SA_COMP_MASK( 4)
@@ -123,7 +123,7 @@ enum ib_sa_selector {
#define IB_SA_PATH_REC_REVERSIBLE IB_SA_COMP_MASK(11) #define IB_SA_PATH_REC_REVERSIBLE IB_SA_COMP_MASK(11)
#define IB_SA_PATH_REC_NUMB_PATH IB_SA_COMP_MASK(12) #define IB_SA_PATH_REC_NUMB_PATH IB_SA_COMP_MASK(12)
#define IB_SA_PATH_REC_PKEY IB_SA_COMP_MASK(13) #define IB_SA_PATH_REC_PKEY IB_SA_COMP_MASK(13)
/* reserved: 14 */ #define IB_SA_PATH_REC_QOS_CLASS IB_SA_COMP_MASK(14)
#define IB_SA_PATH_REC_SL IB_SA_COMP_MASK(15) #define IB_SA_PATH_REC_SL IB_SA_COMP_MASK(15)
#define IB_SA_PATH_REC_MTU_SELECTOR IB_SA_COMP_MASK(16) #define IB_SA_PATH_REC_MTU_SELECTOR IB_SA_COMP_MASK(16)
#define IB_SA_PATH_REC_MTU IB_SA_COMP_MASK(17) #define IB_SA_PATH_REC_MTU IB_SA_COMP_MASK(17)
@@ -134,8 +134,7 @@ enum ib_sa_selector {
#define IB_SA_PATH_REC_PREFERENCE IB_SA_COMP_MASK(22) #define IB_SA_PATH_REC_PREFERENCE IB_SA_COMP_MASK(22)
struct ib_sa_path_rec { struct ib_sa_path_rec {
/* reserved */ __be64 service_id;
/* reserved */
union ib_gid dgid; union ib_gid dgid;
union ib_gid sgid; union ib_gid sgid;
__be16 dlid; __be16 dlid;
@@ -148,7 +147,7 @@ struct ib_sa_path_rec {
int reversible; int reversible;
u8 numb_path; u8 numb_path;
__be16 pkey; __be16 pkey;
/* reserved */ __be16 qos_class;
u8 sl; u8 sl;
u8 mtu_selector; u8 mtu_selector;
u8 mtu; u8 mtu;