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: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
committed by
Roland Dreier
parent
7bc531dd88
commit
6ccef1de2c
@ -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,
|
||||
|
Reference in New Issue
Block a user