Skip to contentSkip to conversation

libibnetdisc: Add grouping for Voltaire's ISR4700 switch

PATCH Applied sebastien dugue 2 participants 2 messages Apr 27, 2010 – May 6, 2010 InfiniBand

lore
Share & tools
lore

sebastien dugue

author
#0 lore raw

The ISR4700 features 3 kind of boards:

- sLB-4018 line board with a single 36 port asic
- sFB-4700 fabric board with a single 36 port asic
- sFB-4700X2 double density fabric board with 2 36 port asics

The double density fabric board (sFB-4700X2) features external 12X
connectors that are only an aggregation of 3 4X ports, therefore ext_portnum is set to match the number printed on the faceplate.

Signed-off-by Sebastien Dugue <sebastien.dugue-6ktuUTfB/[email protected]>
infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h +1 -1
index 136282c..2735224 100644
@@ -121,7 +121,7 @@ typedef struct ibnd_chassis {
 	ibnd_node_t *nodes;
 
 	/* specific to voltaire type nodes */
-#define SPINES_MAX_NUM 12
+#define SPINES_MAX_NUM 18
 #define LINES_MAX_NUM 36
 	ibnd_node_t *spinenode[SPINES_MAX_NUM + 1];
 	ibnd_node_t *linenode[LINES_MAX_NUM + 1];
infiniband-diags/libibnetdisc/src/chassis.c +228 -39

438 lines not on this page · raw message

infiniband-diags/libibnetdisc/src/chassis.h +5 -1
index 2191046..f8e0ee2 100644
@@ -70,6 +70,9 @@
 #define VTR_DEVID_SFB2004		0x5a40
 #define VTR_DEVID_ISR2004		0x5a41
 #define VTR_DEVID_SRB2004		0x5a42
+#define VTR_DEVID_SLB4018		0x5a5b
+#define VTR_DEVID_SFB4700		0x5a5c
+#define VTR_DEVID_SFB4700X2		0x5a5d
 
 /* Vendor IDs (for chassis based systems) */
 #define VTR_VENDOR_ID			0x8f1	/* Voltaire */

@@ -78,7 +81,8 @@
 #define XS_VENDOR_ID			0x1397	/* Xsigo */
 
 enum ibnd_chassis_type {
-	UNRESOLVED_CT, ISR9288_CT, ISR9096_CT, ISR2012_CT, ISR2004_CT
+	UNRESOLVED_CT, ISR9288_CT, ISR9096_CT, ISR2012_CT, ISR2004_CT,
+	ISR4700_CT
 };
 enum ibnd_chassis_slot_type { UNRESOLVED_CS, LINE_CS, SPINE_CS, SRBD_CS };
Applied
#1 lore raw
Quoted 7 lines · sebastien dugue

The ISR4700 features 3 kind of boards:

- sLB-4018 line board with a single 36 port asic
- sFB-4700 fabric board with a single 36 port asic
- sFB-4700X2 double density fabric board with 2 36 port asics

Quoted 5 lines

The double density fabric board (sFB-4700X2) features external 12X
connectors that are only an aggregation of 3 4X ports, therefore ext_portnum is set to match the number printed on the faceplate.

Signed-off-by Sebastien Dugue <sebastien.dugue-6ktuUTfB/[email protected]>

Applied. Thanks.

Sasha
--
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