From nobody Sat Sep 21 09:45:56 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 4X9ksK1ZTzz5Xl9m; Sat, 21 Sep 2024 09:45:57 +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 4X9ksK0jngz4Xsv; Sat, 21 Sep 2024 09:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726911957; 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=OIangeb1Y+finBvu03DzpYJbjKjtr08sq7wVRqz/XOQ=; b=QqZVkNxcRUJAZSW5m3YzlgesZ5LizzCNqn6f2fe8NpHJegjJ45nOLoP2pqBtWFTFfvIXjy MouZMZfVn3bkwRHybagSaemWOXRIqdYZRWPZmpsJaq2yxF6ctgmYunzwqlpwoqlgx7lQvW 32hlVcGhTc3IQstsk5veUdfGRAEqrHZpBnlq81GSvFYDHWeKmEazTfUkbiivoEtfnwmCdb 6WBO63bK3l0fhaOdHT0jh0NArPBRzbTJH5kwqQW1m99sVeu+UDYKdJ/FQAJSN5+aqFFLOv QErM3ABi7cOBFA7S5o4iMVZhykb2HxfaCVV+IutxMwSW8VcsBXj8ESYtgmzNfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726911957; a=rsa-sha256; cv=none; b=TnjbnQjRcRrs2fPs8kuKfcx1pujs+pGiCwuKhlF4iz32t7+qgp3f23ScrhrIP0y0AFz2hS GkLzcvTg5kmXeUN7ZRTnOmgCTYs6PdPApPjnjyMY5ecsZhKw5ZRQHZlBqGzP6Fe3TZl3/Q 24Gc33ETVqj/y1dynH6W4YurpAH4QfEhNKY3jRnpiq+/loNjzyhG861oCEnV3EFKvga5/P ji0CdjbyWUbmLZ9/TnX+/waV0AsWCT5W5YhsqTfD46I7Xmb4d7nB2o7CE2T/Yw2u55BhWi 0KfxSjzUoQPqnJ+4R3ee2knWHw9/B9kkUTc2wLT8Uviz6uIqOrKRKoHZf8PT4w== 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=1726911957; 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=OIangeb1Y+finBvu03DzpYJbjKjtr08sq7wVRqz/XOQ=; b=S76Ja4M0iMQ/zu59nQEy+8lJP9lnxdbp1nFrcS8/6blUppkYr7yd1vI4CRvUiy4I+r7zay 6SzjedIBxgJjj8REMmD9/pOJQH2eoev7UWrci9w9s2x5iG7MlFVPTyWjYBgWUoToH5sNSY 54p7H4vCeS2YHSb6uDFtaWpRWepDvKWnPT8/z67N86fsDNugLz42vL3B7SjrBmrNchiuP5 duNzFz3YJ6zsxWMz2qdRX/FqqKzsoHnkFN4h56uAcwIlZ38D/5w+0X3tStvGXtauenzas5 xA6q66hFWgG+XPA2Bj5wn1ORmHPtKRCo3Koc8/1TC7Ou3nLx857LuO0LrQFOgQ== 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 4X9ksK0KJLzSc7; Sat, 21 Sep 2024 09:45:57 +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 48L9juBh068811; Sat, 21 Sep 2024 09:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48L9ju5a068808; Sat, 21 Sep 2024 09:45:56 GMT (envelope-from git) Date: Sat, 21 Sep 2024 09:45:56 GMT Message-Id: <202409210945.48L9ju5a068808@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: e06918b94ac4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e06918b94ac44448272a9d6747dcdba142e18b58 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e06918b94ac44448272a9d6747dcdba142e18b58 commit e06918b94ac44448272a9d6747dcdba142e18b58 Author: Kevin Bowling AuthorDate: 2024-09-21 09:45:12 +0000 Commit: Kevin Bowling CommitDate: 2024-09-21 09:45:12 +0000 ixgbe: update ixgbe_phy with ix-3.3.38 changes MFC after: 1 week --- 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; }