From nobody Thu Sep 26 03:29:50 2024 X-Original-To: dev-commits-src-branches@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 4XDfH33mDtz5Y6mR; Thu, 26 Sep 2024 03:29:51 +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 4XDfH31WPgz4W9Z; Thu, 26 Sep 2024 03:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321391; 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=aK/4owFrdnAQyLhe2325otgqVY2trPbuwkgYko9zWJc=; b=xRl7k3Mv2R5MBWRxhtyktNHorkAUENDIyvO2L9WXUe9cdSq5UVIOV3PU14hzlCjo4lgPmR g2kBkPAL2iykHh4/6Nwp5DCczGsDNRgXBgvCo1kdkP6dZY6UbkcGaZHQGPrXmkYCUrg4na X/osnWnggBXNTtCHv4djtHnyoHt4dhq0tg4jcygvLB++otn9vCW2xH5M7z7xuZqGxEwbK3 xqoEKKpQKokFaCx2uBxwdnqgDUb6w9SV0yu7GHnfliwHiCxsyOz+5TmtbF3G0aychZvYSE VY3xe7iR2ZaAfrwh/zqRWzQ1Om+20gU1BHPdzDeqGYXeb4sRPSCoeQSkdvhpHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321391; 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=aK/4owFrdnAQyLhe2325otgqVY2trPbuwkgYko9zWJc=; b=IbOKZQDcY+tD+/eYqqbzxmkHXtUyFI34bb3QeHP0MokgH3i9ucrKs35Ecg7fu2zmlj9Iq2 CV53HlimBQ3CZ62LdppAWBKZyYZlm0kCO35RBnA12esR3gXs/ieDgrurqXf7BXB2KICwm4 MKwbOAH3hj+lE1xfJzziYhezw+jm6k9lohqk/TDpIPtF27o6AmmpqF1JW9f/q8h7N2rtmH tynG7VS6WuZ8Z8Hm+1lXxc8NKSsvtrid1BEphP5ronfntPXSQeTmmsfjIfXIsnLPDS0CwI N43E5OkcDoTW63fpUImr04BwvcOfG7YGTkJEZnhJpRb1FjNE3Nn+gJUEfE5Pxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321391; a=rsa-sha256; cv=none; b=KRdABsRNAzNczxx0pCME04HWrlxvZ1QXVVdF75iF67Aw0x8oZqjzkQgmNpDauoCoM+ZB7c c/QVbTjgyFXbKdJfgAoJ7J9s5o4YADove2EFAGehAh3GmR8O+pAWhyRdfcvXgDA+4kFCHT pAPhMwm9AID+svZqjEUvmqJehigI9v9gaL2UGmYFjGbyrByED45KvsTOonfic+rGUKpDGJ 1f9Q/d9/BOwBaFyWYEA2MNn20OkEl1fvhXWqQW/tq0VOv0myarYojahcxzraIOglLxxH1f BJIPUPJTFjZ81afV7QHE7LpXyWKUVYSywTI+mqqsNqsUZ6SAJ1QB17ehbmm5Bw== 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 4XDfH30MLrzgff; Thu, 26 Sep 2024 03:29:51 +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 48Q3TogF082699; Thu, 26 Sep 2024 03:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3ToJN082696; Thu, 26 Sep 2024 03:29:50 GMT (envelope-from git) Date: Thu, 26 Sep 2024 03:29:50 GMT Message-Id: <202409260329.48Q3ToJN082696@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: cced5c203046 - stable/14 - ixv: fix x550 VF link speed reported List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: cced5c203046549221e13eea66565bab1d11bae3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cced5c203046549221e13eea66565bab1d11bae3 commit cced5c203046549221e13eea66565bab1d11bae3 Author: Piotr Skajewski AuthorDate: 2024-09-19 20:31:45 +0000 Commit: Kevin Bowling CommitDate: 2024-09-26 03:28:30 +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: