Re: [PATCH infiniband-diags] Add Bull device ID support to device white lists

[Vincent Ficet <jean-vincent.ficet-BUmcmmAb0Fc@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 2327 bytes --]

Hello,

The patch proposed by Hal Rosenstock does not list all Bull device IDs.

Please apply the attached patch which contains an up to date list of such IDs.

Best Regards,

Vincent


On 12/07/2016 03:53 PM, ira.weiny wrote:
> On Tue, Dec 06, 2016 at 02:22:52PM -0500, Hal Rosenstock wrote:
>> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> Thanks applied,
> Ira
>
>> ---
>> diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c
>> index 6ef7805..223e097 100644
>> --- a/libibnetdisc/src/ibnetdisc.c
>> +++ b/libibnetdisc/src/ibnetdisc.c
>> @@ -197,7 +197,7 @@ 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);
>>  
>> -	if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08)
>> +	if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 || devid == 0x1b02)
>>  		return 1;
>>  	if (devid >= 0x1003 && devid <= 0x1016)
>>  		return 1;
>> diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c
>> index 2a1e971..6809a1e 100644
>> --- a/src/ibdiag_common.c
>> +++ b/src/ibdiag_common.c
>> @@ -530,7 +530,7 @@ int is_port_info_extended_supported(ib_portid_t * dest, int port,
>>  int is_mlnx_ext_port_info_supported(uint32_t devid)
>>  {
>>  	if (ibd_ibnetdisc_flags & IBND_CONFIG_MLX_EPI) {
>> -		if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08)
>> +		if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 || devid == 0x1b02)
>>  			return 1;
>>  		if (devid >= 0x1003 && devid <= 0x1016)
>>  			return 1;
>> diff --git a/src/vendstat.c b/src/vendstat.c
>> index fb42a78..284ef93 100644
>> --- a/src/vendstat.c
>> +++ b/src/vendstat.c
>> @@ -149,6 +149,7 @@ static uint16_t ext_fw_info_device[][2] = {
>>  	{0xcf08, 0xcf08},	/* Switch-IB2 */
>>  	{0x01b3, 0x01b3},	/* IS-4 */
>>  	{0x1003, 0x1016},	/* Connect-X */
>> +	{0x1b02, 0x1b02},	/* Bull */
>>  	{0x0000, 0x0000}};
>>  
>>  static int is_ext_fw_info_supported(uint16_t device_id) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


[-- Attachment #2: infiniband-diags_fix_bull_device_IDs.patch --]
[-- Type: text/x-patch, Size: 1849 bytes --]

diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c
index 7ba5c91..758d3cd 100644
--- a/libibnetdisc/src/ibnetdisc.c
+++ b/libibnetdisc/src/ibnetdisc.c
@@ -196,10 +196,23 @@ static void debug_port(ib_portid_t * portid, ibnd_port_t * port)
 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);
-
-	if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 || devid == 0x1b02)
+	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 ||
+	    ((vendorid == 0x119f) &&
+	     /* Bull SwitchX */
+	     (devid == 0x1b02 || devid == 0x1b50 ||
+	      /* Bull SwitchIB */
+	      (devid >= 0x1bd0 && devid <= 0x1bd2) ||
+	      /* Bull SwitchIB2 */
+	      (devid >= 0x1bd3 && devid <= 0x1bd5))))
 		return 1;
-	if (devid >= 0x1003 && devid <= 0x1016)
+	if ((devid >= 0x1003 && devid <= 0x1016) ||
+	    ((vendorid == 0x119f) &&
+	     /* Bull ConnectIB */
+	     (devid == 0x1b83 || devid == 0x1b93 || devid == 0x1b94 ||
+	      /* Bull ConnectX4 */
+	      devid == 0x1bb4 || devid == 0x1bb5 || devid == 0x1bc4)))
 		return 1;
 	return 0;
 }
diff --git a/src/vendstat.c b/src/vendstat.c
index 284ef93..ac456f4 100644
--- a/src/vendstat.c
+++ b/src/vendstat.c
@@ -149,7 +149,10 @@ static uint16_t ext_fw_info_device[][2] = {
 	{0xcf08, 0xcf08},	/* Switch-IB2 */
 	{0x01b3, 0x01b3},	/* IS-4 */
 	{0x1003, 0x1016},	/* Connect-X */
-	{0x1b02, 0x1b02},	/* Bull */
+	{0x1b02, 0x1b02},	/* Bull SwitchX */
+	{0x1b50, 0x1b50},	/* Bull SwitchX */
+	{0x1bd0, 0x1bd2},	/* Bull SwitchIB */
+	{0x1bd3, 0x1bd5},	/* Bull SwitchIB2 */
 	{0x0000, 0x0000}};
 
 static int is_ext_fw_info_supported(uint16_t device_id) {