diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-09-19 03:56:18 +0400 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 23:20:38 +0400 |
| commit | df2cd8af097850bb3440817fdb6b08922ff4b327 (patch) | |
| tree | e9778f51808f1ad6ef3795ae470068c4e95c6cf4 /drivers/net/ethernet/sfc/mcdi.h | |
| parent | f2b0befd1dd2f0b08feff8e66741d56b239af7b8 (diff) | |
| download | linux-df2cd8af097850bb3440817fdb6b08922ff4b327.tar.xz | |
sfc: Add support for MCDI v2
MCDI v2 adds a second header dword with wider command and length
fields. It also defines extra error codes.
Change the fallback error number for unknown MCDI error codes from EIO
to EPROTO. EIO is treated as indicating the MCDI transport has failed
and we need to reset the function, which is rather drastic.
v2 error codes and lengths don't fit into completion events, so for a
v2-capable transport, always read the response header rather then
using the event fields.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/mcdi.h')
| -rw-r--r-- | drivers/net/ethernet/sfc/mcdi.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.h b/drivers/net/ethernet/sfc/mcdi.h index 9b536d08a162..0cb0d5a8b7f6 100644 --- a/drivers/net/ethernet/sfc/mcdi.h +++ b/drivers/net/ethernet/sfc/mcdi.h @@ -43,7 +43,8 @@ enum efx_mcdi_mode { * @credits: Number of spurious MCDI completion events allowed before we * trigger a fatal error. Protected by @lock * @resprc: Response error/success code (Linux numbering) - * @resplen: Returned payload length + * @resp_hdr_len: Response header length + * @resp_data_len: Response data (SDU or error) length */ struct efx_mcdi_iface { atomic_t state; @@ -53,7 +54,8 @@ struct efx_mcdi_iface { unsigned int credits; unsigned int seqno; int resprc; - size_t resplen; + size_t resp_hdr_len; + size_t resp_data_len; }; struct efx_mcdi_mon { @@ -93,8 +95,8 @@ extern int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd, efx_dword_t *outbuf, size_t outlen, size_t *outlen_actual); -extern void efx_mcdi_rpc_start(struct efx_nic *efx, unsigned cmd, - const efx_dword_t *inbuf, size_t inlen); +extern int efx_mcdi_rpc_start(struct efx_nic *efx, unsigned cmd, + const efx_dword_t *inbuf, size_t inlen); extern int efx_mcdi_rpc_finish(struct efx_nic *efx, unsigned cmd, size_t inlen, efx_dword_t *outbuf, size_t outlen, size_t *outlen_actual); |