From nobody Wed Jun 11 19:14:03 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 4bHb1S1CnGz5yLSV; Wed, 11 Jun 2025 19:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHb1S0T97z3wMG; Wed, 11 Jun 2025 19:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749669244; 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=LsltqLVUtvp/PRloDn7ayPUpUDwlEHpSjyLHiZSiR6M=; b=CnPpMjApY2+y9NVvuuoQX0M6mHe/k1hhOykkaWkHfX3mrm+/ld8EfKE141eWwKVOmskLoB +T+WvsBr6uFu20vcIhOz1RjhJuQLhWtRYMDI5vCgFkrIINyQMkoQ2aJ+uZihv0/EoPdKrt L5e45vcJLo7FHEAzO/zqdkYdada5bR0nvV76iihieJiw3N8cUy6QiqjUta+/xBRRJIg4iL ZubLvgHtVI2bpvgyObdFC2VVxtg5JTmRw0+bmng3LfJ6+TsQuzfmWPSNqkp0pOx9FNKkcz k98dB0ARAawUBoXYJOS4jJHve6kfQ8c6dOYJmPWHUl1zMkRIN1mVTaPBjZVgMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749669244; 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=LsltqLVUtvp/PRloDn7ayPUpUDwlEHpSjyLHiZSiR6M=; b=b3hY5AiGh5r2WcsNTIpsHWUeiD9ObgkGwt4FfPzrFcJVKTNoRgW/9pjdz5FXn94E/5yDrP FXsGzKDBlfLW58uI4aJk3TvJqNTaLa/z6mfmXvoGmHqGQlzb+oSbLs1/MWFeFx6cOL+iiG d0yfFBDVMkvuUj6ObLTaVdB40ffqGhjjNPBloDSI0ER9FUAOXaQRSbEdX3zPue6PBncLsw ySeT0o4FwT4wFix3dZnRuqKHy4DDYe13Jn6EwM1mXUlbRd49WHt8hgTi/qBqZC9H0IVSml 2KbU3pIs+wQm2SbaWXCe4ihOSKbpwmQBD2hwrfrqXvlkvyyZFV1Og/29juoI8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749669244; a=rsa-sha256; cv=none; b=SGqyYUNeeB7ufm2AeA1tCIP9lcUvp5iOQTvYFk3G3hypf7C666X7B5s2mXbQ66jv0SKFVd X5Nam2SNvh9bUZRWD/JA4GNMETFcitoslPAlVbEDg8I7gR9SIIpEEGjqWtmrJ8iHb/Ff61 OZZJQaG5132w6FZzWlUoXGC9cAFLswEGEhhvk6IvC7TfgA8ryuhg/hK8yuFeBnnaWTFiZ4 hFS79BAvWZr+Fv8WVKfhqX3jWi/0Hg6PGGRHcQy/zCXPxvCNc45ZrPdpM1gc5gdoMxfHFX ED317WTTlxLcdeJdPqbS+SyUsfXZqbNF4mUxjlPFO8r7OSVNGnQCBkKBlFMc3g== 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 4bHb1S02sGzg4G; Wed, 11 Jun 2025 19:14: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 55BJE3UJ095819; Wed, 11 Jun 2025 19:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55BJE37M095816; Wed, 11 Jun 2025 19:14:03 GMT (envelope-from git) Date: Wed, 11 Jun 2025 19:14:03 GMT Message-Id: <202506111914.55BJE37M095816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: 5dbdbff46b08 - stable/14 - ice(4): Update E830-XXV device ids 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5dbdbff46b08277e79e73c713c4706c56148ca5b Auto-Submitted: auto-generated The branch stable/14 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=5dbdbff46b08277e79e73c713c4706c56148ca5b commit 5dbdbff46b08277e79e73c713c4706c56148ca5b Author: Krzysztof Galazka AuthorDate: 2025-06-02 17:19:21 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-11 19:12:46 +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 Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D50327 (cherry picked from commit 0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f) --- 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,