Skip to contentSkip to conversation

IB/core: Remove unnecessary defines from ib_mad.h

PATCH Applied [email protected] 3 participants 5 messages Sep 2, 2015 – Sep 3, 2015 2 messages not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 IB/core: Remove unnecessary defines from ib_mad.h

From: Ira Weiny <[email protected]>

Remove the unused IB_NOTICE_REPRESS_* defines.

When the hfi1 driver was added these definitions were moved from the qib driver to ib_mad.h. They should have been removed instead.

Fixes d4ab347005fb ("IB/core: Add core header changes needed for OPA")
---
 include/rdma/ib_mad.h | 12 ------------
 1 file changed, 12 deletions(-)
include/rdma/ib_mad.h +0 -12
index c206205bbf98..7f2cf855a0b6 100644
@@ -157,18 +157,6 @@
 #define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)
 
 /*
- * Repress trap/notice flags
- */
-#define IB_NOTICE_REPRESS_LLI_THRESH	(1 << 0)
-#define IB_NOTICE_REPRESS_EBO_THRESH	(1 << 1)
-#define IB_NOTICE_REPRESS_FLOW_UPDATE	(1 << 2)
-#define IB_NOTICE_REPRESS_CAP_MASK_CHG	(1 << 3)
-#define IB_NOTICE_REPRESS_SYS_GUID_CHG	(1 << 4)
-#define IB_NOTICE_REPRESS_BAD_MKEY	(1 << 5)
-#define IB_NOTICE_REPRESS_BAD_PKEY	(1 << 6)
-#define IB_NOTICE_REPRESS_BAD_QKEY	(1 << 7)
-
-/*
  * Generic trap/notice other local changes flags (trap 144).
  */
 #define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */
Signature · 6 lines
1.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1441233955-31743-1-git-send-email-ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org

#2 lore raw

PATCH 2/2 IB/core: Move SM class defines from ib_mad.h to ib_smi.h

From: Ira Weiny <[email protected]>

When the hfi1 driver was added these definitions were moved from the qib driver to ib_mad.h to be used by both qib and hfi1. They should have been moved to ib_smi.h instead.

Fixes d4ab347005fb ("IB/core: Add core header changes needed for OPA")
---
 drivers/infiniband/hw/qib/qib_ruc.c |  1 +
 include/rdma/ib_mad.h               | 45 -----------------------------------
 include/rdma/ib_smi.h               | 47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 45 deletions(-)
drivers/infiniband/hw/qib/qib_ruc.c +1 -0
index f42bd0f47577..22e356ca8058 100644
@@ -32,6 +32,7 @@
  */
 
 #include <linux/spinlock.h>
+#include <rdma/ib_smi.h>
 
 #include "qib.h"
 #include "qib_mad.h"
include/rdma/ib_mad.h +0 -45

63 lines not on this page · raw message

include/rdma/ib_smi.h +47 -0

57 lines not on this page · raw message

Signature · 6 lines
1.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1441233955-31743-2-git-send-email-ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org

Reviewed-by
#4 lore raw

Re: [PATCH 2/2] IB/core: Move SM class defines from ib_mad.h to ib_smi.h

Quoted 8 lines · On 9/2/2015 6:45 PM, [email protected] wrote:

From: Ira Weiny <[email protected]>

When the hfi1 driver was added these definitions were moved from the qib driver to ib_mad.h to be used by both qib and hfi1. They should have been moved to ib_smi.h instead.

Fixes d4ab347005fb ("IB/core: Add core header changes needed for OPA")

A couple of comment nits below.

Quoted 115 lines
---
 drivers/infiniband/hw/qib/qib_ruc.c |  1 +
 include/rdma/ib_mad.h               | 45 -----------------------------------
 include/rdma/ib_smi.h               | 47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 45 deletions(-)
drivers/infiniband/hw/qib/qib_ruc.c +1 -0
index f42bd0f47577..22e356ca8058 100644
@@ -32,6 +32,7 @@
  */
 
 #include <linux/spinlock.h>
+#include <rdma/ib_smi.h>
 
 #include "qib.h"
 #include "qib_mad.h"
