GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 22:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sfc: Downgrade or remove some error messages

Browse source 
Depending on configuration the NIC may return errors for unprivileged
functions and/or VFs. Where these are expected and handled, reduce the
level of any output.

Signed-off-by: Bert Kenward <bkenward@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bert Kenward 2015-12-23 08:58:15 +00:00 • committed by David S. Miller
parent 8c578368e8
commit 09a04204f0
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/ethernet/sfc/ef10.c
View file

@ -486,10 +486,17 @@ static int efx_ef10_alloc_piobufs(struct efx_nic *efx, unsigned int n)
BUILD_BUG_ON(MC_CMD_ALLOC_PIOBUF_IN_LEN != 0); BUILD_BUG_ON(MC_CMD_ALLOC_PIOBUF_IN_LEN != 0);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
rc = efx_mcdi_rpc(efx, MC_CMD_ALLOC_PIOBUF, NULL, 0, rc = efx_mcdi_rpc_quiet(efx, MC_CMD_ALLOC_PIOBUF, NULL, 0,
outbuf, sizeof(outbuf), &outlen); outbuf, sizeof(outbuf), &outlen);
if (rc) if (rc) {
/* Don't display the MC error if we didn't have space
* for a VF.
*/
if (!(efx_ef10_is_vf(efx) && rc == -ENOSPC))
efx_mcdi_display_error(efx, MC_CMD_ALLOC_PIOBUF,
0, outbuf, outlen, rc);
break; break;
}
if (outlen < MC_CMD_ALLOC_PIOBUF_OUT_LEN) { if (outlen < MC_CMD_ALLOC_PIOBUF_OUT_LEN) {
rc = -EIO; rc = -EIO;
break; break;
@ -4028,9 +4035,10 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx, bool multicast,
rc = efx_ef10_filter_insert(efx, &spec, true); rc = efx_ef10_filter_insert(efx, &spec, true);
if (rc < 0) { if (rc < 0) {
netif_warn(efx, drv, efx->net_dev, netif_printk(efx, drv, rc == -EPERM ? KERN_DEBUG : KERN_WARNING,
"%scast mismatch filter insert failed rc=%d\n", efx->net_dev,
multicast ? "Multi" : "Uni", rc); "%scast mismatch filter insert failed rc=%d\n",
multicast ? "Multi" : "Uni", rc);
} else if (multicast) { } else if (multicast) {
table->mcdef_id = efx_ef10_filter_get_unsafe_id(efx, rc); table->mcdef_id = efx_ef10_filter_get_unsafe_id(efx, rc);
if (!nic_data->workaround_26807) { if (!nic_data->workaround_26807) {

7
drivers/net/ethernet/sfc/efx.c
View file

@ -3174,14 +3174,15 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
rtnl_lock(); rtnl_lock();
rc = efx_mtd_probe(efx); rc = efx_mtd_probe(efx);
rtnl_unlock(); rtnl_unlock();
if (rc) if (rc && rc != -EPERM)
netif_warn(efx, probe, efx->net_dev, netif_warn(efx, probe, efx->net_dev,
"failed to create MTDs (%d)\n", rc); "failed to create MTDs (%d)\n", rc);
rc = pci_enable_pcie_error_reporting(pci_dev); rc = pci_enable_pcie_error_reporting(pci_dev);
if (rc && rc != -EINVAL) if (rc && rc != -EINVAL)
netif_warn(efx, probe, efx->net_dev, netif_notice(efx, probe, efx->net_dev,
"pci_enable_pcie_error_reporting failed (%d)\n", rc); "PCIE error reporting unavailable (%d).\n",
rc);
return 0; return 0;