From nobody Thu Nov 21 05:53:25 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 4Xv6ps5rGRz5fGys; Thu, 21 Nov 2024 05:53:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xv6ps5HXhz4qyc; Thu, 21 Nov 2024 05:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732168405; 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=JEza1AwwDnixsKXzYIzcnO9DmB+C8ImLX9FBuPbnFjA=; b=RLK7w2xoFxvwP5xKz67jCj1PA+XvlrDc51Z+o+9TIk1ydjGGY3wWrFcmCOOgUQcuGvtjGm WsveIQLkDK15FgpJ6AsvU0xOtd2YaCoo7zHqcAS3TrRS13qg4y9+fsvoTThtB25SIIdBzx ZEhIZvUjMYzzgk6K3HpT89WPF7W3H6PfAhatqgZVPV4jHnI0Lezn0I5KTixGDIF/JD2zL/ ejnccX7b7m7UYbFFLwZtb881bYXIrb4km5KbxwjNzcp/df1h+50v6matoQby7yPEyLi0cU PQ5LZ6TaMh+/tkxawt/nDlamzcMcMKAPr0H1Js21jP/64okiV+DbPFy0zersKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732168405; 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=JEza1AwwDnixsKXzYIzcnO9DmB+C8ImLX9FBuPbnFjA=; b=KgT4rPpilK7/stTNY6i+CjYKF0dtLOy6ZrdPJ4Y79tsl/lxwfqG5fga4sOYpRXcp/mdg9n adrQPOaHOOpIRVrrYu7SnxAw8oCgGcO/9sRnZVz2MlrPTV1rk36gVCs+54qECQ/0HsnwU1 bLw4yI2Ka9SPAd0mloY8ZqWEXig57fJAwFCDt+K7c6NkQ/BqziWeSSVczsK3qQ61XdCMLL J6BB3AgUipGIWaQne2nd+bfy5XuJkUR6vjXyJxBAgF0iSOn1uGFlS03TslaEq/B7aD1qZ3 9IqnNHZtUqbLau8D+TKi4SroQjAnZpZKlS8lYEYzChcpUSP9DymugGaTjHtmkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732168405; a=rsa-sha256; cv=none; b=Oi2vkjnANdKGZjyjIwh5BuH70N0CTok4qvmCU4w5c9kfcmOjgavBlwpGEUfhJZRQAtlRHi 1jAJ25Ts4knwNy/qSS+YYb9badlM7Oc9araCR9y1VYAHXE2yf9yvmAUXzob0rHhcpu+qoV vpESzJn0tUIjOkOqdLZebBYpSpzKCSyEkhgax1HRB2T7YCv4/mnr6Fjch+12U9KLhbIL4o rIn8yn9isHK4fV7xd0nop4U8ZEAenhHftcXEpO/P/SlQp6OH6C+ShtdxDPAEJczdUcOFP1 pNMFQYfBtPs+5KzQ0K0+daJWm5HhfTj6u1nB5y3no77eUEo8v8V7wZbWuJFzWg== 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 4Xv6ps4XhzzRg8; Thu, 21 Nov 2024 05:53:25 +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 4AL5rP0I038489; Thu, 21 Nov 2024 05:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL5rPsS038486; Thu, 21 Nov 2024 05:53:25 GMT (envelope-from git) Date: Thu, 21 Nov 2024 05:53:25 GMT Message-Id: <202411210553.4AL5rPsS038486@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: 4de746ee9852 - stable/14 - ixgbe: Add support for 1Gbit DAC links 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/14 X-Git-Reftype: branch X-Git-Commit: 4de746ee98528fb29763cbef72b50c7d2d822b32 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4de746ee98528fb29763cbef72b50c7d2d822b32 commit 4de746ee98528fb29763cbef72b50c7d2d822b32 Author: Kevin Bowling AuthorDate: 2024-11-14 06:33:28 +0000 Commit: Kevin Bowling CommitDate: 2024-11-21 05:53:15 +0000 ixgbe: Add support for 1Gbit DAC links This is a relatively well known trick for the X520 (82599), can be useful for testing and lab settings. It's not an official standard or particularly common but ubiquitous Broadcom switch ASICs deal with it. We'll call it 1000Base-KX because it's SerDes on the passive cable and I don't think it's worth adding another media type for this. Reviewed by: emaste Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D47352 (cherry picked from commit 48ddd1b9f88753c6875566fbb67bc622453e4993) --- sys/dev/ixgbe/if_ix.c | 7 ++++++- sys/dev/ixgbe/ixgbe_82599.c | 11 +++++++++++ sys/dev/ixgbe/ixgbe_phy.c | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 80f288a4ccf0..f8a620295aa4 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1315,9 +1315,11 @@ ixgbe_add_media_types(if_ctx_t ctx) } if (layer & IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU || - layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA) + layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA) { ifmedia_add(sc->media, IFM_ETHER | IFM_10G_TWINAX, 0, NULL); + ifmedia_add(sc->media, IFM_ETHER | IFM_1000_KX, 0, NULL); + } if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR) { ifmedia_add(sc->media, IFM_ETHER | IFM_10G_LR, 0, NULL); @@ -2323,6 +2325,9 @@ ixgbe_if_media_status(if_ctx_t ctx, struct ifmediareq * ifmr) case IXGBE_LINK_SPEED_10GB_FULL: ifmr->ifm_active |= IFM_10G_TWINAX | IFM_FDX; break; + case IXGBE_LINK_SPEED_1GB_FULL: + ifmr->ifm_active |= IFM_1000_KX | IFM_FDX; + break; } if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR) switch (sc->link_speed) { diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index 1ecab83a4e92..b2b40371648b 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -441,6 +441,17 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, goto out; } + if (hw->phy.sfp_type == ixgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_da_cu_core1) { + *speed = IXGBE_LINK_SPEED_10GB_FULL; + *autoneg = true; + + if (hw->phy.multispeed_fiber) + *speed |= IXGBE_LINK_SPEED_1GB_FULL; + + goto out; + } + /* * Determine link capabilities based on the stored value of AUTOC, * which represents EEPROM defaults. If AUTOC value has not diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index da7d16a514d0..218a9dac3b78 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1436,7 +1436,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) && (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) || ((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) && - (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE))) + (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)) || + (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)) hw->phy.multispeed_fiber = true; /* Determine PHY vendor */