From nobody Mon Jun 2 17:30:09 2025 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 4bB17j4ys1z5x70G; Mon, 02 Jun 2025 17:30: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 4bB17j4NPKz3sBK; Mon, 02 Jun 2025 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748885409; 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=egWw5f96evml1H3FnPWVsn1Doj5B2vrw0MHfxSC5GR4=; b=pQ8EKKQquYnOL2kK1VAR4As0pdkahjzn7BYSPxtZaZIjD+jZUd0F3O4jgAkPFsvRVqAapS kjBIxF+xJebGGtiPfmDB8rvYFmuziV7jr9oQl5rhpv3Yd8Zwr5exhtTzFFa1jcjqVFda5V Ylr5TogkhWl0eVVp2iCn8Y2OhrJmjGVj+YiPei/gPP8cN4MpLonG8BOW1c3aA2wX53trhN tcNb26GJpBznDD5LzaDP3nORbziVK24MK44qRx1/KYat9Z1Sfct6dWxQB+VBEYZxNH81Dw DNyqor2YRp3xuLLI7EeiWhqEUVnnC1n4CoLXuogtO4Z1Twwj8cmFwb/cSh2/WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748885409; 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=egWw5f96evml1H3FnPWVsn1Doj5B2vrw0MHfxSC5GR4=; b=GlZlvoaCJHLtaTPYYSAoBHvKnCQOknM8zW1qyMvKDwX0GxYaNy9CKEtHxP/zz5gBrQ8HQL s1/KCvq9gkE9Zf5kEH1RoWDaV/Q9ViYnBl7rwfypl6czUSERQW3lvXkHyxjAHcw1Fj0UsS MGILpeWJuqX4od3q4LTMMSDc0ymWYxnkKqnkkmJcEM9D0QQ5SesphE4tsbORJx3GvO2DBh N0xMeW6qElDDs83BkP7o7mMTksW4+m5BUg+1sEqoVKM0wKmLxffhYUcnS/Iic1GxQephGj 0k/3c4S7X/IsEYKuaga6ZsUc98u4Mzyo10MkQwc3pYi0fs8veZWoazX/tztJ3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748885409; a=rsa-sha256; cv=none; b=p0/GNs2f3fTG8homGfjBvPWieC55aSGbT8wpwCeBxCzjzDFll/3/H2wOGHsNdk395N2Y+Z MAyMWdlEG/20+Y1LUbnZoiTJDJlzn9HkdP/buIg00II5/Y3E1cia5BEFXM8klpg6Gcvu6O 7D7+5NtpzdkmfnsDUuGylsHuuoJmOLow5nFqkTSxB2oCTqeVpigHYvJGlZa/sL0s/TsR4z 0g0IYbCWO8VxcyYdmdzdEMIIBDbsYkrj2/MeWPYfacpLgxCXlCEhwOa2eCK7Be3z6fCBIo 3cN/ycvqjqcRc+JvhYul/39Bl+AzEI1H9QxJ29NAJgFuYuyPYpAh6wqMNc80dQ== 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 4bB17j3mxNz1HTG; Mon, 02 Jun 2025 17:30:09 +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 552HU9x1071730; Mon, 2 Jun 2025 17:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 552HU9jU071725; Mon, 2 Jun 2025 17:30:09 GMT (envelope-from git) Date: Mon, 2 Jun 2025 17:30:09 GMT Message-Id: <202506021730.552HU9jU071725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 0fed8828c95a - main - ice(4): Update E830-XXV device ids 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f commit 0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f Author: Krzysztof Galazka AuthorDate: 2025-06-02 17:19:21 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-02 17:19:47 +0000 ice(4): Update E830-XXV device ids Device ID for E830-XXV adapters was changed from 12D3 to 12DE. Update driver accordingly and bump version number. Also remove subdevice id for E830-XXV-4 for OCP 3.0, which was cancelled. Signed-off-by: Krzysztof Galazka Approved by: kbowling (mentor), erj (mentor) Tested by: Gowthamkumar K S MFC after: 1 week Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D50327 --- sys/dev/ice/ice_devids.h | 2 +- sys/dev/ice/ice_drv_info.h | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/sys/dev/ice/ice_devids.h b/sys/dev/ice/ice_devids.h index 9b142a1110b2..3f91e9dfbcaf 100644 --- a/sys/dev/ice/ice_devids.h +++ b/sys/dev/ice/ice_devids.h @@ -61,7 +61,7 @@ /* Intel(R) Ethernet Controller E830-C for SFP */ #define ICE_DEV_ID_E830C_SFP 0x12DA /* Intel(R) Ethernet Controller E830-L for SFP */ -#define ICE_DEV_ID_E830_L_SFP 0x12DE +#define ICE_DEV_ID_E830_L_SFP 0x12DE /* Intel(R) Ethernet Controller E810-C for backplane */ #define ICE_DEV_ID_E810C_BACKPLANE 0x1591 /* Intel(R) Ethernet Controller E810-C for QSFP */ diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 80b517bb5b08..2a51a7394424 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -62,16 +62,16 @@ * @var ice_rc_version * @brief driver release candidate version number */ -const char ice_driver_version[] = "1.43.2-k"; +const char ice_driver_version[] = "1.43.3-k"; const uint8_t ice_major_version = 1; const uint8_t ice_minor_version = 43; -const uint8_t ice_patch_version = 2; +const uint8_t ice_patch_version = 3; const uint8_t ice_rc_version = 0; #define PVIDV(vendor, devid, name) \ - PVID(vendor, devid, name " - 1.43.2-k") + PVID(vendor, devid, name " - 1.43.3-k") #define PVIDV_OEM(vendor, devid, svid, sdevid, revid, name) \ - PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.43.2-k") + PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.43.3-k") /** * @var ice_vendor_info_array @@ -200,17 +200,6 @@ static const pci_vendor_info_t ice_vendor_info_array[] = { "Intel(R) Ethernet Network Adapter E830-CC-Q1 for OCP 3.0"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_QSFP56, "Intel(R) Ethernet Connection E830-CC for QSFP56"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_SFP, - ICE_INTEL_VENDOR_ID, 0x0001, 0, - "Intel(R) Ethernet Network Adapter E830-XXV-2 for OCP 3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_SFP, - ICE_INTEL_VENDOR_ID, 0x0003, 0, - "Intel(R) Ethernet Network Adapter E830-XXV-2"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_SFP, - ICE_INTEL_VENDOR_ID, 0x0004, 0, - "Intel(R) Ethernet Network Adapter E830-XXV-4 for OCP 3.0"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_SFP, - "Intel(R) Ethernet Connection E830-CC for SFP"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830C_BACKPLANE, "Intel(R) Ethernet Connection E830-C for backplane"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830C_QSFP, @@ -221,6 +210,12 @@ static const pci_vendor_info_t ice_vendor_info_array[] = { "Intel(R) Ethernet Connection E830-L for backplane"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_L_QSFP, "Intel(R) Ethernet Connection E830-L for QSFP"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_L_SFP, + ICE_INTEL_VENDOR_ID, 0x0001, 0, + "Intel(R) Ethernet Network Adapter E830-XXV-2 for OCP 3.0"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_L_SFP, + ICE_INTEL_VENDOR_ID, 0x0003, 0, + "Intel(R) Ethernet Network Adapter E830-XXV-2"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E830_L_SFP, "Intel(R) Ethernet Connection E830-L for SFP"), PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_BACKPLANE,