em/emx: Add support for I219 LM15~19 and I219 V15~19

Obtained-from: e1000e

diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 47ed4e8..c1af559 100644 (file)
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -269,6 +269,16 @@ static const struct em_vendor_info em_vendor_info_array[] = {
        EM_EMX_DEVICE(PCH_TGP_I219_V13),
        EM_EMX_DEVICE(PCH_TGP_I219_LM14),
        EM_EMX_DEVICE(PCH_TGP_I219_V14),
+       EM_EMX_DEVICE(PCH_TGP_I219_LM15),
+       EM_EMX_DEVICE(PCH_TGP_I219_V15),
+       EM_EMX_DEVICE(PCH_ADP_I219_LM16),
+       EM_EMX_DEVICE(PCH_ADP_I219_V16),
+       EM_EMX_DEVICE(PCH_ADP_I219_LM17),
+       EM_EMX_DEVICE(PCH_ADP_I219_V17),
+       EM_EMX_DEVICE(PCH_MTP_I219_LM18),
+       EM_EMX_DEVICE(PCH_MTP_I219_V18),
+       EM_EMX_DEVICE(PCH_MTP_I219_LM19),
+       EM_EMX_DEVICE(PCH_MTP_I219_V19),
 
        /* required last entry */
        EM_DEVICE_NULL

diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c
index c93c571..884f258 100644 (file)
--- a/sys/dev/netif/emx/if_emx.c
+++ b/sys/dev/netif/emx/if_emx.c
@@ -198,6 +198,16 @@ static const struct emx_device {
        EMX_DEVICE(PCH_TGP_I219_V13),
        EMX_DEVICE(PCH_TGP_I219_LM14),
        EMX_DEVICE(PCH_TGP_I219_V14),
+       EMX_DEVICE(PCH_TGP_I219_LM15),
+       EMX_DEVICE(PCH_TGP_I219_V15),
+       EMX_DEVICE(PCH_ADP_I219_LM16),
+       EMX_DEVICE(PCH_ADP_I219_V16),
+       EMX_DEVICE(PCH_ADP_I219_LM17),
+       EMX_DEVICE(PCH_ADP_I219_V17),
+       EMX_DEVICE(PCH_MTP_I219_LM18),
+       EMX_DEVICE(PCH_MTP_I219_V18),
+       EMX_DEVICE(PCH_MTP_I219_LM19),
+       EMX_DEVICE(PCH_MTP_I219_V19),
 
        /* required last entry */
        EMX_DEVICE_NULL

diff --git a/sys/dev/netif/ig_hal/e1000_api.c b/sys/dev/netif/ig_hal/e1000_api.c
index 9f35b6c..a381ebc 100644 (file)
--- a/sys/dev/netif/ig_hal/e1000_api.c
+++ b/sys/dev/netif/ig_hal/e1000_api.c
@@ -329,6 +329,16 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
        case E1000_DEV_ID_PCH_TGP_I219_V13:
        case E1000_DEV_ID_PCH_TGP_I219_LM14:
        case E1000_DEV_ID_PCH_TGP_I219_V14:
+       case E1000_DEV_ID_PCH_TGP_I219_LM15:
+       case E1000_DEV_ID_PCH_TGP_I219_V15:
+       case E1000_DEV_ID_PCH_ADP_I219_LM16:
+       case E1000_DEV_ID_PCH_ADP_I219_V16:
+       case E1000_DEV_ID_PCH_ADP_I219_LM17:
+       case E1000_DEV_ID_PCH_ADP_I219_V17:
+       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:
                mac->type = e1000_pch_cnp;
                break;
        case E1000_DEV_ID_82575EB_COPPER:

diff --git a/sys/dev/netif/ig_hal/e1000_hw.h b/sys/dev/netif/ig_hal/e1000_hw.h
index c9efbd9..3b865d7 100644 (file)
--- a/sys/dev/netif/ig_hal/e1000_hw.h
+++ b/sys/dev/netif/ig_hal/e1000_hw.h
@@ -165,6 +165,16 @@ struct e1000_hw;
 #define E1000_DEV_ID_PCH_TGP_I219_V13          0x15FC
 #define E1000_DEV_ID_PCH_TGP_I219_LM14         0x15F9
 #define E1000_DEV_ID_PCH_TGP_I219_V14          0x15FA
+#define E1000_DEV_ID_PCH_TGP_I219_LM15         0x15F4
+#define E1000_DEV_ID_PCH_TGP_I219_V15          0x15F5
+#define E1000_DEV_ID_PCH_ADP_I219_LM16         0x1A1E
+#define E1000_DEV_ID_PCH_ADP_I219_V16          0x1A1F
+#define E1000_DEV_ID_PCH_ADP_I219_LM17         0x1A1C
+#define E1000_DEV_ID_PCH_ADP_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_82576                     0x10C9
 #define E1000_DEV_ID_82576_FIBER               0x10E6
 #define E1000_DEV_ID_82576_SERDES              0x10E7