include/rdma/ib_mad.h +0 -45
index 7f2cf855a0b6..188df91d5851 100644
@@ -144,31 +144,6 @@
 #define IB_NOTICE_PROD_ROUTER		cpu_to_be16(3)
 #define IB_NOTICE_PROD_CLASS_MGR	cpu_to_be16(4)
 
-/*
- * Generic trap/notice numbers
- */
-#define IB_NOTICE_TRAP_LLI_THRESH	cpu_to_be16(129)
-#define IB_NOTICE_TRAP_EBO_THRESH	cpu_to_be16(130)
-#define IB_NOTICE_TRAP_FLOW_UPDATE	cpu_to_be16(131)
-#define IB_NOTICE_TRAP_CAP_MASK_CHG	cpu_to_be16(144)
-#define IB_NOTICE_TRAP_SYS_GUID_CHG	cpu_to_be16(145)
-#define IB_NOTICE_TRAP_BAD_MKEY		cpu_to_be16(256)
-#define IB_NOTICE_TRAP_BAD_PKEY		cpu_to_be16(257)
-#define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)
-
-/*
- * Generic trap/notice other local changes flags (trap 144).
- */
-#define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */
-#define IB_NOTICE_TRAP_LWE_CHG		0x02	/* Link Width Enable changed */
-#define IB_NOTICE_TRAP_NODE_DESC_CHG	0x01
-
-/*
- * Generic trap/notice M_Key volation flags in dr_trunc_hop (trap 256).
- */
-#define IB_NOTICE_TRAP_DR_NOTICE	0x80
-#define IB_NOTICE_TRAP_DR_TRUNC		0x40
-
 enum {
 	IB_MGMT_MAD_HDR = 24,
 	IB_MGMT_MAD_DATA = 232,
@@ -282,21 +257,6 @@ struct ib_class_port_info {
 	__be32			trap_qkey;
 };
 
-struct ib_node_info {
-	u8 base_version;
-	u8 class_version;
-	u8 node_type;
-	u8 num_ports;
-	__be64 sys_guid;
-	__be64 node_guid;
-	__be64 port_guid;
-	__be16 partition_cap;
-	__be16 device_id;
-	__be32 revision;
-	u8 local_port_num;
-	u8 vendor_id[3];
-} __packed;
-
 struct ib_mad_notice_attr {
 	u8 generic_type;
 	u8 prod_type_msb;
@@ -361,11 +321,6 @@ struct ib_mad_notice_attr {
 	} details;
 };
 
-struct ib_vl_weight_elem {
-	u8      vl;     /* VL is low 5 bits, upper 3 bits reserved */
-	u8      weight;
-};
-
 /**
  * ib_mad_send_buf - MAD data buffer and work request for sends.
  * @next: A pointer used to chain together MADs for posting.
include/rdma/ib_smi.h +19 -0
index 98b9086d769a..a39eecca7bec 100644
@@ -119,10 +119,57 @@ struct ib_port_info {
 	u8 link_roundtrip_latency[3];
 };
 
+struct ib_node_info {
+	u8 base_version;
+	u8 class_version;
+	u8 node_type;
+	u8 num_ports;
+	__be64 sys_guid;
+	__be64 node_guid;
+	__be64 port_guid;
+	__be16 partition_cap;
+	__be16 device_id;
+	__be32 revision;
+	u8 local_port_num;
+	u8 vendor_id[3];
+} __packed;
+
+struct ib_vl_weight_elem {
+	u8      vl;     /* IB: VL is low 4 bits, upper 4 bits reserved */
+                        /* OPA: VL is low 5 bits, upper 3 bits reserved */
+	u8      weight;

include/rdma/ib_smi.h struct ib_port_info { · line 150

Quoted 10 lines
include/rdma/ib_smi.h +4 -0
+};
+
 static inline u8
 ib_get_smp_direction(struct ib_smp *smp)
 {
 	return ((smp->status & IB_SMP_DIRECTION) == IB_SMP_DIRECTION);
 }
 
+/*
+ * SMI Trap/Notice numbers

Nit: SM class Trap/Notice numbers rather than SMI.

include/rdma/ib_smi.h struct ib_port_info { · line 162

Quoted 12 lines
include/rdma/ib_smi.h +12 -0
+ */
+#define IB_NOTICE_TRAP_LLI_THRESH	cpu_to_be16(129)
+#define IB_NOTICE_TRAP_EBO_THRESH	cpu_to_be16(130)
+#define IB_NOTICE_TRAP_FLOW_UPDATE	cpu_to_be16(131)
+#define IB_NOTICE_TRAP_CAP_MASK_CHG	cpu_to_be16(144)
+#define IB_NOTICE_TRAP_SYS_GUID_CHG	cpu_to_be16(145)
+#define IB_NOTICE_TRAP_BAD_MKEY		cpu_to_be16(256)
+#define IB_NOTICE_TRAP_BAD_PKEY		cpu_to_be16(257)
+#define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)
+
+/*
+ * Generic trap/notice other local changes flags (trap 144).

Nit: SM class rather than Generic

include/rdma/ib_smi.h struct ib_port_info { · line 169

Quoted 7 lines
include/rdma/ib_smi.h +7 -0
+ */
+#define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */
+#define IB_NOTICE_TRAP_LWE_CHG		0x02	/* Link Width Enable changed */
+#define IB_NOTICE_TRAP_NODE_DESC_CHG	0x01
+
+/*
+ * Generic trap/notice M_Key volation flags in dr_trunc_hop (trap 256).

Nits: SM class rather than Generic. typo: volation -> violation

include/rdma/ib_smi.h struct ib_port_info { · line 175

Quoted 6 lines
include/rdma/ib_smi.h +5 -0
+ */
+#define IB_NOTICE_TRAP_DR_NOTICE	0x80
+#define IB_NOTICE_TRAP_DR_TRUNC		0x40
+
+
 #endif /* IB_SMI_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by
#5 lore raw
In reply to a message not in the archive
Quoted 9 lines · On 9/2/2015 6:45 PM, [email protected] wrote:

From: Ira Weiny <[email protected]>

Remove the unused IB_NOTICE_REPRESS_* defines.

When the hfi1 driver was added these definitions were moved from the qib driver to ib_mad.h. They should have been removed instead.

Fixes d4ab347005fb ("IB/core: Add core header changes needed for OPA")

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#6 lore raw
In reply to a message not in the archive
Quoted 27 lines · On 09/02/2015 06:45 PM, [email protected] wrote:

From: Ira Weiny <[email protected]>

Remove the unused IB_NOTICE_REPRESS_* defines.

When the hfi1 driver was added these definitions were moved from the qib driver to ib_mad.h. They should have been removed instead.

Fixes d4ab347005fb ("IB/core: Add core header changes needed for OPA")
---
 include/rdma/ib_mad.h | 12 ------------
 1 file changed, 12 deletions(-)
include/rdma/ib_mad.h +0 -5
index c206205bbf98..7f2cf855a0b6 100644
@@ -157,18 +157,6 @@
 #define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)
 
 /*
- * Repress trap/notice flags
- */
-#define IB_NOTICE_REPRESS_LLI_THRESH	(1 << 0)
-#define IB_NOTICE_REPRESS_EBO_THRESH	(1 << 1)
-#define IB_NOTICE_REPRESS_FLOW_UPDATE	(1 << 2)

include/rdma/ib_mad.h line 162

Quoted 10 lines
include/rdma/ib_mad.h +0 -7
-#define IB_NOTICE_REPRESS_CAP_MASK_CHG	(1 << 3)
-#define IB_NOTICE_REPRESS_SYS_GUID_CHG	(1 << 4)
-#define IB_NOTICE_REPRESS_BAD_MKEY	(1 << 5)
-#define IB_NOTICE_REPRESS_BAD_PKEY	(1 << 6)
-#define IB_NOTICE_REPRESS_BAD_QKEY	(1 << 7)
-
-/*
  * Generic trap/notice other local changes flags (trap 144).
  */
 #define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */

Thanks, applied.

Signature · 2 lines
Doug Ledford <[email protected]>
              GPG KeyID: 0E572FDD