diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-09-18 19:56:18 -0400 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 15:20:38 -0400 |
commit | df2cd8af097850bb3440817fdb6b08922ff4b327 (patch) | |
tree | e9778f51808f1ad6ef3795ae470068c4e95c6cf4 /drivers/net/ethernet/sfc/falcon.c | |
parent | f2b0befd1dd2f0b08feff8e66741d56b239af7b8 (diff) |
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/falcon.c')
-rw-r--r-- | drivers/net/ethernet/sfc/falcon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c index fe83c26c4b8a..e556a5d7731a 100644 --- a/drivers/net/ethernet/sfc/falcon.c +++ b/drivers/net/ethernet/sfc/falcon.c | |||
@@ -2404,6 +2404,7 @@ const struct efx_nic_type falcon_a1_nic_type = { | |||
2404 | .phys_addr_channels = 4, | 2404 | .phys_addr_channels = 4, |
2405 | .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH, | 2405 | .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH, |
2406 | .offload_features = NETIF_F_IP_CSUM, | 2406 | .offload_features = NETIF_F_IP_CSUM, |
2407 | .mcdi_max_ver = -1, | ||
2407 | }; | 2408 | }; |
2408 | 2409 | ||
2409 | const struct efx_nic_type falcon_b0_nic_type = { | 2410 | const struct efx_nic_type falcon_b0_nic_type = { |
@@ -2481,5 +2482,6 @@ const struct efx_nic_type falcon_b0_nic_type = { | |||
2481 | * channels */ | 2482 | * channels */ |
2482 | .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH, | 2483 | .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH, |
2483 | .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE, | 2484 | .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE, |
2485 | .mcdi_max_ver = -1, | ||
2484 | }; | 2486 | }; |
2485 | 2487 | ||