mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
vxge: correct multi-function detection
The values used to determined if the adapter is running in single or multi-function mode were previously modified to the values necessary when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However, the firmware call was not modified. This had the driver printing out on probe that the adapter was in multi-function mode when in single function mode and vice versa. Signed-off-by: Jon Mason <jon.mason@exar.com> Signed-off-by: Ram Vepa <ram.vepa@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e7935c9669
commit
ca3e3b8fae
2 changed files with 6 additions and 3 deletions
|
@ -1091,16 +1091,16 @@ __vxge_hw_vpath_pci_func_mode_get(struct __vxge_hw_virtualpath *vpath,
|
||||||
u64 data0, data1 = 0, steer_ctrl = 0;
|
u64 data0, data1 = 0, steer_ctrl = 0;
|
||||||
enum vxge_hw_status status;
|
enum vxge_hw_status status;
|
||||||
|
|
||||||
data0 = VXGE_HW_RTS_ACCESS_STEER_DATA0_MEMO_ITEM_PCI_MODE;
|
data0 = 0;
|
||||||
|
|
||||||
status = vxge_hw_vpath_fw_api(vpath,
|
status = vxge_hw_vpath_fw_api(vpath,
|
||||||
VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_READ_MEMO_ENTRY,
|
VXGE_HW_FW_API_GET_FUNC_MODE,
|
||||||
VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
|
VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
|
||||||
0, &data0, &data1, &steer_ctrl);
|
0, &data0, &data1, &steer_ctrl);
|
||||||
if (status != VXGE_HW_OK)
|
if (status != VXGE_HW_OK)
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
hw_info->function_mode = data0;
|
hw_info->function_mode = VXGE_HW_GET_FUNC_MODE_VAL(data0);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,9 @@
|
||||||
#define VXGE_HW_GET_EPROM_IMAGE_REV(val) vxge_bVALn(val, 48, 16)
|
#define VXGE_HW_GET_EPROM_IMAGE_REV(val) vxge_bVALn(val, 48, 16)
|
||||||
#define VXGE_HW_RTS_ACCESS_STEER_ROM_IMAGE_INDEX(val) vxge_vBIT(val, 16, 8)
|
#define VXGE_HW_RTS_ACCESS_STEER_ROM_IMAGE_INDEX(val) vxge_vBIT(val, 16, 8)
|
||||||
|
|
||||||
|
#define VXGE_HW_FW_API_GET_FUNC_MODE 29
|
||||||
|
#define VXGE_HW_GET_FUNC_MODE_VAL(val) (val & 0xFF)
|
||||||
|
|
||||||
#define VXGE_HW_FW_UPGRADE_MEMO 13
|
#define VXGE_HW_FW_UPGRADE_MEMO 13
|
||||||
#define VXGE_HW_FW_UPGRADE_ACTION 16
|
#define VXGE_HW_FW_UPGRADE_ACTION 16
|
||||||
#define VXGE_HW_FW_UPGRADE_OFFSET_START 2
|
#define VXGE_HW_FW_UPGRADE_OFFSET_START 2
|
||||||
|
|
Loading…
Reference in a new issue