From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0E5E83F1661; Wed, 20 May 2026 17:44:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299071; cv=none; b=g537YX82tK2bl5F4rQNgYkdkSequr9ZK3U0im3G3kd7fte/JAO3KIuqNAqoWo7AMOWzjA9Rb3+jIGl9qQf000LTfxnMOfVd6F5os1sfjgd5pIRAoLjj072kBz9ukac5spNw7oTmhiiYKo5W2dYPZdxSvKE4miXIxVdQ6KNwKXcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299071; c=relaxed/simple; bh=n7hhxb6d571N31UD2FkpG17Mlu4ghRA2lN/jR3U/bME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UDsJe7pnUEDuFs60yY3+aVB2h6IpRM7oREOE1XHFkZXIsrOOZ1hc2TJd5XCpVV+KB1g6/ohrPP0Ztc2trs8icA8opCBNTlJ5Jr7INGovBmCg+ZfY3K5Qz98HMvYusIUiVEKGT9E5jJ+tGzjHbRldusun3E9xOt78Tswl0E3Zytg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=scH8r1Rp; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="scH8r1Rp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 448B51F000E9; Wed, 20 May 2026 17:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299069; bh=99NwfUpP1g8+vr2FpB5sjFgxgTU4rPHZMfKXGx/GFpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=scH8r1Rpm7qUFcsOQJ3GATcPvIwbg+PvnC+ws7O/wd1LAIX5tIJtakkxwUsAbf/8t 3fZo2d7bYbUGORDHdkjvobMz6Sw5ZP1z1faO4Giz5OgK5eqj2kc/BsW/JoYg285kRN ePZWDIxbsfR1QcnHnvBD0jz1+L1mjALoAZOKVsm0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paul Greenwalt , Aleksandr Loktionov , Simon Horman , Sunitha Mekala , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 650/957] ice: fix ICE_AQ_LINK_SPEED_M for 200G Date: Wed, 20 May 2026 18:18:53 +0200 Message-ID: <20260520162148.626569322@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paul Greenwalt [ Upstream commit 4a3a940059e98539de293a6e36e464094c2e875b ] When setting PHY configuration during driver initialization, 200G link speed is not being advertised even when the PHY is capable. This is because the get PHY capabilities link speed response is being masked by ICE_AQ_LINK_SPEED_M, which does not include the 200G link speed bit. ICE_AQ_LINK_SPEED_200GB is defined as BIT(11), but the mask 0x7FF only covers bits 0-10. Fix ICE_AQ_LINK_SPEED_M to use GENMASK(11, 0) so that it covers all defined link speed bits including 200G. Fixes: 24407a01e57c ("ice: Add 200G speed/phy type use") Signed-off-by: Paul Greenwalt Signed-off-by: Aleksandr Loktionov Reviewed-by: Simon Horman Tested-by: Sunitha Mekala Signed-off-by: Jacob Keller Link: https://patch.msgid.link/20260416-iwl-net-submission-2026-04-14-v2-6-686c33c9828d@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h index 859e9c66f3e7e..3cbb1b0582e32 100644 --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h @@ -1252,7 +1252,7 @@ struct ice_aqc_get_link_status_data { #define ICE_AQ_LINK_PWR_QSFP_CLASS_3 2 #define ICE_AQ_LINK_PWR_QSFP_CLASS_4 3 __le16 link_speed; -#define ICE_AQ_LINK_SPEED_M 0x7FF +#define ICE_AQ_LINK_SPEED_M GENMASK(11, 0) #define ICE_AQ_LINK_SPEED_10MB BIT(0) #define ICE_AQ_LINK_SPEED_100MB BIT(1) #define ICE_AQ_LINK_SPEED_1000MB BIT(2) -- 2.53.0