Commit 6eacfb54 authored by Tomáš Pilař's avatar Tomáš Pilař Committed by David S. Miller

sfc: reduce severity of PIO buffer alloc failures

PIO buffer allocation can fail for two valid reasons:
 - we've run out of them (results in -ENOSPC)
 - the NIC configuration doesn't support them (results in -EPERM)
Since both these failures are expected netif_err is excessive.
Signed-off-by: default avatarBert Kenward <bkenward@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 761095c2
...@@ -1170,7 +1170,13 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx) ...@@ -1170,7 +1170,13 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx)
nic_data->piobuf_size / efx_piobuf_size); nic_data->piobuf_size / efx_piobuf_size);
rc = efx_ef10_alloc_piobufs(efx, n_piobufs); rc = efx_ef10_alloc_piobufs(efx, n_piobufs);
if (rc) if (rc == -ENOSPC)
netif_dbg(efx, probe, efx->net_dev,
"out of PIO buffers; cannot allocate more\n");
else if (rc == -EPERM)
netif_dbg(efx, probe, efx->net_dev,
"not permitted to allocate PIO buffers\n");
else if (rc)
netif_err(efx, probe, efx->net_dev, netif_err(efx, probe, efx->net_dev,
"failed to allocate PIO buffers (%d)\n", rc); "failed to allocate PIO buffers (%d)\n", rc);
else else
...@@ -1317,8 +1323,14 @@ static int efx_ef10_init_nic(struct efx_nic *efx) ...@@ -1317,8 +1323,14 @@ static int efx_ef10_init_nic(struct efx_nic *efx)
efx_ef10_free_piobufs(efx); efx_ef10_free_piobufs(efx);
} }
/* Log an error on failure, but this is non-fatal */ /* Log an error on failure, but this is non-fatal.
if (rc) * Permission errors are less important - we've presumably
* had the PIO buffer licence removed.
*/
if (rc == -EPERM)
netif_dbg(efx, drv, efx->net_dev,
"not permitted to restore PIO buffers\n");
else if (rc)
netif_err(efx, drv, efx->net_dev, netif_err(efx, drv, efx->net_dev,
"failed to restore PIO buffers (%d)\n", rc); "failed to restore PIO buffers (%d)\n", rc);
nic_data->must_restore_piobufs = false; nic_data->must_restore_piobufs = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment