From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 91998329C66 for ; Fri, 17 Apr 2026 06:30:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776407402; cv=none; b=bNPUmBGgrPbKwX9rNY5ml+xgNwOcV/bd/kTd5FnD0u7xEdl0rFFDVCTMoQGcsxaCkxdEZoaG1/wF/AVNoBgFELG0qtC8ghQRu3GzZUbw3mzbJeAtMpMVuayTtOvSI5dvVZoW2qfQ0tDhQ6dnaGeymvYBHY4LpVqCtNiIFm8tcGo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776407402; c=relaxed/simple; bh=edbHUJHOaA58QasrhNxyc7+ghy9rcKSjYx+XG+RjX4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4ElihFPGdnbCkc9LMwxNmvEEumNEgLMGbrm1xGB+zUlj8qMrNWd1NO1UBBEncfXphhknb0caq30lQcrxGQjGrUS6ViLFch+Y6XnbSXN6tVPYb6GPvRnMw7dCCXkKqNnM55bX/edsoM5dMqzI1dJ5/aiy+WON1XbRtyud6G5qdY= 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=hQToS5VT; arc=none smtp.client-ip=192.198.163.8 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="hQToS5VT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776407400; x=1807943400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=edbHUJHOaA58QasrhNxyc7+ghy9rcKSjYx+XG+RjX4w=; b=hQToS5VT11hTfTNul6njittgyjS3Xpar+CnhBKSMQ2Nxvvj8xruObX8F f0ffyjAS/ukLNjTGA7O+cZ5hjbGrhrRhY46znRkPYZqa3zeWCMX2/lnaG SRwjjZTClFiwQlz9JsadpKYC7GcJr+cR4ZPEHCK8Ivi3EHoAj+6wygdRr FSM84LWefREfan9I+GvvpHLvkVkKWFQyMy4unUJNhkV/WVxim/BU/QhjC iQA3dv6xeHqxQFeGnDVcn4/unCLzYRgpq9sVQydXecEeVXvK5X1wNNrK0 m/rxqNhD09Kd1IorfSOPmtVBt/iwLmUYzOSGcoVbEUABbEM03WiqFQMaV Q==; X-CSE-ConnectionGUID: w8Eqh5lISSGPay+lZI+mCw== X-CSE-MsgGUID: zyZYlB/tRyigU2PU1ihHiw== X-IronPort-AV: E=McAfee;i="6800,10657,11761"; a="94987402" X-IronPort-AV: E=Sophos;i="6.23,183,1770624000"; d="scan'208";a="94987402" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2026 23:30:00 -0700 X-CSE-ConnectionGUID: JJmhOj7/RSKCkBkovQMohw== X-CSE-MsgGUID: 9fOiDqdaTaKO+Dwy6EXiyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,183,1770624000"; d="scan'208";a="235329569" Received: from amlin-019-225.igk.intel.com ([10.102.19.225]) by orviesa004.jf.intel.com with ESMTP; 16 Apr 2026 23:29:59 -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 2/4] ice: fix autoneg disable when link partner doesn't support AN Date: Fri, 17 Apr 2026 08:29:52 +0200 Message-ID: <20260417062954.1241900-3-aleksandr.loktionov@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260417062954.1241900-1-aleksandr.loktionov@intel.com> References: <20260417062954.1241900-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 30d2550..e41fc8d 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -2509,6 +2509,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 @@ -2547,8 +2569,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