Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df866619 authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/ipath: Use IEEE OUI for vendor_id reported by ibv_query_device() 



The IB spe. for SubnGet(NodeInfo) and query HCA says that the vendor
ID field should be the IEEE OUI assigned to the vendor.  The ipath
driver was returning the PCI vendor ID instead.  This will affect
applications which call ibv_query_device().  The old value was
0x001fc1 or 0x001077, the new value is 0x001175.

The vendor ID doesn't appear to be exported via /sys so that should
reduce possible compatibility issues.  I'm only aware of Open MPI as a
major application which depends on this change, and they have made
necessary adjustments.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent bd360671

drivers/infiniband/hw/ipath/ipath_mad.c

+3 −3
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp, 
	nip->revision = cpu_to_be32((majrev << 16) | minrev);

	nip->local_port_num = port;

	vendor = dd->ipath_vendorid;

	nip->vendor_id[0] = 0;

	nip->vendor_id[1] = vendor >> 8;

	nip->vendor_id[2] = vendor;

	nip->vendor_id[0] = IPATH_SRC_OUI_1;

	nip->vendor_id[1] = IPATH_SRC_OUI_2;

	nip->vendor_id[2] = IPATH_SRC_OUI_3;



	return reply(smp);

}

drivers/infiniband/hw/ipath/ipath_verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,8 @@ static int ipath_query_device(struct ib_device *ibdev, 
		IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |

		IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;

	props->page_size_cap = PAGE_SIZE;

	props->vendor_id = dev->dd->ipath_vendorid;

	props->vendor_id =

		IPATH_SRC_OUI_1 << 16 | IPATH_SRC_OUI_2 << 8 | IPATH_SRC_OUI_3;

	props->vendor_part_id = dev->dd->ipath_deviceid;

	props->hw_ver = dev->dd->ipath_pcirev;