From nobody Thu Sep 26 03:33:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XDfMQ47WHz5Y6hQ; Thu, 26 Sep 2024 03:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDfMQ3RLZz4Y6n; Thu, 26 Sep 2024 03:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wijsd+5YsdNVgmK6N0p3nWaxcV4k/fuFxGprmHlSbUI=; b=KjIhcvLd+jRI9lIyAsQs26tUH6pgbxn7bxP9N5LINHyqHxM2Sp6WhX2EUwsLVNmshLPeK6 EZe8iRjkMDamIw8PWbJWbx5oOJL7N/3lkTsTsqWVawKJhzi1LTvH7t6TpxbAw+qes8Zx+P vTCQxCyl+CSm6unvfUZhKUP0RM4FMFwSvqux2rEX3gLDDAafLse6hj/V3XyPGXNZFBbCVA v1LngdFsli0HuMYtoPCV2XCimH8xGpSnPOzUPDUNXAPxccccq1DvnJcMlKeJTy7QkFPOUE h7DPeKxxYZYBVPDqgWlde229nAYI/V2RQf/xrMXlQQ41uSKBPBtEvh1eCeZveg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wijsd+5YsdNVgmK6N0p3nWaxcV4k/fuFxGprmHlSbUI=; b=ZsVOxaVxqSshQTq0Sxsg9sLuk8XJDiN88yF+PH+KtT4RPsFcy9tZBqdQ71tncjxAro2Lie cO2DGA2pmgOUIYoJFOhVVUfZqH1YgVJga1ysdyQf6qLHGT0w8Q4SBXvDsWJzvPxEdWgHCY hIxV1LOF8oJcHVAMbYvp7X86Sq/dzBImjmlik2XwDXQDoBwMTZlN140GS1fn5mp+UnYODI 9X3qLUN24HgJIbWMzHTwcRP5eJBeTJXROogbvY7oFUSwBsOROn+TGgtjjag9tEbNvpoPAz 1UMMGzdd9G/TUcmONb1ZZ5Wb04gskrC4rsD/CHx6g7Wlv7gY4URlWpn/xQ0yCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321618; a=rsa-sha256; cv=none; b=WEvsNpqSUIqKaWboHVDy3aGYlFnTHd5740O6iV3mJHmCYaqZ9wzsNsTxvmw6BKn9eR2xnO TTUuOzMmcuR7P/+tm+78q7Nxvo8V7QXePpjLxGxF522y1ijUigKiFiT9UYPhRq857YpAaK UaOV0OiZ1oVjMvwsiOePpAtzn3zxflju2AJb3PYN79q/EnvNO52/JtN4QJRYOoCKnIb5Zz PVOLiaj8JvfAlSbRW6jxnbJgDYMWcJUrWFkdqxu+pBb/HqzyYGOXamlqavDu/6mAoRjzxJ /kgpKo2/u0g4fS61n8LmcM/euHcDipKz4ZEwd917/ap6I7QpsRMxMLdADs5TYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XDfMQ32nZzgm6; Thu, 26 Sep 2024 03:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48Q3Xc9o099131; Thu, 26 Sep 2024 03:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3XcgH099128; Thu, 26 Sep 2024 03:33:38 GMT (envelope-from git) Date: Thu, 26 Sep 2024 03:33:38 GMT Message-Id: <202409260333.48Q3XcgH099128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 19ec9395b7b3 - stable/13 - ixv: fix x550 VF link speed reported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19ec9395b7b369dbfdd87102ea522ceb44b87895 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=19ec9395b7b369dbfdd87102ea522ceb44b87895 commit 19ec9395b7b369dbfdd87102ea522ceb44b87895 Author: Piotr Skajewski AuthorDate: 2024-09-19 20:31:45 +0000 Commit: Kevin Bowling CommitDate: 2024-09-26 03:32:34 +0000 ixv: fix x550 VF link speed reported DPDK commit message net/ixgbe/base: fix 5G link speed reported on VF When 5000 Base-T was set on PF the VF reported 100 Base-T. This patch changes ixgbe_check_mac_link_vf function where there was an incorrect conditional which checks using PF mac types, now it is correctly using VF mac types. Fixes: 12e2090 ("net/ixgbe/base: include new speeds in VFLINK interpretation") Cc: stable@dpdk.org Signed-off-by: Piotr Skajewski Reviewed-by: Radoslaw Tyl Reviewed-by: Slawomir Mrozowicz Reviewed-by: Alice Michael Obtained from: DPDK (9eb7fdb) (cherry picked from commit ab92cab02633580f763a38a329a5b25050bb4fbf) --- sys/dev/ixgbe/ixgbe_vf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_vf.c b/sys/dev/ixgbe/ixgbe_vf.c index 91df9b7dd1c3..beef259de339 100644 --- a/sys/dev/ixgbe/ixgbe_vf.c +++ b/sys/dev/ixgbe/ixgbe_vf.c @@ -642,7 +642,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, switch (links_reg & IXGBE_LINKS_SPEED_82599) { case IXGBE_LINKS_SPEED_10G_82599: *speed = IXGBE_LINK_SPEED_10GB_FULL; - if (hw->mac.type >= ixgbe_mac_X550) { + if (hw->mac.type >= ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_2_5GB_FULL; } @@ -652,7 +652,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, break; case IXGBE_LINKS_SPEED_100_82599: *speed = IXGBE_LINK_SPEED_100_FULL; - if (hw->mac.type == ixgbe_mac_X550) { + if (hw->mac.type == ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_5GB_FULL; } @@ -660,7 +660,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, case IXGBE_LINKS_SPEED_10_X550EM_A: *speed = IXGBE_LINK_SPEED_UNKNOWN; /* Since Reserved in older MAC's */ - if (hw->mac.type >= ixgbe_mac_X550) + if (hw->mac.type >= ixgbe_mac_X550_vf) *speed = IXGBE_LINK_SPEED_10_FULL; break; default: