* [PATCH net-next] sfc: don't use netif_info et al before net_device is registered
@ 2021-05-13 21:29 Heiner Kallweit
2021-05-18 13:58 ` Martin Habets
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2021-05-13 21:29 UTC (permalink / raw)
To: Edward Cree, Martin Habets, David S. Miller, Jakub Kicinski; +Cc: netdev
Using netif_info() before the net_device is registered results in ugly
messages like the following:
sfc 0000:01:00.1 (unnamed net_device) (uninitialized): Solarflare NIC detected
Therefore use pci_info() et al until net_device is registered.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/sfc/efx.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index c746ca723..4fd9903ff 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -722,8 +722,7 @@ static int efx_register_netdev(struct efx_nic *efx)
efx->state = STATE_READY;
smp_mb(); /* ensure we change state before checking reset_pending */
if (efx->reset_pending) {
- netif_err(efx, probe, efx->net_dev,
- "aborting probe due to scheduled reset\n");
+ pci_err(efx->pci_dev, "aborting probe due to scheduled reset\n");
rc = -EIO;
goto fail_locked;
}
@@ -990,8 +989,7 @@ static int efx_pci_probe_main(struct efx_nic *efx)
rc = efx->type->init(efx);
up_write(&efx->filter_sem);
if (rc) {
- netif_err(efx, probe, efx->net_dev,
- "failed to initialise NIC\n");
+ pci_err(efx->pci_dev, "failed to initialise NIC\n");
goto fail3;
}
@@ -1038,8 +1036,8 @@ static int efx_pci_probe_post_io(struct efx_nic *efx)
if (efx->type->sriov_init) {
rc = efx->type->sriov_init(efx);
if (rc)
- netif_err(efx, probe, efx->net_dev,
- "SR-IOV can't be enabled rc %d\n", rc);
+ pci_err(efx->pci_dev, "SR-IOV can't be enabled rc %d\n",
+ rc);
}
/* Determine netdevice features */
@@ -1106,8 +1104,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
if (rc)
goto fail1;
- netif_info(efx, probe, efx->net_dev,
- "Solarflare NIC detected\n");
+ pci_info(pci_dev, "Solarflare NIC detected\n");
if (!efx->type->is_vf)
efx_probe_vpd_strings(efx);
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] sfc: don't use netif_info et al before net_device is registered
2021-05-13 21:29 [PATCH net-next] sfc: don't use netif_info et al before net_device is registered Heiner Kallweit
@ 2021-05-18 13:58 ` Martin Habets
0 siblings, 0 replies; 2+ messages in thread
From: Martin Habets @ 2021-05-18 13:58 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: Edward Cree, David S. Miller, Jakub Kicinski, netdev
On Thu, May 13, 2021 at 11:29:12PM +0200, Heiner Kallweit wrote:
> Using netif_info() before the net_device is registered results in ugly
> messages like the following:
> sfc 0000:01:00.1 (unnamed net_device) (uninitialized): Solarflare NIC detected
> Therefore use pci_info() et al until net_device is registered.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Hard to believe I've seen those messages for years and not noticed.
Thanks!
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
> ---
> drivers/net/ethernet/sfc/efx.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
> index c746ca723..4fd9903ff 100644
> --- a/drivers/net/ethernet/sfc/efx.c
> +++ b/drivers/net/ethernet/sfc/efx.c
> @@ -722,8 +722,7 @@ static int efx_register_netdev(struct efx_nic *efx)
> efx->state = STATE_READY;
> smp_mb(); /* ensure we change state before checking reset_pending */
> if (efx->reset_pending) {
> - netif_err(efx, probe, efx->net_dev,
> - "aborting probe due to scheduled reset\n");
> + pci_err(efx->pci_dev, "aborting probe due to scheduled reset\n");
> rc = -EIO;
> goto fail_locked;
> }
> @@ -990,8 +989,7 @@ static int efx_pci_probe_main(struct efx_nic *efx)
> rc = efx->type->init(efx);
> up_write(&efx->filter_sem);
> if (rc) {
> - netif_err(efx, probe, efx->net_dev,
> - "failed to initialise NIC\n");
> + pci_err(efx->pci_dev, "failed to initialise NIC\n");
> goto fail3;
> }
>
> @@ -1038,8 +1036,8 @@ static int efx_pci_probe_post_io(struct efx_nic *efx)
> if (efx->type->sriov_init) {
> rc = efx->type->sriov_init(efx);
> if (rc)
> - netif_err(efx, probe, efx->net_dev,
> - "SR-IOV can't be enabled rc %d\n", rc);
> + pci_err(efx->pci_dev, "SR-IOV can't be enabled rc %d\n",
> + rc);
> }
>
> /* Determine netdevice features */
> @@ -1106,8 +1104,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
> if (rc)
> goto fail1;
>
> - netif_info(efx, probe, efx->net_dev,
> - "Solarflare NIC detected\n");
> + pci_info(pci_dev, "Solarflare NIC detected\n");
>
> if (!efx->type->is_vf)
> efx_probe_vpd_strings(efx);
> --
> 2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-18 13:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-13 21:29 [PATCH net-next] sfc: don't use netif_info et al before net_device is registered Heiner Kallweit
2021-05-18 13:58 ` Martin Habets
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.