git: 77b70ad751df - main - e1000: Move I219 LM19/V19 to ADL

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=77b70ad751dfe3b115112252a5b96f504fcc2e0a

commit 77b70ad751dfe3b115112252a5b96f504fcc2e0a
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2024-10-24 03:31:17 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-10-24 03:31:17 +0000

    e1000: Move I219 LM19/V19 to ADL
    
    This roughly corresponds to Linux 9d9e5347b035412daa844f884b94a05bac94f864
    
    For FreeBSD this is currently not expected to cause any difference in
    behavior because we do not have the MTP force smbus changes for modern
    standby.
    
    MFC after:      3 days
    Sponsored by:   BBOX.io
---
 sys/dev/e1000/e1000_api.c | 4 ++--
 sys/dev/e1000/e1000_hw.h  | 4 ++--
 sys/dev/e1000/if_em.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c
index cace8e563331..6c6cb999f29f 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -338,6 +338,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_PCH_ADL_I219_V16:
 	case E1000_DEV_ID_PCH_ADL_I219_LM17:
 	case E1000_DEV_ID_PCH_ADL_I219_V17:
+	case E1000_DEV_ID_PCH_ADL_I219_LM19:
+	case E1000_DEV_ID_PCH_ADL_I219_V19:
 	case E1000_DEV_ID_PCH_RPL_I219_LM22:
 	case E1000_DEV_ID_PCH_RPL_I219_V22:
 	case E1000_DEV_ID_PCH_RPL_I219_LM23:
@@ -346,8 +348,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 		break;
 	case E1000_DEV_ID_PCH_MTP_I219_LM18:
 	case E1000_DEV_ID_PCH_MTP_I219_V18:
-	case E1000_DEV_ID_PCH_MTP_I219_LM19:
-	case E1000_DEV_ID_PCH_MTP_I219_V19:
 	case E1000_DEV_ID_PCH_LNL_I219_LM20:
 	case E1000_DEV_ID_PCH_LNL_I219_V20:
 	case E1000_DEV_ID_PCH_LNL_I219_LM21:
diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h
index f17877f3e463..b4a9592cd89b 100644
--- a/sys/dev/e1000/e1000_hw.h
+++ b/sys/dev/e1000/e1000_hw.h
@@ -172,8 +172,8 @@ struct e1000_hw;
 #define E1000_DEV_ID_PCH_ADL_I219_V17		0x1A1D
 #define E1000_DEV_ID_PCH_MTP_I219_LM18		0x550A
 #define E1000_DEV_ID_PCH_MTP_I219_V18		0x550B
-#define E1000_DEV_ID_PCH_MTP_I219_LM19		0x550C
-#define E1000_DEV_ID_PCH_MTP_I219_V19		0x550D
+#define E1000_DEV_ID_PCH_ADL_I219_LM19		0x550C
+#define E1000_DEV_ID_PCH_ADL_I219_V19		0x550D
 #define E1000_DEV_ID_PCH_LNL_I219_LM20		0x550E
 #define E1000_DEV_ID_PCH_LNL_I219_V20		0x550F
 #define E1000_DEV_ID_PCH_LNL_I219_LM21		0x5510
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 22578a3d8655..0b99f1b06130 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -193,8 +193,8 @@ static const pci_vendor_info_t em_vendor_info_array[] =
 	PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V17, "Intel(R) I219-V ADL(17)"),
 	PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM18, "Intel(R) I219-LM MTP(18)"),
 	PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V18, "Intel(R) I219-V MTP(18)"),
-	PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM19, "Intel(R) I219-LM MTP(19)"),
-	PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V19, "Intel(R) I219-V MTP(19)"),
+	PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_LM19, "Intel(R) I219-LM ADL(19)"),
+	PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V19, "Intel(R) I219-V ADL(19)"),
 	PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM20, "Intel(R) I219-LM LNL(20)"),
 	PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V20, "Intel(R) I219-V LNL(20)"),
 	PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM21, "Intel(R) I219-LM LNL(21)"),