From nobody Thu Sep 18 16:18:04 2025 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 4cSLQh5Rhtz67dc1; Thu, 18 Sep 2025 16:18:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQh4pnNz45rC; Thu, 18 Sep 2025 16:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212284; 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=mwkcZWMFVgFWAkHSQsI5O2uPHii/soesOkNutBo1gnU=; b=d4/voGv+DOr8piT90BdpOEzyzPWpjv/T9L09GgmIOjVZswfNE+0dWu6nXcov16kvXfKzqN qAVltNZmxdi44kepIv4efmhIsZLtwMgnx8/JVFMC/wwbLlWE/kOderalyuFnJKAFMZuuzj AUg4ZUtnhgAu1sd9AODBEH/Sopfh6bUOrDjVL0dZjPOpne/En/gBwI0sXDqAM+UcIG8lPy VqvdcOIyF5O1KOwfLbn3EgVco1tRrpuRpJW9/Rqgvk2OP8d5I67FWRpDV9KYxA77QkFSYa 9HQwq+O/ZnXZab1MeavGPUjQzYnVyrGhBlDThh16oriThZVBiEgKouN37swDAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212284; 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=mwkcZWMFVgFWAkHSQsI5O2uPHii/soesOkNutBo1gnU=; b=wAOAaQ6HufZADcFo/7py3+um0VF16IJfSXAdWmbd2sIIvLny+GiysqyYj2eAztK/doYuBA i7coNfZeAIslgQhHJOvVY5+1O8EQ9NrrvDRAn53yzCNB8guGKJ4bnEhoGTIPIM9SLe2mN6 Zl41/3EeiVf0OBYDmDLES8ddIEv39+yZTXrROkZqE7UP5FJgm1bvgHDx5dW39jGZwdxDXW Zl/j3xZvoiD2mVmeIHkDj7e9lI9Gq9XIu5atyTIzEj+4WIUga0ab+qdwWH9BAUxHYCxhDi /3QpVcWVYeRtkEhdg8Wk4LtYRafmr0/87srUFwSwakORz7qAVKSVL61Pm329Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212284; a=rsa-sha256; cv=none; b=R+zOk9XuiLPOFKLsN9YF2bQtKO2kv8424ivjx2H2oQ3zS4+ArRdRM0BGw2Eb6SB7YHvvb6 MFOTb91S6zJ4tFdci30GwLtN3ESjgOCyVLdHKW6gDoCGwsTXllY3cs7RtEjG9i5ywBJ4w/ XEdbJerEEVdZON68ujOZNkyCXrVAFMLnTvIqVnTExDYganDrE5znaWnJXPCTJLRYBG7nKd QDepyMqGsVCIxXuO1Yl/yNCU9Ohs2ll9Z+S3WZA+VDP77qetuBeS5a0wYNygm1rfacVVrN MsuwQ2d/KF5U0aJas7/QHkOSCE97WdZDurBV6q26L5bnkz71r+4Tm527wg2vgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSLQh444fz3t5; Thu, 18 Sep 2025 16:18:04 +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 58IGI4wl050827; Thu, 18 Sep 2025 16:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI4JV050824; Thu, 18 Sep 2025 16:18:04 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:04 GMT Message-Id: <202509181618.58IGI4JV050824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5aa49c98edfc - stable/15 - qlnxe: Unconditionally enable extended media types 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 commit 5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 Author: Zhenlei Huang AuthorDate: 2025-09-09 10:04:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:52 +0000 qlnxe: Unconditionally enable extended media types Those extended media types are available since about 2015 [1]. All supported branches already have them defined. No functional change intended. [1] eb7e25b22f1c ifmedia changes: Extend the number of available subtypes for Ethernet media ... Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52374 (cherry picked from commit 08356a733eb7a7bef1afe20ded2d983b55310de7) --- sys/dev/qlnx/qlnxe/qlnx_def.h | 16 ---------------- sys/dev/qlnx/qlnxe/qlnx_os.c | 21 +++++++++------------ 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 4342bba89587..796845f3f8c6 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -696,22 +696,6 @@ extern int qlnx_alloc_mem_sb(qlnx_host_t *ha, struct ecore_sb_info *sb_info, * Some OS specific stuff */ -#if (defined IFM_100G_SR4) -#define QLNX_IFM_100G_SR4 IFM_100G_SR4 -#define QLNX_IFM_100G_LR4 IFM_100G_LR4 -#define QLNX_IFM_100G_CR4 IFM_100G_CR4 -#else -#define QLNX_IFM_100G_SR4 IFM_UNKNOWN -#define QLNX_IFM_100G_LR4 IFM_UNKNOWN -#endif /* #if (defined IFM_100G_SR4) */ - -#if (defined IFM_25G_SR) -#define QLNX_IFM_25G_SR IFM_25G_SR -#define QLNX_IFM_25G_CR IFM_25G_CR -#else -#define QLNX_IFM_25G_SR IFM_UNKNOWN -#define QLNX_IFM_25G_CR IFM_UNKNOWN -#endif /* #if (defined IFM_25G_SR) */ #define QLNX_INC_IERRORS(ifp) if_inc_counter(ifp, IFCOUNTER_IERRORS, 1) #define QLNX_INC_IQDROPS(ifp) if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 4ad190374f87..696604cf1202 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2375,18 +2375,15 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ifmedia_add(&ha->media, (IFM_ETHER | IFM_40G_CR4), 0, NULL); } else if ((device_id == QLOGIC_PCI_DEVICE_ID_1656) || (device_id == QLOGIC_PCI_DEVICE_ID_8070)) { - ifmedia_add(&ha->media, (IFM_ETHER | QLNX_IFM_25G_SR), 0, NULL); - ifmedia_add(&ha->media, (IFM_ETHER | QLNX_IFM_25G_CR), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_25G_SR), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_25G_CR), 0, NULL); } else if (device_id == QLOGIC_PCI_DEVICE_ID_1654) { ifmedia_add(&ha->media, (IFM_ETHER | IFM_50G_KR2), 0, NULL); ifmedia_add(&ha->media, (IFM_ETHER | IFM_50G_CR2), 0, NULL); } else if (device_id == QLOGIC_PCI_DEVICE_ID_1644) { - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_LR4), 0, NULL); - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_SR4), 0, NULL); - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_CR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_LR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_SR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_CR4), 0, NULL); } ifmedia_add(&ha->media, (IFM_ETHER | IFM_FDX), 0, NULL); @@ -3808,11 +3805,11 @@ qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link) case MEDIA_MODULE_FIBER: case MEDIA_UNSPECIFIED: if (if_link->speed == (100 * 1000)) - ifm_type = QLNX_IFM_100G_SR4; + ifm_type = IFM_100G_SR4; else if (if_link->speed == (40 * 1000)) ifm_type = IFM_40G_SR4; else if (if_link->speed == (25 * 1000)) - ifm_type = QLNX_IFM_25G_SR; + ifm_type = IFM_25G_SR; else if (if_link->speed == (10 * 1000)) ifm_type = (IFM_10G_LR | IFM_10G_SR); else if (if_link->speed == (1 * 1000)) @@ -3822,11 +3819,11 @@ qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link) case MEDIA_DA_TWINAX: if (if_link->speed == (100 * 1000)) - ifm_type = QLNX_IFM_100G_CR4; + ifm_type = IFM_100G_CR4; else if (if_link->speed == (40 * 1000)) ifm_type = IFM_40G_CR4; else if (if_link->speed == (25 * 1000)) - ifm_type = QLNX_IFM_25G_CR; + ifm_type = IFM_25G_CR; else if (if_link->speed == (10 * 1000)) ifm_type = IFM_10G_TWINAX;