* [PATCH net-next] sfc: nicer log message on Siena SR-IOV probe fail
@ 2015-05-15 19:56 Edward Cree
2015-05-16 22:02 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Edward Cree @ 2015-05-15 19:56 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-net-drivers
We expect that MC_CMD_SRIOV will fail if the card has no VFs configured.
So output a readable message instead of a cryptic MCDI error.
---
drivers/net/ethernet/sfc/siena_sriov.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c
index caf701a..2a5f352 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena_sriov.c
@@ -208,8 +208,8 @@ static int efx_siena_sriov_cmd(struct efx_nic *efx, bool enable,
MCDI_SET_DWORD(inbuf, SRIOV_IN_VI_BASE, EFX_VI_BASE);
MCDI_SET_DWORD(inbuf, SRIOV_IN_VF_COUNT, efx->vf_count);
- rc = efx_mcdi_rpc(efx, MC_CMD_SRIOV, inbuf, MC_CMD_SRIOV_IN_LEN,
- outbuf, MC_CMD_SRIOV_OUT_LEN, &outlen);
+ rc = efx_mcdi_rpc_quiet(efx, MC_CMD_SRIOV, inbuf, MC_CMD_SRIOV_IN_LEN,
+ outbuf, MC_CMD_SRIOV_OUT_LEN, &outlen);
if (rc)
return rc;
if (outlen < MC_CMD_SRIOV_OUT_LEN)
@@ -1058,8 +1058,10 @@ void efx_siena_sriov_probe(struct efx_nic *efx)
if (!max_vfs)
return;
- if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count))
+ if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count)) {
+ netif_info(efx, probe, efx->net_dev, "no SR-IOV VFs probed\n");
return;
+ }
if (count > 0 && count > max_vfs)
count = max_vfs;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH net-next] sfc: nicer log message on Siena SR-IOV probe fail
@ 2015-05-18 13:18 Edward Cree
2015-05-18 20:21 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Edward Cree @ 2015-05-18 13:18 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-net-drivers
We expect that MC_CMD_SRIOV will fail if the card has no VFs configured.
So output a readable message instead of a cryptic MCDI error.
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/siena_sriov.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c
index caf701a..2a5f352 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena_sriov.c
@@ -208,8 +208,8 @@ static int efx_siena_sriov_cmd(struct efx_nic *efx, bool enable,
MCDI_SET_DWORD(inbuf, SRIOV_IN_VI_BASE, EFX_VI_BASE);
MCDI_SET_DWORD(inbuf, SRIOV_IN_VF_COUNT, efx->vf_count);
- rc = efx_mcdi_rpc(efx, MC_CMD_SRIOV, inbuf, MC_CMD_SRIOV_IN_LEN,
- outbuf, MC_CMD_SRIOV_OUT_LEN, &outlen);
+ rc = efx_mcdi_rpc_quiet(efx, MC_CMD_SRIOV, inbuf, MC_CMD_SRIOV_IN_LEN,
+ outbuf, MC_CMD_SRIOV_OUT_LEN, &outlen);
if (rc)
return rc;
if (outlen < MC_CMD_SRIOV_OUT_LEN)
@@ -1058,8 +1058,10 @@ void efx_siena_sriov_probe(struct efx_nic *efx)
if (!max_vfs)
return;
- if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count))
+ if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count)) {
+ netif_info(efx, probe, efx->net_dev, "no SR-IOV VFs probed\n");
return;
+ }
if (count > 0 && count > max_vfs)
count = max_vfs;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] sfc: nicer log message on Siena SR-IOV probe fail
2015-05-18 13:18 Edward Cree
@ 2015-05-18 20:21 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2015-05-18 20:21 UTC (permalink / raw)
To: ecree; +Cc: netdev, linux-net-drivers
From: Edward Cree <ecree@solarflare.com>
Date: Mon, 18 May 2015 14:18:27 +0100
> We expect that MC_CMD_SRIOV will fail if the card has no VFs configured.
> So output a readable message instead of a cryptic MCDI error.
>
> Signed-off-by: Edward Cree <ecree@solarflare.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-18 20:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-15 19:56 [PATCH net-next] sfc: nicer log message on Siena SR-IOV probe fail Edward Cree
2015-05-16 22:02 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2015-05-18 13:18 Edward Cree
2015-05-18 20:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).