From: Simon Horman <horms@kernel.org>
To: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Cc: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com,
netdev@vger.kernel.org, Paul Greenwalt <paul.greenwalt@intel.com>
Subject: Re: [Intel-wired-lan] [PATCH net] ice: fix ice_init_link() error return preventing probe
Date: Fri, 3 Apr 2026 13:36:10 +0100 [thread overview]
Message-ID: <20260403123610.GA91152@horms.kernel.org> (raw)
In-Reply-To: <20260327072332.130320-6-aleksandr.loktionov@intel.com>
On Fri, Mar 27, 2026 at 08:23:29AM +0100, Aleksandr Loktionov wrote:
> From: Paul Greenwalt <paul.greenwalt@intel.com>
>
> ice_init_link() can return an error status from ice_update_link_info()
> or ice_init_phy_user_cfg(), causing probe to fail.
>
> An incorrect NVM update procedure can result in link/PHY errors, and
> the recommended resolution is to update the NVM using the correct
> procedure. If the driver fails probe due to link errors, the user
> cannot update the NVM to recover. The link/PHY errors logged are
> non-fatal: they are already annotated as 'not a fatal error if this
> fails'.
>
> Since none of the errors inside ice_init_link() should prevent probe
> from completing, convert it to void and remove the error check in the
> caller. All failures are already logged; callers have no meaningful
> recovery path for link init errors.
>
> Fixes: 5b246e533d01 ("ice: split probe into smaller functions")
> Cc: stable@vger.kernel.org
> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
> Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
The nit below notwithstanding, this looks good to me.
Reviewed-by: Simon Horman <horms@kernel.org>
> ---
>
> drivers/net/ethernet/intel/ice/ice_main.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
...
> @@ -5043,9 +5039,7 @@ static int ice_init(struct ice_pf *pf)
>
> ice_init_wakeup(pf);
>
> - err = ice_init_link(pf);
> - if (err)
> - goto err_init_link;
I think now would be a good time to rename the err_init_link label,
after what it does, rather than where it is (no longer) jumped from.
And perhaps others in this function too
> + ice_init_link(pf);
>
> err = ice_send_version(pf);
> if (err)
> --
> 2.52.0
>
WARNING: multiple messages have this Message-ID (diff)
From: Simon Horman <horms@kernel.org>
To: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Cc: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com,
netdev@vger.kernel.org, Paul Greenwalt <paul.greenwalt@intel.com>
Subject: Re: [PATCH net] ice: fix ice_init_link() error return preventing probe
Date: Fri, 3 Apr 2026 13:36:10 +0100 [thread overview]
Message-ID: <20260403123610.GA91152@horms.kernel.org> (raw)
In-Reply-To: <20260327072332.130320-6-aleksandr.loktionov@intel.com>
On Fri, Mar 27, 2026 at 08:23:29AM +0100, Aleksandr Loktionov wrote:
> From: Paul Greenwalt <paul.greenwalt@intel.com>
>
> ice_init_link() can return an error status from ice_update_link_info()
> or ice_init_phy_user_cfg(), causing probe to fail.
>
> An incorrect NVM update procedure can result in link/PHY errors, and
> the recommended resolution is to update the NVM using the correct
> procedure. If the driver fails probe due to link errors, the user
> cannot update the NVM to recover. The link/PHY errors logged are
> non-fatal: they are already annotated as 'not a fatal error if this
> fails'.
>
> Since none of the errors inside ice_init_link() should prevent probe
> from completing, convert it to void and remove the error check in the
> caller. All failures are already logged; callers have no meaningful
> recovery path for link init errors.
>
> Fixes: 5b246e533d01 ("ice: split probe into smaller functions")
> Cc: stable@vger.kernel.org
> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
> Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
The nit below notwithstanding, this looks good to me.
Reviewed-by: Simon Horman <horms@kernel.org>
> ---
>
> drivers/net/ethernet/intel/ice/ice_main.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
...
> @@ -5043,9 +5039,7 @@ static int ice_init(struct ice_pf *pf)
>
> ice_init_wakeup(pf);
>
> - err = ice_init_link(pf);
> - if (err)
> - goto err_init_link;
I think now would be a good time to rename the err_init_link label,
after what it does, rather than where it is (no longer) jumped from.
And perhaps others in this function too
> + ice_init_link(pf);
>
> err = ice_send_version(pf);
> if (err)
> --
> 2.52.0
>
next prev parent reply other threads:[~2026-04-03 12:36 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-27 7:23 [Intel-wired-lan] [PATCH net] ice: fix null-ptr dereference on false-positive tx timeout Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix locking around wait_event_interruptible_locked_irq Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 9:11 ` [Intel-wired-lan] " Simon Horman
2026-04-03 9:11 ` Simon Horman
2026-05-08 7:01 ` [Intel-wired-lan] " Rinitha, SX
2026-05-08 7:01 ` Rinitha, SX
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix PTP Call Trace during PTP release Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 9:05 ` [Intel-wired-lan] " Simon Horman
2026-04-03 9:05 ` Simon Horman
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix PTP hang for E825C devices Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 12:31 ` [Intel-wired-lan] " Simon Horman
2026-04-03 12:31 ` Simon Horman
2026-05-04 12:11 ` [Intel-wired-lan] " Rinitha, SX
2026-05-04 12:11 ` Rinitha, SX
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix setting promisc mode while adding VID filter Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 12:28 ` [Intel-wired-lan] " Simon Horman
2026-04-03 12:28 ` Simon Horman
2026-05-05 5:01 ` [Intel-wired-lan] " Rinitha, SX
2026-05-05 5:01 ` Rinitha, SX
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix ice_init_link() error return preventing probe Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 12:36 ` Simon Horman [this message]
2026-04-03 12:36 ` Simon Horman
2026-04-03 12:38 ` [Intel-wired-lan] " Simon Horman
2026-04-03 12:38 ` Simon Horman
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: fix netdev bring-up and bring-down in self-test Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-08 21:12 ` [Intel-wired-lan] " Tony Nguyen
2026-04-08 21:12 ` Tony Nguyen
2026-04-10 9:42 ` [Intel-wired-lan] " Alexander Lobakin
2026-04-10 9:42 ` Alexander Lobakin
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: stop DCBNL requests during driver unload Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 13:06 ` [Intel-wired-lan] " Simon Horman
2026-04-03 13:06 ` Simon Horman
2026-04-08 21:08 ` [Intel-wired-lan] " Tony Nguyen
2026-04-08 21:08 ` Tony Nguyen
2026-03-27 7:23 ` [Intel-wired-lan] [PATCH net] ice: use READ_ONCE() to access cached PHC time Aleksandr Loktionov
2026-03-27 7:23 ` Aleksandr Loktionov
2026-04-03 12:55 ` [Intel-wired-lan] " Simon Horman
2026-04-03 12:55 ` Simon Horman
2026-05-14 5:42 ` [Intel-wired-lan] " Rinitha, SX
2026-05-14 5:42 ` Rinitha, SX
2026-05-05 5:08 ` [Intel-wired-lan] [PATCH net] ice: fix null-ptr dereference on false-positive tx timeout Rinitha, SX
2026-05-05 5:08 ` Rinitha, SX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260403123610.GA91152@horms.kernel.org \
--to=horms@kernel.org \
--cc=aleksandr.loktionov@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
--cc=paul.greenwalt@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.