asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfc: Convert firmware subtypes to native byte order in efx_mcdi_get_board_cfg()

Browse source 
On big-endian systems the MTD partition names currently have mangled
subtype numbers and are not recognised by the firmware update tool
(sfupdate).

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
This commit is contained in:
Ben Hutchings 2012-09-07 00:58:10 +01:00
parent 7c236c43b8
commit bfeed90294
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/sfc/mcdi.c
View file

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