From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22F4FE85361 for ; Fri, 3 Apr 2026 12:38:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D4097608F5; Fri, 3 Apr 2026 12:38:30 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5Q332mmI-T63; Fri, 3 Apr 2026 12:38:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 616E7608D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1775219909; bh=o5wyyOC49/YdPcoSuTcpsuyPxkwaicnARrZmA50f7uY=; h=Date:From:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cbO53GyLrzU+nHQnAG7UKwDQ2EzwbWpFBjrYRNvZKm8fnuUpmOOMKMZ7rAYP71MOK H0XdtqiiKi1E3N9zollF+DeZ5hrznqA4q/RPlXcPh+tJ9NZQfg0FlfL1v55TTcRzkQ HuC6Ifbw/2Iu7HKOkhckbNtodD4w1C9vDAXne2G5jeQI5eWI1CnSI09PBmHEDdKEBg PdhyfM2/c7F61UnpeWCnRXT5LzzpzTFIhq0smVW2LW647dkoxcPVr0HanDjbIbF3ic xLNUP+g2S5Sr3WnLDNkJ9TGNu1MU55LLY5icAyyucxpwJCxCkjAE9HvKgvungH23ST gw6gypAcyPfeQ== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 616E7608D8; Fri, 3 Apr 2026 12:38:29 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists1.osuosl.org (Postfix) with ESMTP id 4DC8B2CC for ; Fri, 3 Apr 2026 12:38:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 338BC608D8 for ; Fri, 3 Apr 2026 12:38:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wSP1og_eA9Vk for ; Fri, 3 Apr 2026 12:38:27 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=horms@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 416D5608C4 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 416D5608C4 Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) by smtp3.osuosl.org (Postfix) with ESMTPS id 416D5608C4 for ; Fri, 3 Apr 2026 12:38:27 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 58D6960138; Fri, 3 Apr 2026 12:38:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09D3AC4CEF7; Fri, 3 Apr 2026 12:38:24 +0000 (UTC) Date: Fri, 3 Apr 2026 13:38:22 +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 Message-ID: <20260403123822.GA94338@horms.kernel.org> References: <20260327072332.130320-1-aleksandr.loktionov@intel.com> <20260327072332.130320-6-aleksandr.loktionov@intel.com> <20260403123610.GA91152@horms.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260403123610.GA91152@horms.kernel.org> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775219906; bh=vtExJUQrc92Ifco2GsA0h+3adAwQZrofJkk/QL8wfVA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=owMD2MNbB8BomrEpFep2mNuubOTC0ctJo1BvryeYY809AfhdmuyBwgB5UbCkIGZkl qt6vtD9okfVecBI3ffr5iwmbvg7VBOTCnpRB0SGsMFSAcqoVfRlxe2noqkRPqQLviW PNklmfVpi9uQnSNG9yVKY8jLB7cVa3V8POR4n6fAM4oBdp7w7BgD7STTC1F7dVNc/B FXHMu7wpuw+4+unGE5pKAW4qC1hPF1SuAEPjd1gEKjqyj+V5jb4XGyOahaC89mua7N GCtgu3vPqzmreVfJuvDLK0IWn/eoJKxikUWsjjAQx0UcIAjiUm+9uHXnL8CyJam1zD vLMYgvShdYAoA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=owMD2MNb Subject: Re: [Intel-wired-lan] [PATCH net] ice: fix ice_init_link() error return preventing probe X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Fri, Apr 03, 2026 at 01:36:14PM +0100, Simon Horman wrote: > 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") Sorry, one more thing. I don't think this problem pre-dated the cited commit. > > 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 > >