|
@@ -661,9 +661,8 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
|
|
|
u16 *fw_subtype_list, u32 *capabilities)
|
|
|
{
|
|
|
uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMIN];
|
|
|
- size_t outlen;
|
|
|
+ size_t outlen, offset, i;
|
|
|
int port_num = efx_port_num(efx);
|
|
|
- int offset;
|
|
|
int rc;
|
|
|
|
|
|
BUILD_BUG_ON(MC_CMD_GET_BOARD_CFG_IN_LEN != 0);
|
|
@@ -683,11 +682,16 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
|
|
|
: MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0_OFST;
|
|
|
if (mac_address)
|
|
|
memcpy(mac_address, outbuf + offset, ETH_ALEN);
|
|
|
- if (fw_subtype_list)
|
|
|
- memcpy(fw_subtype_list,
|
|
|
- outbuf + MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST,
|
|
|
- MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM *
|
|
|
- sizeof(fw_subtype_list[0]));
|
|
|
+ if (fw_subtype_list) {
|
|
|
+ offset = MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST;
|
|
|
+ for (i = 0;
|
|
|
+ i < MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM;
|
|
|
+ i++) {
|
|
|
+ fw_subtype_list[i] =
|
|
|
+ le16_to_cpup((__le16 *)(outbuf + offset));
|
|
|
+ offset += 2;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (capabilities) {
|
|
|
if (port_num)
|
|
|
*capabilities = MCDI_DWORD(outbuf,
|