From 365b8db5cfc9c53c259ca128bd14a0d3b5bf640b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 6 Jul 2009 20:31:44 +0100 Subject: [infiniband] Centralise SMA and GMA queue constants --- src/include/gpxe/ib_packet.h | 6 ------ src/include/gpxe/infiniband.h | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src/include') diff --git a/src/include/gpxe/ib_packet.h b/src/include/gpxe/ib_packet.h index fb9591261..a014352ea 100644 --- a/src/include/gpxe/ib_packet.h +++ b/src/include/gpxe/ib_packet.h @@ -106,12 +106,6 @@ enum ib_bth_opcode { BTH_OPCODE_UD_SEND = 0x64, }; -/** Default Infiniband partition key */ -#define IB_PKEY_NONE 0xffff - -/** Subnet management queue pair number */ -#define IB_QPN_SMP 0 - /** An Infiniband Datagram Extended Transport Header */ struct ib_datagram_extended_transport_header { /** Queue key */ diff --git a/src/include/gpxe/infiniband.h b/src/include/gpxe/infiniband.h index 41c55ac55..be22b7fe1 100644 --- a/src/include/gpxe/infiniband.h +++ b/src/include/gpxe/infiniband.h @@ -15,14 +15,23 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include -/** Subnet administrator QPN */ -#define IB_SA_QPN 1 +/** Subnet management QPN */ +#define IB_QPN_SMA 0 + +/** Subnet management queue key */ +#define IB_QKEY_SMA 0 + +/** General management QPN */ +#define IB_QPN_GMA 1 + +/** General management queue key */ +#define IB_QKEY_GMA 0x80010000UL /** Broadcast QPN */ -#define IB_BROADCAST_QPN 0xffffffUL +#define IB_QPN_BROADCAST 0xffffffUL -/** Subnet administrator queue key */ -#define IB_GLOBAL_QKEY 0x80010000UL +/** Default Infiniband partition key */ +#define IB_PKEY_NONE 0xffff /** * Maximum payload size -- cgit v1.2.3-55-g7522