git: 0fed8828c95a - main - ice(4): Update E830-XXV device ids

The branch main has been updated by kgalazka:

URL: https://cgit.FreeBSD.org/src/commit/?id=0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f

commit 0fed8828c95a9d2cbcb43147ff851ca6f2c21d0f
Author:     Krzysztof Galazka <kgalazka@FreeBSD.org>
AuthorDate: 2025-06-02 17:19:21 +0000
Commit:     Krzysztof Galazka <kgalazka@FreeBSD.org>
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 <krzysztof.galazka@intel.com>
    
    Approved by:    kbowling (mentor), erj (mentor)
    Tested by:      Gowthamkumar K S <gowtham.kumar.ks@intel.com>
    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,