From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 7154E4DA9A1 for ; Mon, 19 Oct 2026 10:52:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792407170; cv=none; b=e0FyzoDSZPzm2BjFmpItoF+yv0Wi2mvcZV7EbgO7ij0g9S48J99Q3iAxfGxOhoT+H7kWTlVFhXNpPdce5dot3AI8RSTV8dPKivd1+TgskRe4mRv4gbnNfyuL+BiH3adD0TQx5+FGNdAfWQ7OmXm7dYcaxgmxAjTchZS/m/3ARmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792407170; c=relaxed/simple; bh=21H+oiuRQhr1bTwN5k5fm68vZAo/wIv/vUXUABGcE/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mHkRkNXVjRm2luWbVWLnUUB2taGNzitXfY+M1eL1M9ZLKAazGRvyRXhBYkaRe1liac0KKanNYVkFMw0ADg23PV4D32+Pwqr2dO9c72RnO4F1stUxK6Iqq8yPz+tEDfkrAPvrn0n5Y7hYYMgH+AwrYY8ECD/5RRHZX2WjT4I4BSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b=LjiEw6VQ; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b="LjiEw6VQ" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 7DE483F2DC for ; Mon, 19 Oct 2026 10:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1792407162; bh=FCCK4lukVu46UX8q/+nvsePnhoGpz0IH4czbYBTEba0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LjiEw6VQ38GVAI1qWjT4BFpQcwsd3O4jiuaGVgp5/ZgFqG38qQoiLKb1Dnmz+myCH 7dtIekLq3JlmdT69m3yVG+/qCK3vcf6qp7zVuPZeroLQ7qrWBCzGlQkQ3vMa0YCMg/ lPCyYX3T1JKoW0Bl4hbmlojTgAwTyycL33OivJHpfQ6uBFtAtFnOyCPBFxN/Q9lof3 cfa3KieV8sfklpOSdoHYxRCfxmiCmhrIpYFYBmhs3yhSjjrnuERqnbWB3DRWC5JllP Z4CJCspHJVpnVSZ4AW0WIwZXHPXUfl5kmrQgdWW3xi4RrlP89ZW8dZe2bNVJiSpx2s YMKn28lBu+5nf8Qc2gKL9hXWG/z5hJzJGrfTU1aEPJSx1v2a6LVc7oHbws0XVckh2C HyRtLlslQLaCUNGUqLo60ACk9wUHWKTCGsJxehIlEcvILtNZ2ImkGTne2dcK2VUBIq s5WpTC+h6wmZMTL5/u5nzTVtWkbUcjmbqCLrukGfmQLDDrl9wMU+FtHnQSJtwLE6yx nP7ReKLom7JvKV4eQI/LoRvh1WZk9QQVGTERjd9XCJNXjpDqE9VDv4S5ViLMjoYy1s 5Mj+uXx7OfWZWH8KgyG3+orriTnSejWtSHEgghkG1OXZfLXtIOC3xGO1OyHW36dF4E 8ZtLFKfzKOYlqs5j0j3qAkh8= Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a1bfd5516bso19998095e9.3 for ; Mon, 19 Oct 2026 03:52:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792407162; x=1793011962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FCCK4lukVu46UX8q/+nvsePnhoGpz0IH4czbYBTEba0=; b=UeMAejdnlH0OB6ppmozM1omT5WwAMIXBx3cLU4Kzz5ppJV/Qmq41jNc186TR4Wuctm RrK3KMUETwzql5dEOlM8Gm8KqMeg52i9S4dI40ZViHH3KGAx33wnfVR0z+uevdHcseiV gWFkSQI9XZxffWDxWZ+mgajG9a/mPyR1MgumInCR+vTJwjZU07c6/tkNqQWlJsB+chf5 tumEaH72G93WlpAiUpeb27Qt1fb4vYhrExLcoBMRsH2YypwJT4QvrS4pRhG7Ew0cE7H0 oTONMQzQPf6uL00sCAt5OizfAXQaFgYkFlD6c8FR4qqusYb+9ZP0wzWAwLJ4KdvN3SwP hdSg== X-Forwarded-Encrypted: i=1; AKwUvByY90ioATZRPBwapTZ0DiEYygvqzeJgK7ZUpOJLfweDD3hIQRCXjHdkuZJEEIvFZUYBv0/SBKM=@vger.kernel.org X-Gm-Message-State: AFq9FYIryC2BzLbAHNUAzYI4waHf4wirpzJJoUxgH/LSZ8r/sMBs3QxY ksExLd2WuL5OISIouZXXVR1od7qw/5dQBr42oGZglNJCEoCtdTi0sVHt4JkzlM0a2NPV05zfnqG uKrXdCM9UZc/owdKBe0LfHV2NRUWX2BzcgxnoD4lRrTvtvh55GzODbBxVgB3xsXY6Iq1n+OfFX3 a8Hh6xMHw4 X-Gm-Gg: AYBFou2fjoYuVp/Pdz9Orh0kZxlU+L4uPMNsqKyUanoPPfvrQx/8GaWzJyW6bPBBnI2 IbXQJtiDhGtus70EbaaITMco1fCQqydvi2Ys2WxCpb5vVPhwUfMV22ofhZIvMtSnhE84QBNoWml bq265msnD7xHVGdPi9SFfi4SDmFTRcZy170l9O7sIePcWTBN42lyosKeUrmvM/i4iwjEhf8cxBJ +j+WzdVbrRzDYeCvHv13BSjzSyGjg7R0iX1thuvT8wS1ItozszvqTyTtp4YS556OgOdrV/AJz4l /Y/G8Y/G3CiJLGV/43oEWTcPH/G1hyxiiqLdh8HhU3J6Tx25O3OdVBXwz2uZcXzNLIyEyt75EHu G424QJbiq6i5tKOTWj6h/adSJMTauiYKKfDVV3kfAW2g3l+naoo+WInJHthzz/+ThEHeCNvOIKR CeEMNay3LodfxbnK3LW5NBEeEC71bA5/yWDN7iQdTl8WcWfNH3vFHbDGHsNz6vNUF+47hSIi7El 1YLyxvzg5lzvZr3K8mjDl37uL+IGnh96CsKQx5/ X-Received: by 2002:a05:600c:b99:b0:49d:10d6:fd55 with SMTP id 5b1f17b1804b1-4a1d75a9828mr140136025e9.1.1792407161988; Mon, 19 Oct 2026 03:52:41 -0700 (PDT) X-Received: by 2002:a05:600c:b99:b0:49d:10d6:fd55 with SMTP id 5b1f17b1804b1-4a1d75a9828mr140135825e9.1.1792407161618; Mon, 19 Oct 2026 03:52:41 -0700 (PDT) Received: from u-ThinkPad-X1-Extreme-Gen-4i ([103.155.100.4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48dfd510201sm23238930f8f.55.2026.10.19.03.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2026 03:52:40 -0700 (PDT) From: Aaron Ma To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexander Lobakin , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dan Nowlin , Brett Creeley , Jacob Keller , intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS) Subject: [PATCH 1/5] ice: check the full PF reset polling limit Date: Mon, 19 Oct 2026 18:51:51 +0800 Message-ID: <20261019105155.3793063-2-aaron.ma@canonical.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261019105155.3793063-1-aaron.ma@canonical.com> References: <20261019105155.3793063-1-aaron.ma@canonical.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The PF reset polling loop includes the Global Configuration Lock timeout in addition to the normal PF reset wait. Its timeout check still compares the iteration count against only the normal PF reset wait. Consequently, exhausting the extended loop reports success while PFSWR is still set. A reset completing exactly at the old limit can instead report a false failure. Subsequent initialization must not proceed on the assumption that an unfinished reset succeeded. Compare the count against the same bound used by the polling loop. Fixes: c9a12d6d2091 ("ice: Increase timeout after PFR") Signed-off-by: Aaron Ma --- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index 04633103e3e61..82b803e74aac0 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -1291,7 +1291,7 @@ static int ice_pf_reset(struct ice_hw *hw) mdelay(1); } - if (cnt == ICE_PF_RESET_WAIT_COUNT) { + if (cnt == ICE_GLOBAL_CFG_LOCK_TIMEOUT + ICE_PF_RESET_WAIT_COUNT) { ice_debug(hw, ICE_DBG_INIT, "PF reset polling failed to complete.\n"); return -EIO; } -- 2.53.0