From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 AB23B3B95FA for ; Tue, 15 Sep 2026 12:55:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476936; cv=none; b=O6JIxpVNmbtLjA9U5IQa88IpvPuKtAtQNxKVB1tzQd3TUe6J3I9ta8pW7lMRdhYYnBHTENRnffoacOdZ7hGIzZ2Pe9/Lzvaag64NZDJu1Q2P63sK8ThOrdusfw25w3lBxrespD10vm1BPUG1JWmDLho0XUl6jIPmVqiaJ0uEER4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476936; c=relaxed/simple; bh=kajMgWXZORU5tyZRowiuAqvsW2zmwF2rSCVcQY2ruv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IURsf9vdoS5BHl0XsEvgkVdKZEh4+oO7G+Keh9xrQyZHzMssoH7ChD3jJK03r6lAAbT/GGnJho/9GftdklrwG4X1e8X9P6oHeo4xdW3/2bZhdf/sMzDdU8VNWD0IUjpfyMUEYtIk5xx/QgMbyqK6ZbhDmwqTUXd2CzQcEgPW+5s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JeA+Gta4; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JeA+Gta4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789476935; x=1821012935; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kajMgWXZORU5tyZRowiuAqvsW2zmwF2rSCVcQY2ruv4=; b=JeA+Gta4BvWj+KOgXJy4jsQTy74w/5eiJbfZhsiuGGT61UnA4n2Hfh/1 QKxgta7c0rlQAV1y1DkhxO17aWz7mwgOSuamilW4TjDPVxqm98s3Pe/KA PWouBEuEGT6np6/CR/07VhguSJsjcgKV+EIYw/AHRoqH6vHaTn+ZXxSj8 9/GA+8dGZzyrDwG/N5xWDlc43RGDG1J9JGczSHC5ZUUK+orbiFx52ytoV pf0uFMDh/H5af90kNXqkF1tbVR1OUrPVJD550tVxC5ZhU+z5hLiJ9llFe ckLuevUUlRLmddrd/lCLE98zSBaijl5UFhTLYtw8XDEXpnqbgjrJQceC+ A==; X-CSE-ConnectionGUID: olG4oCvjQeuzsiINghQmvQ== X-CSE-MsgGUID: QtRTzZLtTRGfz3F9dYapfQ== X-IronPort-AV: E=McAfee;i="6800,10657,11905"; a="89853104" X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="89853104" Received: from fmviesa011.fm.intel.com ([10.60.135.151]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2026 05:55:34 -0700 X-CSE-ConnectionGUID: DDkh/OEvQ0G/U81UVf/9UA== X-CSE-MsgGUID: VoPsY+QvSW2Dn5HtJzS23Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="1225183" Received: from amlin-019-225.igk.intel.com ([10.102.19.225]) by fmviesa011.fm.intel.com with ESMTP; 15 Sep 2026 05:55:33 -0700 From: Aleksandr Loktionov To: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, aleksandr.loktionov@intel.com Cc: netdev@vger.kernel.org, Konrad Knitter Subject: [PATCH iwl-net v2 2/3] ice: fix autoneg disable when link partner doesn't support AN Date: Tue, 15 Sep 2026 14:55:28 +0200 Message-ID: <20260915125529.3975723-3-aleksandr.loktionov@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260915125529.3975723-1-aleksandr.loktionov@intel.com> References: <20260915125529.3975723-1-aleksandr.loktionov@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Konrad Knitter Disabling autonegotiation was silently ignored when autoneg had not yet completed (ICE_AQ_AN_COMPLETED was not set), leaving the configuration unchanged with no error. This could prevent link from forming if the link partner requires non-autoneg mode. Extend the condition to also allow disabling autoneg when the link partner reports no AN ability (ICE_AQ_LP_AN_ABILITY clear). Gate the ICE_AQ_LP_AN_ABILITY check on the link being up so that stale or zeroed an_info when link is down does not produce a false positive. Introduce the helper ice_autoneg_disable_allowed() to make the check explicit. Fixes: f1a4a66d2310 ("ice: fix set pause param autoneg check") Signed-off-by: Konrad Knitter Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/ice/ice_ethtool.c | 26 ++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index a257b7d..4ce198f 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -2501,6 +2501,28 @@ ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks) return adv_link_speed; } +/** + * ice_autoneg_disable_allowed - check if autoneg can be disabled + * @p: port info + * + * Check if autonegotiation can be disabled based on link state. + * ICE_AQ_LP_AN_ABILITY is only valid when the link is up; gate that + * check accordingly to avoid false positives from stale link data. + * + * Return: true if autoneg has completed, or if the link is up and the + * link partner does not advertise autonegotiation capability. + */ +static bool ice_autoneg_disable_allowed(struct ice_port_info *p) +{ + u8 an_info = p->phy.link_info.an_info; + + if (an_info & ICE_AQ_AN_COMPLETED) + return true; + /* ICE_AQ_LP_AN_ABILITY is only valid when link is up */ + return (p->phy.link_info.link_info & ICE_AQ_LINK_UP) && + !(an_info & ICE_AQ_LP_AN_ABILITY); +} + /** * ice_setup_autoneg * @p: port info @@ -2539,8 +2561,8 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks, } } } else { - /* If autoneg is currently enabled */ - if (p->phy.link_info.an_info & ICE_AQ_AN_COMPLETED) { + /* If autoneg completed or link partner does not support AN */ + if (ice_autoneg_disable_allowed(p)) { /* If autoneg is supported 10GBASE_T is the only PHY * that can disable it, so otherwise return error */ -- 2.52.0