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

Commit 6ccef1de authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

IB/mthca: Don't read reserved fields in mthca_QUERY_ADAPTER() 



For memfree devices, the firmware QUERY_ADAPTER command does not
return vendor_id, device_id, and revision_id; do not return these
fields in the QUERY_ADAPTER function for memfree devices.

Instead, for memfree devices, initialize the rev_id field of the mthca
device via init_node_data (MAD IFC query), as is done in the
query_device verb implementation.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 7bc531dd

drivers/infiniband/hw/mthca/mthca_cmd.c

+8 −3
Original line number Diff line number Diff line
@@ -1255,9 +1255,14 @@ int mthca_QUERY_ADAPTER(struct mthca_dev *dev, 
	if (err)

		goto out;



	MTHCA_GET(adapter->vendor_id, outbox,   QUERY_ADAPTER_VENDOR_ID_OFFSET);

	MTHCA_GET(adapter->device_id, outbox,   QUERY_ADAPTER_DEVICE_ID_OFFSET);

	MTHCA_GET(adapter->revision_id, outbox, QUERY_ADAPTER_REVISION_ID_OFFSET);

	if (!mthca_is_memfree(dev)) {

		MTHCA_GET(adapter->vendor_id, outbox,

			  QUERY_ADAPTER_VENDOR_ID_OFFSET);

		MTHCA_GET(adapter->device_id, outbox,

			  QUERY_ADAPTER_DEVICE_ID_OFFSET);

		MTHCA_GET(adapter->revision_id, outbox,

			  QUERY_ADAPTER_REVISION_ID_OFFSET);

	}

	MTHCA_GET(adapter->inta_pin, outbox,    QUERY_ADAPTER_INTA_PIN_OFFSET);



	get_board_id(outbox + QUERY_ADAPTER_VSD_OFFSET / 4,

drivers/infiniband/hw/mthca/mthca_main.c

+2 −1
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ static int mthca_init_hca(struct mthca_dev *mdev) 
	}



	mdev->eq_table.inta_pin = adapter.inta_pin;

	if (!mthca_is_memfree(mdev))

		mdev->rev_id = adapter.revision_id;

	memcpy(mdev->board_id, adapter.board_id, sizeof mdev->board_id);

drivers/infiniband/hw/mthca/mthca_provider.c

+2 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,8 @@ static int mthca_init_node_data(struct mthca_dev *dev) 
		goto out;

	}



	if (mthca_is_memfree(dev))

		dev->rev_id = be32_to_cpup((__be32 *) (out_mad->data + 32));

	memcpy(&dev->ib_dev.node_guid, out_mad->data + 12, 8);



out: