From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B4881EE7B7 for ; Fri, 3 Apr 2026 12:36:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775219774; cv=none; b=fue8ZQRJRiOiboi07Qpphsa8IXtfnQEX274AjOEh9mdZPsA1IxUPfVKUHfnjyBDUqipm65oA/QOBp8/GkA1YusSlIwhV51kUw0VXLDhdAj3Z60NUjwSE4Lji+8GtCW4tJ1N+2AKB3olcpYlstGBVFvNbJ4n7JrXVBydGlLq0iWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775219774; c=relaxed/simple; bh=X3XVpXyP4g3ARDUOTgtbvLWtHKjdFa8Ji90GBFFPHS8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Gxh2Dvak6cIp10xpFJOALdD7CzsKeSMxQF1gza7Dot4LMLP3X2DlcPWHYBpJ1EktgZPWJ7608gJpv/iryX/VfvjaWaEV9pSAnaog7z/+BFJCgX903xOVNshDKtCNTyESi5vyDuFUVdCF9LTxmSsoukq3losAcfqifFDUvnGdJHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RqkxR+ni; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RqkxR+ni" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A906C4CEF7; Fri, 3 Apr 2026 12:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775219774; bh=X3XVpXyP4g3ARDUOTgtbvLWtHKjdFa8Ji90GBFFPHS8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RqkxR+niEw/K2ZktPoTMpDJxHXjTOS1E4NhnA3p429igntuDxFv3gArIp7hY/PALd gtRouYYIt4y742sZPhm2YLrGCoOEeW54NPkpjMZgiCnBadEBsp5utM6BU9825rjkvn 7kmytAB7cE8AQ8jaAI/jPDE6y/kFjit98R0cLR7NPNf0yOdMKruoyPZMzBAJorarRG x8yPCfxuw0vZyam/Jcjlzyp3RzpGc5ZQXqTj5gPEDD/3AWeYS2dwhhn1+zMudoNXAa f11JkindJBGikiaxsmdnAOunc2tU/mHK2XvPP9N2N75ikUj7Ux3k+P5+c2y/f4tUZZ DumM2behqkUyQ== Date: Fri, 3 Apr 2026 13:36:10 +0100 From: Simon Horman To: Aleksandr Loktionov Cc: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, netdev@vger.kernel.org, Paul Greenwalt Subject: Re: [PATCH net] ice: fix ice_init_link() error return preventing probe Message-ID: <20260403123610.GA91152@horms.kernel.org> References: <20260327072332.130320-1-aleksandr.loktionov@intel.com> <20260327072332.130320-6-aleksandr.loktionov@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > > 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 > Signed-off-by: Aleksandr Loktionov The nit below notwithstanding, this looks good to me. Reviewed-by: Simon Horman > --- > > 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 >