sync with OpenBSD -current
This commit is contained in:
parent
02d83d01a6
commit
005bcb25db
GPG key ID:
F42C07F07E2E35B7
29 changed files with 312 additions and 230 deletions
|
|
@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
***************************************************************************/
|
||||
|
||||
/* $OpenBSD: if_em.c,v 1.367 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_em.c,v 1.368 2023/12/03 00:19:25 jsg Exp $ */
|
||||
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
|
||||
|
||||
#include <dev/pci/if_em.h>
|
||||
|
|
@ -168,6 +168,11 @@ const struct pci_matchid em_devices[] = {
|
|||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM17 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM18 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM19 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM20 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM21 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM22 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM23 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM24 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 },
|
||||
|
|
@ -186,6 +191,11 @@ const struct pci_matchid em_devices[] = {
|
|||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V17 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V18 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V20 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V21 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V22 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V23 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V24 },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER },
|
||||
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES },
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
*******************************************************************************/
|
||||
|
||||
/* $OpenBSD: if_em_hw.c,v 1.118 2023/09/05 13:06:42 naddy Exp $ */
|
||||
/* $OpenBSD: if_em_hw.c,v 1.119 2023/12/03 00:19:25 jsg Exp $ */
|
||||
/*
|
||||
* if_em_hw.c Shared functions for accessing and configuring the MAC
|
||||
*/
|
||||
|
|
@ -660,11 +660,23 @@ em_set_mac_type(struct em_hw *hw)
|
|||
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_RPL_I219_LM22:
|
||||
case E1000_DEV_ID_PCH_RPL_I219_V22:
|
||||
case E1000_DEV_ID_PCH_RPL_I219_LM23:
|
||||
case E1000_DEV_ID_PCH_RPL_I219_V23:
|
||||
hw->mac_type = em_pch_adp;
|
||||
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:
|
||||
hw->mac_type = em_pch_adp;
|
||||
case E1000_DEV_ID_PCH_LNP_I219_LM20:
|
||||
case E1000_DEV_ID_PCH_LNP_I219_V20:
|
||||
case E1000_DEV_ID_PCH_LNP_I219_LM21:
|
||||
case E1000_DEV_ID_PCH_LNP_I219_V21:
|
||||
case E1000_DEV_ID_PCH_ARL_I219_LM24:
|
||||
case E1000_DEV_ID_PCH_ARL_I219_V24:
|
||||
hw->mac_type = em_pch_adp; /* pch_mtp */
|
||||
break;
|
||||
case E1000_DEV_ID_EP80579_LAN_1:
|
||||
hw->mac_type = em_icp_xxxx;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
*******************************************************************************/
|
||||
|
||||
/* $OpenBSD: if_em_hw.h,v 1.89 2023/09/05 13:06:43 naddy Exp $ */
|
||||
/* $OpenBSD: if_em_hw.h,v 1.90 2023/12/03 00:19:25 jsg Exp $ */
|
||||
/* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
|
||||
|
||||
/* if_em_hw.h
|
||||
|
|
@ -605,6 +605,16 @@ uint32_t em_translate_82542_register(uint32_t);
|
|||
#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_LNP_I219_LM20 0x550E
|
||||
#define E1000_DEV_ID_PCH_LNP_I219_V20 0x550F
|
||||
#define E1000_DEV_ID_PCH_LNP_I219_LM21 0x5510
|
||||
#define E1000_DEV_ID_PCH_LNP_I219_V21 0x5511
|
||||
#define E1000_DEV_ID_PCH_RPL_I219_LM22 0x0DC7
|
||||
#define E1000_DEV_ID_PCH_RPL_I219_V22 0x0DC8
|
||||
#define E1000_DEV_ID_PCH_RPL_I219_LM23 0x0DC5
|
||||
#define E1000_DEV_ID_PCH_RPL_I219_V23 0x0DC6
|
||||
#define E1000_DEV_ID_PCH_ARL_I219_LM24 0x57A0
|
||||
#define E1000_DEV_ID_PCH_ARL_I219_V24 0x57A1
|
||||
#define E1000_DEV_ID_82575EB_PT 0x10A7
|
||||
#define E1000_DEV_ID_82575EB_PF 0x10A9
|
||||
#define E1000_DEV_ID_82575GB_QP 0x10D6
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2059 2023/12/01 05:48:39 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2060 2023/12/03 00:14:53 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -3759,6 +3759,10 @@ product INTEL I219_V10 0x0d4f I219-V
|
|||
product INTEL I219_LM12 0x0d53 I219-LM
|
||||
product INTEL I219_V12 0x0d55 I219-V
|
||||
product INTEL I225_IT 0x0d9f I225-IT
|
||||
product INTEL I219_LM23 0x0dc5 I219-LM
|
||||
product INTEL I219_V23 0x0dc6 I219-V
|
||||
product INTEL I219_LM22 0x0dc7 I219-LM
|
||||
product INTEL I219_V22 0x0dc8 I219-V
|
||||
product INTEL E5V2_HB 0x0e00 E5 v2 Host
|
||||
product INTEL E5V2_PCIE_1 0x0e01 E5 v2 PCIE
|
||||
product INTEL E5V2_PCIE_2 0x0e02 E5 v2 PCIE
|
||||
|
|
@ -5990,6 +5994,10 @@ product INTEL I219_LM18 0x550a I219-LM
|
|||
product INTEL I219_V18 0x550b I219-V
|
||||
product INTEL I219_LM19 0x550c I219-LM
|
||||
product INTEL I219_V19 0x550d I219-V
|
||||
product INTEL I219_LM20 0x550e I219-LM
|
||||
product INTEL I219_V20 0x550f I219-V
|
||||
product INTEL I219_LM21 0x5510 I219-LM
|
||||
product INTEL I219_V21 0x5511 I219-V
|
||||
product INTEL DG2_G10_1 0x5690 Arc A770M
|
||||
product INTEL DG2_G10_2 0x5691 Arc A730M
|
||||
product INTEL DG2_G10_3 0x5692 Arc A550M
|
||||
|
|
@ -6011,6 +6019,8 @@ product INTEL DG2_G12_5 0x56b2 Graphics
|
|||
product INTEL DG2_G12_6 0x56b3 Graphics
|
||||
product INTEL ATS_M150 0x56c0 Flex 170
|
||||
product INTEL ATS_M75 0x56c1 Flex 140
|
||||
product INTEL I219_LM24 0x57a0 I219-LM
|
||||
product INTEL I219_V24 0x57a1 I219-V
|
||||
product INTEL QEMU_NVME 0x5845 QEMU NVM Express Controller
|
||||
product INTEL KBL_D_GT1 0x5902 HD Graphics 610
|
||||
product INTEL CORE7G_U_HB 0x5904 Core 7G Host
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2059 2023/12/01 05:48:39 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2060 2023/12/03 00:14:53 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -3764,6 +3764,10 @@
|
|||
#define PCI_PRODUCT_INTEL_I219_LM12 0x0d53 /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V12 0x0d55 /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_I225_IT 0x0d9f /* I225-IT */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM23 0x0dc5 /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V23 0x0dc6 /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM22 0x0dc7 /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V22 0x0dc8 /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_E5V2_HB 0x0e00 /* E5 v2 Host */
|
||||
#define PCI_PRODUCT_INTEL_E5V2_PCIE_1 0x0e01 /* E5 v2 PCIE */
|
||||
#define PCI_PRODUCT_INTEL_E5V2_PCIE_2 0x0e02 /* E5 v2 PCIE */
|
||||
|
|
@ -5995,6 +5999,10 @@
|
|||
#define PCI_PRODUCT_INTEL_I219_V18 0x550b /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM19 0x550c /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V19 0x550d /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM20 0x550e /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V20 0x550f /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM21 0x5510 /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V21 0x5511 /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_DG2_G10_1 0x5690 /* Arc A770M */
|
||||
#define PCI_PRODUCT_INTEL_DG2_G10_2 0x5691 /* Arc A730M */
|
||||
#define PCI_PRODUCT_INTEL_DG2_G10_3 0x5692 /* Arc A550M */
|
||||
|
|
@ -6016,6 +6024,8 @@
|
|||
#define PCI_PRODUCT_INTEL_DG2_G12_6 0x56b3 /* Graphics */
|
||||
#define PCI_PRODUCT_INTEL_ATS_M150 0x56c0 /* Flex 170 */
|
||||
#define PCI_PRODUCT_INTEL_ATS_M75 0x56c1 /* Flex 140 */
|
||||
#define PCI_PRODUCT_INTEL_I219_LM24 0x57a0 /* I219-LM */
|
||||
#define PCI_PRODUCT_INTEL_I219_V24 0x57a1 /* I219-V */
|
||||
#define PCI_PRODUCT_INTEL_QEMU_NVME 0x5845 /* QEMU NVM Express Controller */
|
||||
#define PCI_PRODUCT_INTEL_KBL_D_GT1 0x5902 /* HD Graphics 610 */
|
||||
#define PCI_PRODUCT_INTEL_CORE7G_U_HB 0x5904 /* Core 7G Host */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2059 2023/12/01 05:48:39 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2060 2023/12/03 00:14:53 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -12395,6 +12395,22 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I225_IT,
|
||||
"I225-IT",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM23,
|
||||
"I219-LM",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V23,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM22,
|
||||
"I219-LM",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V22,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E5V2_HB,
|
||||
"E5 v2 Host",
|
||||
|
|
@ -21319,6 +21335,22 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM20,
|
||||
"I219-LM",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V20,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM21,
|
||||
"I219-LM",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V21,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G10_1,
|
||||
"Arc A770M",
|
||||
|
|
@ -21403,6 +21435,14 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ATS_M75,
|
||||
"Flex 140",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM24,
|
||||
"I219-LM",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V24,
|
||||
"I219-V",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_QEMU_NVME,
|
||||
"QEMU NVM Express Controller",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue