From nobody Thu Sep 19 20:34:34 2024 X-Original-To: dev-commits-src-main@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 4X8nLf42qVz5XMjv; Thu, 19 Sep 2024 20:34:34 +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 4X8nLf1nKhz4hTj; Thu, 19 Sep 2024 20:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726778074; 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=vFAd4KKlihW3LXUID9lp7IV5lGXwyY81XqeTS0/3KKM=; b=SgpyWsSpFdCJa9EGB6E7KFLu693tRMKzEfsy1OUMYCxFfM7GVSEHajlQ34PNWzBQFTbeWJ vdyX7fRkqROlDETBPr188FUXF4JFA/DnivpMdHiwSaZ+2kyNZXMA84I2uN4cmfw5OpQYHZ NUrSy2OE6vfBDSzWfLLrw8GdjvRaNslocMutTVOephKxeno0Q8RCvs1fWajqqu8aGSDIvx laWiHSMKOgwJbXK2QIBwaMMNk81JozqyOUpkcJxnUFwK+pyk7lAl4QTreRdtV06As3SDyO feJH76/OBw12wCaD0D4g2DS8r97YAX7BWk+8CIHo/OWVO9K10QgWIpImFihE0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726778074; a=rsa-sha256; cv=none; b=GEcJ1xdRP0QdqiYZ9V99TF7Z//aN9Ja2vVM7+ir3aKg/Eu9OJgr3vLxINbfCDMAJ0RD3Wh ePEOUWVEGakhUYWMTpX7WJ4sNp4scChIu/HwPF3YIHReI5qWKAswIWeqbtm/JvBop4CaoE y3pU4efBw5B+7whi/Kuo9WhVODEpzZZA+eykKdyuNtuAT8998NlMd9RK0bMdev7D5PpWpn lcXy5PdMB9ZG4I9Pqa7H04penvX/RZEYTe4NOqZ6L/nR7wMJFO2IrbRGP66VMbzaebF6JG lqjKdew7wrJLrVBOWv+Q+baevV/5uI+6vBtpM5j/JnTbOzpVRphQZQzMLz0LUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726778074; 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=vFAd4KKlihW3LXUID9lp7IV5lGXwyY81XqeTS0/3KKM=; b=f6+fFgS6w6VG7Vwo5ZVJp8U8DzyPCyWNmd35BJt+aaCfUowfycYO5ULasvi9XCnCcqMCnE B/smO4oDIY7OYajfXvP6PTIkXhZuqN2vexrcpNhwxTdDevJC3Ar1AiM9Rykpq57bcRXoEd XbPMWM2yvoCcmEzrXy5F0urhmcYtk1NqBeiw7dQzFNbpqeLsoGtlDcUCsx52D2GwIZGu6H /mNbp2BpJ4xr2PLNvPF2pkbzZG/xbWMT3auN1lYoWH4CWVwf5hyiY88t+l9H6WdF9CNXpf JgVbdMnxEMqzttc+l39nYB4nS609QBfjQUlDPK9WC8NRkKpMHL9bJFyaL9Qu0g== 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 4X8nLf1PKyzLCC; Thu, 19 Sep 2024 20:34:34 +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 48JKYYHL070429; Thu, 19 Sep 2024 20:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JKYYm9070426; Thu, 19 Sep 2024 20:34:34 GMT (envelope-from git) Date: Thu, 19 Sep 2024 20:34:34 GMT Message-Id: <202409192034.48JKYYm9070426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: ab92cab02633 - main - ixv: fix x550 VF link speed reported List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ab92cab02633580f763a38a329a5b25050bb4fbf Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ab92cab02633580f763a38a329a5b25050bb4fbf commit ab92cab02633580f763a38a329a5b25050bb4fbf Author: Piotr Skajewski AuthorDate: 2024-09-19 20:31:45 +0000 Commit: Kevin Bowling CommitDate: 2024-09-19 20:32:24 +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) MFC after: 1 week --- 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: