From nobody Sat Sep 28 09:26:08 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 4XG25F1f2tz5Y2tl; Sat, 28 Sep 2024 09:26:09 +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 4XG25D6xQ8z4rwl; Sat, 28 Sep 2024 09:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727515569; 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=BU0Z5suMuFOunzIzv5Teu4vWkICOGd9VpJcSAQuoKt0=; b=CyBB1IdXiu8mil/EccUQOgjVXfVAIMismqO3weyMrWqFuMYnawDAvn6O8KzL2ZnBWw0lpg YwENV8pMIsgyG1aptJqAVKCCo89mBz2b7WqJtyIBNgwyJ7bq3WT20BJSF2aaltsNllgVL5 PZmynC5um9mFJC53cFGOy04qC/bSJrZFBj/m/A4hrutL2Ne8l8r8qz6kzJ5TlPbQHdsXxE AXLK3EWh7nEJh3RkrAyekdaY7b4LuEQ0I6qwlfWbLBXd2N8JxF34XREJeEhokouEZgTgmZ qizsiR6d9yVGLQ23h5Tm7yW/N+WtVMQsCZ5ahlQ4BGTi282yQ20KRLiAlNjAkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727515569; 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=BU0Z5suMuFOunzIzv5Teu4vWkICOGd9VpJcSAQuoKt0=; b=mFTitbw4tqbbrnn2mnPCuDbclVBDlmcBGSa2Zk0LMmxlak8A1Wy1Z5HgQpzmp+P9fayY8A dIbr49rU66/nso40g2AmaCNiWuUcJE5bt1z3hhCrc4yk3l0jPU3BG/YmvXRRm6hTiaSIYp aMhXku9Oo94+DtyF43ENZklGglUdEVozvj2q9vDXKa0ms1Gbtz1FTheICSbgJhMVT8pJZi HexQb4e6rtcAgXJxq5NA5LCOTDe9dtR2HWi9UU+KtaB1fJLf623YhlxqdW8EPW+to+VOac a4HW0Y/gZEyRi53u9jYyPHHufcRg0qyj4DMf74dkPx6FkDRlFnjPx3wx6b0fow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727515569; a=rsa-sha256; cv=none; b=KXH+f5WbSL5wqOEQlPPj/5AVy7mMFKzsxpFZGdw/kzAjeFvYJY2FHffbkLI/rSeRzb0x3X c2o6dRJscGQ33pBkW8heayTABXCTf2AsjcGDuS7U7CWHmwMfgM1/TOSZVFx2ujzdLwCDdP 0CrhRqCIJHUF1Jz8cTNQF0VSG34f5Kn0GBjPLkiWF9rqZxlGZryKdQYbufaryb7+boGfkn s2XTtW+d9wzajnkk+SqLv7vEtMcV/OE0cORhhfw0Ae4t7ZK5S73uZHMAsjgieBRDRzMD16 e+ejwusqLS/d2Uq1VKsLV+n+/AP1tV0AH2mdjgu7N73ubo7MPpTsgg560nWcew== 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 4XG25D6Mx2zK71; Sat, 28 Sep 2024 09:26:08 +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 48S9Q87L077089; Sat, 28 Sep 2024 09:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S9Q8Fs077086; Sat, 28 Sep 2024 09:26:08 GMT (envelope-from git) Date: Sat, 28 Sep 2024 09:26:08 GMT Message-Id: <202409280926.48S9Q8Fs077086@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: b1dadbcebdfd - stable/13 - ixgbe: update ixgbe_phy with ix-3.3.38 changes 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: b1dadbcebdfd3e711f792f9aa8cbaeb063e1ce91 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b1dadbcebdfd3e711f792f9aa8cbaeb063e1ce91 commit b1dadbcebdfd3e711f792f9aa8cbaeb063e1ce91 Author: Kevin Bowling AuthorDate: 2024-09-21 09:45:12 +0000 Commit: Kevin Bowling CommitDate: 2024-09-28 09:24:44 +0000 ixgbe: update ixgbe_phy with ix-3.3.38 changes (cherry picked from commit e06918b94ac44448272a9d6747dcdba142e18b58) --- sys/dev/ixgbe/ixgbe_phy.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index c2f23179476b..e3f311473c38 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1487,6 +1487,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.type = ixgbe_phy_sfp_intel; break; default: + if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) + hw->phy.type = ixgbe_phy_sfp_passive_unknown; + else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE) + hw->phy.type = ixgbe_phy_sfp_active_unknown; + else hw->phy.type = ixgbe_phy_sfp_unknown; break; } @@ -1495,10 +1500,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) /* Allow any DA cable vendor */ if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE | IXGBE_SFF_DA_ACTIVE_CABLE)) { - if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) - hw->phy.type = ixgbe_phy_sfp_passive_unknown; - else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE) - hw->phy.type = ixgbe_phy_sfp_active_unknown; status = IXGBE_SUCCESS; goto out; }