diff mbox

[infiniband-diags] Add latest new device IDs to device white lists

Message ID d0984a4e-a2f6-b920-b605-c6c4d575f23f@dev.mellanox.co.il (mailing list archive)
State Accepted
Delegated to: Ira Weiny
Headers show

Commit Message

Hal Rosenstock June 12, 2018, 1:17 p.m. UTC 
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
 libibnetdisc/src/ibnetdisc.c | 6 ++++--
 src/ibdiag_common.c          | 6 ++++--
 src/vendstat.c               | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

Comments

Ira Weiny June 19, 2018, 11:04 p.m. UTC | #1 
PiANCj4gU2lnbmVkLW9mZi1ieTogSGFsIFJvc2Vuc3RvY2sgPGhhbEBtZWxsYW5veC5jb20+DQoN
ClRoYW5rcyBhcHBsaWVkLA0KSXJhDQoNCg0KPiAtLS0NCj4gIGxpYmlibmV0ZGlzYy9zcmMvaWJu
ZXRkaXNjLmMgfCA2ICsrKystLQ0KPiAgc3JjL2liZGlhZ19jb21tb24uYyAgICAgICAgICB8IDYg
KysrKy0tDQo+ICBzcmMvdmVuZHN0YXQuYyAgICAgICAgICAgICAgIHwgMyArKy0NCj4gIDMgZmls
ZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYg
LS1naXQgYS9saWJpYm5ldGRpc2Mvc3JjL2libmV0ZGlzYy5jIGIvbGliaWJuZXRkaXNjL3NyYy9p
Ym5ldGRpc2MuYyBpbmRleA0KPiAyNmJkMDlhLi4wNWYxZGM5IDEwMDY0NA0KPiAtLS0gYS9saWJp
Ym5ldGRpc2Mvc3JjL2libmV0ZGlzYy5jDQo+ICsrKyBiL2xpYmlibmV0ZGlzYy9zcmMvaWJuZXRk
aXNjLmMNCj4gQEAgLTE5OCw3ICsxOTgsOSBAQCBzdGF0aWMgaW50DQo+IGlzX21sbnhfZXh0X3Bv
cnRfaW5mb19zdXBwb3J0ZWQoaWJuZF9wb3J0X3QgKiBwb3J0KQ0KPiAgCXVpbnQxNl90IGRldmlk
ID0gKHVpbnQxNl90KSBtYWRfZ2V0X2ZpZWxkKHBvcnQtPm5vZGUtPmluZm8sIDAsDQo+IElCX05P
REVfREVWSURfRik7DQo+ICAJdWludDMyX3QgdmVuZG9yaWQgPSAodWludDMyX3QpIG1hZF9nZXRf
ZmllbGQocG9ydC0+bm9kZS0+aW5mbywgMCwNCj4gSUJfTk9ERV9WRU5ET1JJRF9GKTsNCj4gDQo+
IC0JaWYgKChkZXZpZCA+PSAweGM3MzggJiYgZGV2aWQgPD0gMHhjNzNiKSB8fCBkZXZpZCA9PSAw
eGNiMjAgfHwgZGV2aWQNCj4gPT0gMHhjZjA4IHx8DQo+ICsJaWYgKChkZXZpZCA+PSAweGM3Mzgg
JiYgZGV2aWQgPD0gMHhjNzNiKSB8fA0KPiArCSAgICBkZXZpZCA9PSAweGM4MzkgfHwgZGV2aWQg
PT0gMHhjYjIwIHx8IGRldmlkID09IDB4Y2YwOCB8fA0KPiArCSAgICBkZXZpZCA9PSAweGNmMDkg
fHwgZGV2aWQgPT0gMHhkMmYwIHx8DQo+ICAJICAgICgodmVuZG9yaWQgPT0gMHgxMTlmKSAmJg0K
PiAgCSAgICAgLyogQnVsbCBTd2l0Y2hYICovDQo+ICAJICAgICAoZGV2aWQgPT0gMHgxYjAyIHx8
IGRldmlkID09IDB4MWI1MCB8fCBAQCAtMjA2LDcgKzIwOCw3IEBADQo+IHN0YXRpYyBpbnQgaXNf
bWxueF9leHRfcG9ydF9pbmZvX3N1cHBvcnRlZChpYm5kX3BvcnRfdCAqIHBvcnQpDQo+ICAJICAg
ICAgZGV2aWQgPT0gMHgxYmEwIHx8DQo+ICAJICAgICAgKGRldmlkID49IDB4MWJkMCAmJiBkZXZp
ZCA8PSAweDFiZDUpKSkpDQo+ICAJCXJldHVybiAxOw0KPiAtCWlmICgoZGV2aWQgPj0gMHgxMDAz
ICYmIGRldmlkIDw9IDB4MTAxOSkgfHwNCj4gKwlpZiAoKGRldmlkID49IDB4MTAwMyAmJiBkZXZp
ZCA8PSAweDEwMWIpIHx8DQo+ICAJICAgICgodmVuZG9yaWQgPT0gMHgxMTlmKSAmJg0KPiAgCSAg
ICAgLyogQnVsbCBDb25uZWN0WDMgKi8NCj4gIAkgICAgIChkZXZpZCA9PSAweDFiMzMgfHwgZGV2
aWQgPT0gMHgxYjczIHx8IGRpZmYgLS1naXQNCj4gYS9zcmMvaWJkaWFnX2NvbW1vbi5jIGIvc3Jj
L2liZGlhZ19jb21tb24uYyBpbmRleCBhNTdhMDRiLi40MWI3NDljDQo+IDEwMDY0NA0KPiAtLS0g
YS9zcmMvaWJkaWFnX2NvbW1vbi5jDQo+ICsrKyBiL3NyYy9pYmRpYWdfY29tbW9uLmMNCj4gQEAg
LTU0Miw3ICs1NDIsOSBAQCBpbnQgaXNfbWxueF9leHRfcG9ydF9pbmZvX3N1cHBvcnRlZCh1aW50
MzJfdA0KPiB2ZW5kb3JpZCwgIHsNCj4gIAlpZiAoaWJkX2libmV0ZGlzY19mbGFncyAmIElCTkRf
Q09ORklHX01MWF9FUEkpIHsNCj4gDQo+IC0JCWlmICgoZGV2aWQgPj0gMHhjNzM4ICYmIGRldmlk
IDw9IDB4YzczYikgfHwgZGV2aWQgPT0gMHhjYjIwDQo+IHx8IGRldmlkID09IDB4Y2YwOCB8fA0K
PiArCQlpZiAoKGRldmlkID49IDB4YzczOCAmJiBkZXZpZCA8PSAweGM3M2IpIHx8DQo+ICsJCSAg
ICBkZXZpZCA9PSAweGM4MzkgfHwgZGV2aWQgPT0gMHhjYjIwIHx8IGRldmlkID09IDB4Y2YwOCB8
fA0KPiArCQkgICAgZGV2aWQgPT0gMHhjZjA5IHx8IGRldmlkID09IDB4ZDJmMCB8fA0KPiAgCQkg
ICAgKCh2ZW5kb3JpZCA9PSAweDExOWYpICYmDQo+ICAJCSAgICAgLyogQnVsbCBTd2l0Y2hYICov
DQo+ICAJCSAgICAgKGRldmlkID09IDB4MWIwMiB8fCBkZXZpZCA9PSAweDFiNTAgfHwgQEAgLTU1
MCw3ICs1NTIsNw0KPiBAQCBpbnQgaXNfbWxueF9leHRfcG9ydF9pbmZvX3N1cHBvcnRlZCh1aW50
MzJfdCB2ZW5kb3JpZCwNCj4gIAkJICAgICAgZGV2aWQgPT0gMHgxYmEwIHx8DQo+ICAJCSAgICAg
IChkZXZpZCA+PSAweDFiZDAgJiYgZGV2aWQgPD0gMHgxYmQ1KSkpKQ0KPiAgCQkJcmV0dXJuIDE7
DQo+IC0JCWlmICgoZGV2aWQgPj0gMHgxMDAzICYmIGRldmlkIDw9IDB4MTAxOSkgfHwNCj4gKwkJ
aWYgKChkZXZpZCA+PSAweDEwMDMgJiYgZGV2aWQgPD0gMHgxMDFiKSB8fA0KPiAgCQkgICAgKCh2
ZW5kb3JpZCA9PSAweDExOWYpICYmDQo+ICAJCSAgICAgLyogQnVsbCBDb25uZWN0WDMgKi8NCj4g
IAkJICAgICAoZGV2aWQgPT0gMHgxYjMzIHx8IGRldmlkID09IDB4MWI3MyB8fCBkaWZmIC0tZ2l0
DQo+IGEvc3JjL3ZlbmRzdGF0LmMgYi9zcmMvdmVuZHN0YXQuYyBpbmRleCBmM2IzZDQyLi41YTNh
ZjIxIDEwMDY0NA0KPiAtLS0gYS9zcmMvdmVuZHN0YXQuYw0KPiArKysgYi9zcmMvdmVuZHN0YXQu
Yw0KPiBAQCAtMTQ3LDggKzE0Nyw5IEBAIHN0YXRpYyB1aW50MTZfdCBleHRfZndfaW5mb19kZXZp
Y2VbXVsyXSA9IHsNCj4gIAl7MHhjNzM4LCAweGM3M2J9LAkvKiBTd2l0Y2gtWCAqLw0KPiAgCXsw
eGNiMjAsIDB4Y2IyMH0sCS8qIFN3aXRjaC1JQiAqLw0KPiAgCXsweGNmMDgsIDB4Y2YwOH0sCS8q
IFN3aXRjaC1JQjIgKi8NCj4gKwl7MHhkMmYwLCAweGQyZjB9LAkvKiBRdWFudHVtICovDQo+ICAJ
ezB4MDFiMywgMHgwMWIzfSwJLyogSVMtNCAqLw0KPiAtCXsweDEwMDMsIDB4MTAxOX0sCS8qIENv
bm5lY3QtWCAqLw0KPiArCXsweDEwMDMsIDB4MTAxYn0sCS8qIENvbm5lY3QtWCAqLw0KPiAgCXsw
eDFiMDIsIDB4MWIwMn0sCS8qIEJ1bGwgU3dpdGNoWCAqLw0KPiAgCXsweDFiNTAsIDB4MWI1MH0s
CS8qIEJ1bGwgU3dpdGNoWCAqLw0KPiAgCXsweDFiYTAsIDB4MWJhMH0sCS8qIEJ1bGwgU3dpdGNo
SUIgKi8NCj4gLS0NCj4gMi44LjQNCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c
index 26bd09a..05f1dc9 100644
--- a/libibnetdisc/src/ibnetdisc.c
+++ b/libibnetdisc/src/ibnetdisc.c
@@ -198,7 +198,9 @@  static int is_mlnx_ext_port_info_supported(ibnd_port_t * port)
 	uint16_t devid = (uint16_t) mad_get_field(port->node->info, 0, IB_NODE_DEVID_F);
 	uint32_t vendorid = (uint32_t) mad_get_field(port->node->info, 0, IB_NODE_VENDORID_F);
 
-	if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 ||
+	if ((devid >= 0xc738 && devid <= 0xc73b) ||
+	    devid == 0xc839 || devid == 0xcb20 || devid == 0xcf08 ||
+	    devid == 0xcf09 || devid == 0xd2f0 ||
 	    ((vendorid == 0x119f) &&
 	     /* Bull SwitchX */
 	     (devid == 0x1b02 || devid == 0x1b50 ||
@@ -206,7 +208,7 @@  static int is_mlnx_ext_port_info_supported(ibnd_port_t * port)
 	      devid == 0x1ba0 ||
 	      (devid >= 0x1bd0 && devid <= 0x1bd5))))
 		return 1;
-	if ((devid >= 0x1003 && devid <= 0x1019) ||
+	if ((devid >= 0x1003 && devid <= 0x101b) ||
 	    ((vendorid == 0x119f) &&
 	     /* Bull ConnectX3 */
 	     (devid == 0x1b33 || devid == 0x1b73 ||
diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c
index a57a04b..41b749c 100644
--- a/src/ibdiag_common.c
+++ b/src/ibdiag_common.c
@@ -542,7 +542,9 @@  int is_mlnx_ext_port_info_supported(uint32_t vendorid,
 {
 	if (ibd_ibnetdisc_flags & IBND_CONFIG_MLX_EPI) {
 
-		if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 ||
+		if ((devid >= 0xc738 && devid <= 0xc73b) ||
+		    devid == 0xc839 || devid == 0xcb20 || devid == 0xcf08 ||
+		    devid == 0xcf09 || devid == 0xd2f0 ||
 		    ((vendorid == 0x119f) &&
 		     /* Bull SwitchX */
 		     (devid == 0x1b02 || devid == 0x1b50 ||
@@ -550,7 +552,7 @@  int is_mlnx_ext_port_info_supported(uint32_t vendorid,
 		      devid == 0x1ba0 ||
 		      (devid >= 0x1bd0 && devid <= 0x1bd5))))
 			return 1;
-		if ((devid >= 0x1003 && devid <= 0x1019) ||
+		if ((devid >= 0x1003 && devid <= 0x101b) ||
 		    ((vendorid == 0x119f) &&
 		     /* Bull ConnectX3 */
 		     (devid == 0x1b33 || devid == 0x1b73 ||
diff --git a/src/vendstat.c b/src/vendstat.c
index f3b3d42..5a3af21 100644
--- a/src/vendstat.c
+++ b/src/vendstat.c
@@ -147,8 +147,9 @@  static uint16_t ext_fw_info_device[][2] = {
 	{0xc738, 0xc73b},	/* Switch-X */
 	{0xcb20, 0xcb20},	/* Switch-IB */
 	{0xcf08, 0xcf08},	/* Switch-IB2 */
+	{0xd2f0, 0xd2f0},	/* Quantum */
 	{0x01b3, 0x01b3},	/* IS-4 */
-	{0x1003, 0x1019},	/* Connect-X */
+	{0x1003, 0x101b},	/* Connect-X */
 	{0x1b02, 0x1b02},	/* Bull SwitchX */
 	{0x1b50, 0x1b50},	/* Bull SwitchX */
 	{0x1ba0, 0x1ba0},	/* Bull SwitchIB */