diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #if defined(__amd64__) || defined(__i386__) @@ -117,7 +118,6 @@ #define CPU_QUIRK_NO_C3 (1<<0) /* C3-type states are not usable. */ #define CPU_QUIRK_NO_BM_CTRL (1<<2) /* No bus mastering control. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEVICE_82371AB_3 0x7113 /* PIIX4 chipset for quirks. */ #define PCI_REVISION_A_STEP 0 #define PCI_REVISION_B_STEP 1 @@ -1301,7 +1301,7 @@ uint32_t val; ACPI_STATUS status; - acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); + acpi_dev = pci_find_device(PCI_VENDOR_INTEL_CORPORATION, PCI_DEVICE_82371AB_3); if (acpi_dev != NULL) { switch (pci_get_revid(acpi_dev)) { /* diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -54,6 +54,8 @@ #include #include +#include + #ifdef DEV_APIC #include "pcib_if.h" #endif @@ -61,7 +63,6 @@ #define HPET_VENDID_AMD 0x4353 #define HPET_VENDID_AMD2 0x1022 #define HPET_VENDID_HYGON 0x1d94 -#define HPET_VENDID_INTEL 0x8086 #define HPET_VENDID_NVIDIA 0x10de #define HPET_VENDID_SW 0x1166 diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c --- a/sys/dev/acpica/acpi_throttle.c +++ b/sys/dev/acpica/acpi_throttle.c @@ -41,6 +41,7 @@ #include #include +#include #include "cpufreq_if.h" @@ -80,7 +81,6 @@ #define CPU_P_CNT_THT_EN (1<<4) #define CPU_QUIRK_NO_THROTTLE (1<<1) /* Throttling is not usable. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEVICE_82371AB_3 0x7113 /* PIIX4 chipset for quirks. */ #define PCI_REVISION_A_STEP 0 #define PCI_REVISION_B_STEP 1 @@ -318,7 +318,7 @@ device_t acpi_dev; /* Look for various quirks of the PIIX4 part. */ - acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); + acpi_dev = pci_find_device(PCI_VENDOR_INTEL_CORPORATION, PCI_DEVICE_82371AB_3); if (acpi_dev) { switch (pci_get_revid(acpi_dev)) { /* diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include "ahci.h" @@ -546,7 +547,7 @@ * here, or the user has to change the mode in the BIOS * from RST to AHCI. */ - if (pci_get_vendor(dev) == 0x8086) { + if (pci_get_vendor(dev) == PCI_VENDOR_INTEL_CORPORATION) { uint32_t vscap; vscap = ATA_INL(ctlr->r_mem, AHCI_VSCAP); diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h --- a/sys/dev/ata/ata-pci.h +++ b/sys/dev/ata/ata-pci.h @@ -145,7 +145,6 @@ #define ATA_HPT371 0x00071103 #define ATA_HPT374 0x00081103 -#define ATA_INTEL_ID 0x8086 #define ATA_I960RM 0x09628086 #define ATA_I82371FB 0x12308086 #define ATA_I82371SB 0x70108086 diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -896,7 +897,7 @@ case ATA_CYRIX_ID: return "Cyrix"; case ATA_CYPRESS_ID: return "Cypress"; case ATA_HIGHPOINT_ID: return "HighPoint"; - case ATA_INTEL_ID: return "Intel"; + case PCI_VENDOR_INTEL_CORPORATION: return "Intel"; case ATA_ITE_ID: return "ITE"; case ATA_JMICRON_ID: return "JMicron"; case ATA_MARVELL_ID: return "Marvell"; diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c --- a/sys/dev/ata/chipsets/ata-intel.c +++ b/sys/dev/ata/chipsets/ata-intel.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -192,7 +193,7 @@ { ATA_IBT_S2, 0, 0, 0, ATA_SA300, "BayTrail" }, { 0, 0, 0, 0, 0, 0}}; - if (pci_get_vendor(dev) != ATA_INTEL_ID) + if (pci_get_vendor(dev) != PCI_VENDOR_INTEL_CORPORATION) return ENXIO; if (!(ctlr->chip = ata_match_chip(dev, ids))) diff --git a/sys/dev/bhnd/bhnd_ids.h b/sys/dev/bhnd/bhnd_ids.h --- a/sys/dev/bhnd/bhnd_ids.h +++ b/sys/dev/bhnd/bhnd_ids.h @@ -72,7 +72,6 @@ #define PCI_VENDOR_3COM 0x10b7 #define PCI_VENDOR_NETGEAR 0x1385 #define PCI_VENDOR_DIAMOND 0x1092 -#define PCI_VENDOR_INTEL 0x8086 #define PCI_VENDOR_DELL 0x1028 #define PCI_VENDOR_HP 0x103c #define PCI_VENDOR_HP_COMPAQ 0x0e11 diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c --- a/sys/dev/cpufreq/ichss.c +++ b/sys/dev/cpufreq/ichss.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -62,7 +63,6 @@ }; /* Supported PCI IDs. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEV_82801BA 0x244c /* ICH2M */ #define PCI_DEV_82801CA 0x248c /* ICH3M */ #define PCI_DEV_82801DB 0x24cc /* ICH4M */ @@ -158,7 +158,7 @@ */ ich_device = pci_find_bsf(0, 0x1f, 0); if (ich_device == NULL || - pci_get_vendor(ich_device) != PCI_VENDOR_INTEL || + pci_get_vendor(ich_device) != PCI_VENDOR_INTEL_CORPORATION || (pci_get_device(ich_device) != PCI_DEV_82801BA && pci_get_device(ich_device) != PCI_DEV_82801CA && pci_get_device(ich_device) != PCI_DEV_82801DB)) @@ -174,7 +174,7 @@ hostb = pci_find_bsf(0, 0, 0); if (hostb != NULL && - pci_get_vendor(hostb) == PCI_VENDOR_INTEL && + pci_get_vendor(hostb) == PCI_VENDOR_INTEL_CORPORATION && pci_get_device(hostb) == PCI_DEV_82815_MC && pci_get_revid(hostb) < 5) return; diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -224,7 +224,6 @@ /* * Miscellaneous constants */ -#define EM_VENDOR_ID 0x8086 #define EM_FLASH 0x0014 #define EM_JUMBO_PBA 0x00000028 diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -30,6 +30,8 @@ #include #include +#include + #define em_mac_min e1000_82571 #define igb_mac_min e1000_82575 @@ -52,164 +54,164 @@ static const pci_vendor_info_t em_vendor_info_array[] = { /* Intel(R) - lem-class legacy devices */ - PVID(0x8086, E1000_DEV_ID_82540EM, "Intel(R) Legacy PRO/1000 MT 82540EM"), - PVID(0x8086, E1000_DEV_ID_82540EM_LOM, "Intel(R) Legacy PRO/1000 MT 82540EM (LOM)"), - PVID(0x8086, E1000_DEV_ID_82540EP, "Intel(R) Legacy PRO/1000 MT 82540EP"), - PVID(0x8086, E1000_DEV_ID_82540EP_LOM, "Intel(R) Legacy PRO/1000 MT 82540EP (LOM)"), - PVID(0x8086, E1000_DEV_ID_82540EP_LP, "Intel(R) Legacy PRO/1000 MT 82540EP (Mobile)"), - - PVID(0x8086, E1000_DEV_ID_82541EI, "Intel(R) Legacy PRO/1000 MT 82541EI (Copper)"), - PVID(0x8086, E1000_DEV_ID_82541ER, "Intel(R) Legacy PRO/1000 82541ER"), - PVID(0x8086, E1000_DEV_ID_82541ER_LOM, "Intel(R) Legacy PRO/1000 MT 82541ER"), - PVID(0x8086, E1000_DEV_ID_82541EI_MOBILE, "Intel(R) Legacy PRO/1000 MT 82541EI (Mobile)"), - PVID(0x8086, E1000_DEV_ID_82541GI, "Intel(R) Legacy PRO/1000 MT 82541GI"), - PVID(0x8086, E1000_DEV_ID_82541GI_LF, "Intel(R) Legacy PRO/1000 GT 82541PI"), - PVID(0x8086, E1000_DEV_ID_82541GI_MOBILE, "Intel(R) Legacy PRO/1000 MT 82541GI (Mobile)"), - - PVID(0x8086, E1000_DEV_ID_82542, "Intel(R) Legacy PRO/1000 82542 (Fiber)"), - - PVID(0x8086, E1000_DEV_ID_82543GC_FIBER, "Intel(R) Legacy PRO/1000 F 82543GC (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82543GC_COPPER, "Intel(R) Legacy PRO/1000 T 82543GC (Copper)"), - - PVID(0x8086, E1000_DEV_ID_82544EI_COPPER, "Intel(R) Legacy PRO/1000 XT 82544EI (Copper)"), - PVID(0x8086, E1000_DEV_ID_82544EI_FIBER, "Intel(R) Legacy PRO/1000 XF 82544EI (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82544GC_COPPER, "Intel(R) Legacy PRO/1000 T 82544GC (Copper)"), - PVID(0x8086, E1000_DEV_ID_82544GC_LOM, "Intel(R) Legacy PRO/1000 XT 82544GC (LOM)"), - - PVID(0x8086, E1000_DEV_ID_82545EM_COPPER, "Intel(R) Legacy PRO/1000 MT 82545EM (Copper)"), - PVID(0x8086, E1000_DEV_ID_82545EM_FIBER, "Intel(R) Legacy PRO/1000 MF 82545EM (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82545GM_COPPER, "Intel(R) Legacy PRO/1000 MT 82545GM (Copper)"), - PVID(0x8086, E1000_DEV_ID_82545GM_FIBER, "Intel(R) Legacy PRO/1000 MF 82545GM (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82545GM_SERDES, "Intel(R) Legacy PRO/1000 MB 82545GM (SERDES)"), - - PVID(0x8086, E1000_DEV_ID_82546EB_COPPER, "Intel(R) Legacy PRO/1000 MT 82546EB (Copper)"), - PVID(0x8086, E1000_DEV_ID_82546EB_FIBER, "Intel(R) Legacy PRO/1000 MF 82546EB (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82546EB_QUAD_COPPER, "Intel(R) Legacy PRO/1000 MT 82546EB (Quad Copper"), - PVID(0x8086, E1000_DEV_ID_82546GB_COPPER, "Intel(R) Legacy PRO/1000 MT 82546GB (Copper)"), - PVID(0x8086, E1000_DEV_ID_82546GB_FIBER, "Intel(R) Legacy PRO/1000 MF 82546GB (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82546GB_SERDES, "Intel(R) Legacy PRO/1000 MB 82546GB (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82546GB_PCIE, "Intel(R) Legacy PRO/1000 P 82546GB (PCIe)"), - PVID(0x8086, E1000_DEV_ID_82546GB_QUAD_COPPER, "Intel(R) Legacy PRO/1000 GT 82546GB (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3, "Intel(R) Legacy PRO/1000 GT 82546GB (Quad Copper)"), - - PVID(0x8086, E1000_DEV_ID_82547EI, "Intel(R) Legacy PRO/1000 CT 82547EI"), - PVID(0x8086, E1000_DEV_ID_82547EI_MOBILE, "Intel(R) Legacy PRO/1000 CT 82547EI (Mobile)"), - PVID(0x8086, E1000_DEV_ID_82547GI, "Intel(R) Legacy PRO/1000 CT 82547GI"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82540EM, "Intel(R) Legacy PRO/1000 MT 82540EM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82540EM_LOM, "Intel(R) Legacy PRO/1000 MT 82540EM (LOM)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82540EP, "Intel(R) Legacy PRO/1000 MT 82540EP"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82540EP_LOM, "Intel(R) Legacy PRO/1000 MT 82540EP (LOM)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82540EP_LP, "Intel(R) Legacy PRO/1000 MT 82540EP (Mobile)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541EI, "Intel(R) Legacy PRO/1000 MT 82541EI (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541ER, "Intel(R) Legacy PRO/1000 82541ER"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541ER_LOM, "Intel(R) Legacy PRO/1000 MT 82541ER"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541EI_MOBILE, "Intel(R) Legacy PRO/1000 MT 82541EI (Mobile)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541GI, "Intel(R) Legacy PRO/1000 MT 82541GI"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541GI_LF, "Intel(R) Legacy PRO/1000 GT 82541PI"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82541GI_MOBILE, "Intel(R) Legacy PRO/1000 MT 82541GI (Mobile)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82542, "Intel(R) Legacy PRO/1000 82542 (Fiber)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82543GC_FIBER, "Intel(R) Legacy PRO/1000 F 82543GC (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82543GC_COPPER, "Intel(R) Legacy PRO/1000 T 82543GC (Copper)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82544EI_COPPER, "Intel(R) Legacy PRO/1000 XT 82544EI (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82544EI_FIBER, "Intel(R) Legacy PRO/1000 XF 82544EI (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82544GC_COPPER, "Intel(R) Legacy PRO/1000 T 82544GC (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82544GC_LOM, "Intel(R) Legacy PRO/1000 XT 82544GC (LOM)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82545EM_COPPER, "Intel(R) Legacy PRO/1000 MT 82545EM (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82545EM_FIBER, "Intel(R) Legacy PRO/1000 MF 82545EM (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82545GM_COPPER, "Intel(R) Legacy PRO/1000 MT 82545GM (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82545GM_FIBER, "Intel(R) Legacy PRO/1000 MF 82545GM (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82545GM_SERDES, "Intel(R) Legacy PRO/1000 MB 82545GM (SERDES)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546EB_COPPER, "Intel(R) Legacy PRO/1000 MT 82546EB (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546EB_FIBER, "Intel(R) Legacy PRO/1000 MF 82546EB (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546EB_QUAD_COPPER, "Intel(R) Legacy PRO/1000 MT 82546EB (Quad Copper"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_COPPER, "Intel(R) Legacy PRO/1000 MT 82546GB (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_FIBER, "Intel(R) Legacy PRO/1000 MF 82546GB (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_SERDES, "Intel(R) Legacy PRO/1000 MB 82546GB (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_PCIE, "Intel(R) Legacy PRO/1000 P 82546GB (PCIe)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_QUAD_COPPER, "Intel(R) Legacy PRO/1000 GT 82546GB (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3, "Intel(R) Legacy PRO/1000 GT 82546GB (Quad Copper)"), + + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82547EI, "Intel(R) Legacy PRO/1000 CT 82547EI"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82547EI_MOBILE, "Intel(R) Legacy PRO/1000 CT 82547EI (Mobile)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82547GI, "Intel(R) Legacy PRO/1000 CT 82547GI"), /* Intel(R) - em-class devices */ - PVID(0x8086, E1000_DEV_ID_82571EB_COPPER, "Intel(R) PRO/1000 PT 82571EB/82571GB (Copper)"), - PVID(0x8086, E1000_DEV_ID_82571EB_FIBER, "Intel(R) PRO/1000 PF 82571EB/82571GB (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82571EB_SERDES, "Intel(R) PRO/1000 PB 82571EB (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82571EB_SERDES_DUAL, "Intel(R) PRO/1000 82571EB (Dual Mezzanine)"), - PVID(0x8086, E1000_DEV_ID_82571EB_SERDES_QUAD, "Intel(R) PRO/1000 82571EB (Quad Mezzanine)"), - PVID(0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER, "Intel(R) PRO/1000 PT 82571EB/82571GB (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER_LP, "Intel(R) PRO/1000 PT 82571EB/82571GB (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82571EB_QUAD_FIBER, "Intel(R) PRO/1000 PF 82571EB (Quad Fiber)"), - PVID(0x8086, E1000_DEV_ID_82571PT_QUAD_COPPER, "Intel(R) PRO/1000 PT 82571PT (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82572EI, "Intel(R) PRO/1000 PT 82572EI (Copper)"), - PVID(0x8086, E1000_DEV_ID_82572EI_COPPER, "Intel(R) PRO/1000 PT 82572EI (Copper)"), - PVID(0x8086, E1000_DEV_ID_82572EI_FIBER, "Intel(R) PRO/1000 PF 82572EI (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82572EI_SERDES, "Intel(R) PRO/1000 82572EI (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82573E, "Intel(R) PRO/1000 82573E (Copper)"), - PVID(0x8086, E1000_DEV_ID_82573E_IAMT, "Intel(R) PRO/1000 82573E AMT (Copper)"), - PVID(0x8086, E1000_DEV_ID_82573L, "Intel(R) PRO/1000 82573L"), - PVID(0x8086, E1000_DEV_ID_82583V, "Intel(R) 82583V"), - PVID(0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_SPT, "Intel(R) 80003ES2LAN (Copper)"), - PVID(0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_SPT, "Intel(R) 80003ES2LAN (SERDES)"), - PVID(0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_DPT, "Intel(R) 80003ES2LAN (Dual Copper)"), - PVID(0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_DPT, "Intel(R) 80003ES2LAN (Dual SERDES)"), - PVID(0x8086, E1000_DEV_ID_ICH8_IGP_M_AMT, "Intel(R) 82566MM ICH8 AMT (Mobile)"), - PVID(0x8086, E1000_DEV_ID_ICH8_IGP_AMT, "Intel(R) 82566DM ICH8 AMT"), - PVID(0x8086, E1000_DEV_ID_ICH8_IGP_C, "Intel(R) 82566DC ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH8_IFE, "Intel(R) 82562V ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH8_IFE_GT, "Intel(R) 82562GT ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH8_IFE_G, "Intel(R) 82562G ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH8_IGP_M, "Intel(R) 82566MC ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH8_82567V_3, "Intel(R) 82567V-3 ICH8"), - PVID(0x8086, E1000_DEV_ID_ICH9_IGP_M_AMT, "Intel(R) 82567LM ICH9 AMT"), - PVID(0x8086, E1000_DEV_ID_ICH9_IGP_AMT, "Intel(R) 82566DM-2 ICH9 AMT"), - PVID(0x8086, E1000_DEV_ID_ICH9_IGP_C, "Intel(R) 82566DC-2 ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_IGP_M, "Intel(R) 82567LF ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_IGP_M_V, "Intel(R) 82567V ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_IFE, "Intel(R) 82562V-2 ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_IFE_GT, "Intel(R) 82562GT-2 ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_IFE_G, "Intel(R) 82562G-2 ICH9"), - PVID(0x8086, E1000_DEV_ID_ICH9_BM, "Intel(R) 82567LM-4 ICH9"), - PVID(0x8086, E1000_DEV_ID_82574L, "Intel(R) Gigabit CT 82574L"), - PVID(0x8086, E1000_DEV_ID_82574LA, "Intel(R) 82574L-Apple"), - PVID(0x8086, E1000_DEV_ID_ICH10_R_BM_LM, "Intel(R) 82567LM-2 ICH10"), - PVID(0x8086, E1000_DEV_ID_ICH10_R_BM_LF, "Intel(R) 82567LF-2 ICH10"), - PVID(0x8086, E1000_DEV_ID_ICH10_R_BM_V, "Intel(R) 82567V-2 ICH10"), - PVID(0x8086, E1000_DEV_ID_ICH10_D_BM_LM, "Intel(R) 82567LM-3 ICH10"), - PVID(0x8086, E1000_DEV_ID_ICH10_D_BM_LF, "Intel(R) 82567LF-3 ICH10"), - PVID(0x8086, E1000_DEV_ID_ICH10_D_BM_V, "Intel(R) 82567V-4 ICH10"), - PVID(0x8086, E1000_DEV_ID_PCH_M_HV_LM, "Intel(R) 82577LM"), - PVID(0x8086, E1000_DEV_ID_PCH_M_HV_LC, "Intel(R) 82577LC"), - PVID(0x8086, E1000_DEV_ID_PCH_D_HV_DM, "Intel(R) 82578DM"), - PVID(0x8086, E1000_DEV_ID_PCH_D_HV_DC, "Intel(R) 82578DC"), - PVID(0x8086, E1000_DEV_ID_PCH2_LV_LM, "Intel(R) 82579LM"), - PVID(0x8086, E1000_DEV_ID_PCH2_LV_V, "Intel(R) 82579V"), - PVID(0x8086, E1000_DEV_ID_PCH_LPT_I217_LM, "Intel(R) I217-LM LPT"), - PVID(0x8086, E1000_DEV_ID_PCH_LPT_I217_V, "Intel(R) I217-V LPT"), - PVID(0x8086, E1000_DEV_ID_PCH_LPTLP_I218_LM, "Intel(R) I218-LM LPTLP"), - PVID(0x8086, E1000_DEV_ID_PCH_LPTLP_I218_V, "Intel(R) I218-V LPTLP"), - PVID(0x8086, E1000_DEV_ID_PCH_I218_LM2, "Intel(R) I218-LM (2)"), - PVID(0x8086, E1000_DEV_ID_PCH_I218_V2, "Intel(R) I218-V (2)"), - PVID(0x8086, E1000_DEV_ID_PCH_I218_LM3, "Intel(R) I218-LM (3)"), - PVID(0x8086, E1000_DEV_ID_PCH_I218_V3, "Intel(R) I218-V (3)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_LM, "Intel(R) I219-LM SPT"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_V, "Intel(R) I219-V SPT"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_LM2, "Intel(R) I219-LM SPT-H(2)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_V2, "Intel(R) I219-V SPT-H(2)"), - PVID(0x8086, E1000_DEV_ID_PCH_LBG_I219_LM3, "Intel(R) I219-LM LBG(3)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_LM4, "Intel(R) I219-LM SPT(4)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_V4, "Intel(R) I219-V SPT(4)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_LM5, "Intel(R) I219-LM SPT(5)"), - PVID(0x8086, E1000_DEV_ID_PCH_SPT_I219_V5, "Intel(R) I219-V SPT(5)"), - PVID(0x8086, E1000_DEV_ID_PCH_CNP_I219_LM6, "Intel(R) I219-LM CNP(6)"), - PVID(0x8086, E1000_DEV_ID_PCH_CNP_I219_V6, "Intel(R) I219-V CNP(6)"), - PVID(0x8086, E1000_DEV_ID_PCH_CNP_I219_LM7, "Intel(R) I219-LM CNP(7)"), - PVID(0x8086, E1000_DEV_ID_PCH_CNP_I219_V7, "Intel(R) I219-V CNP(7)"), - PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_LM8, "Intel(R) I219-LM ICP(8)"), - PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V8, "Intel(R) I219-V ICP(8)"), - PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_LM9, "Intel(R) I219-LM ICP(9)"), - PVID(0x8086, E1000_DEV_ID_PCH_ICP_I219_V9, "Intel(R) I219-V ICP(9)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM10, "Intel(R) I219-LM CMP(10)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V10, "Intel(R) I219-V CMP(10)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM11, "Intel(R) I219-LM CMP(11)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V11, "Intel(R) I219-V CMP(11)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_LM12, "Intel(R) I219-LM CMP(12)"), - PVID(0x8086, E1000_DEV_ID_PCH_CMP_I219_V12, "Intel(R) I219-V CMP(12)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_LM13, "Intel(R) I219-LM TGP(13)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_V13, "Intel(R) I219-V TGP(13)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_LM14, "Intel(R) I219-LM TGP(14)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_V14, "Intel(R) I219-V GTP(14)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_LM15, "Intel(R) I219-LM TGP(15)"), - PVID(0x8086, E1000_DEV_ID_PCH_TGP_I219_V15, "Intel(R) I219-V TGP(15)"), - PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_LM16, "Intel(R) I219-LM ADL(16)"), - PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V16, "Intel(R) I219-V ADL(16)"), - PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_LM17, "Intel(R) I219-LM ADL(17)"), - 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_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)"), - PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V21, "Intel(R) I219-V LNL(21)"), - PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_LM22, "Intel(R) I219-LM RPL(22)"), - PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_V22, "Intel(R) I219-V RPL(22)"), - PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_LM23, "Intel(R) I219-LM RPL(23)"), - PVID(0x8086, E1000_DEV_ID_PCH_RPL_I219_V23, "Intel(R) I219-V RPL(23)"), - PVID(0x8086, E1000_DEV_ID_PCH_ARL_I219_LM24, "Intel(R) I219-LM ARL(24)"), - PVID(0x8086, E1000_DEV_ID_PCH_ARL_I219_V24, "Intel(R) I219-V ARL(24)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_LM25, "Intel(R) I219-LM PTP(25)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_V25, "Intel(R) I219-V PTP(25)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_LM26, "Intel(R) I219-LM PTP(26)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_V26, "Intel(R) I219-V PTP(26)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_LM27, "Intel(R) I219-LM PTP(27)"), - PVID(0x8086, E1000_DEV_ID_PCH_PTP_I219_V27, "Intel(R) I219-V PTP(27)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_COPPER, "Intel(R) PRO/1000 PT 82571EB/82571GB (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_FIBER, "Intel(R) PRO/1000 PF 82571EB/82571GB (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_SERDES, "Intel(R) PRO/1000 PB 82571EB (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_SERDES_DUAL, "Intel(R) PRO/1000 82571EB (Dual Mezzanine)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_SERDES_QUAD, "Intel(R) PRO/1000 82571EB (Quad Mezzanine)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_QUAD_COPPER, "Intel(R) PRO/1000 PT 82571EB/82571GB (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_QUAD_COPPER_LP, "Intel(R) PRO/1000 PT 82571EB/82571GB (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571EB_QUAD_FIBER, "Intel(R) PRO/1000 PF 82571EB (Quad Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82571PT_QUAD_COPPER, "Intel(R) PRO/1000 PT 82571PT (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82572EI, "Intel(R) PRO/1000 PT 82572EI (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82572EI_COPPER, "Intel(R) PRO/1000 PT 82572EI (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82572EI_FIBER, "Intel(R) PRO/1000 PF 82572EI (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82572EI_SERDES, "Intel(R) PRO/1000 82572EI (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82573E, "Intel(R) PRO/1000 82573E (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82573E_IAMT, "Intel(R) PRO/1000 82573E AMT (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82573L, "Intel(R) PRO/1000 82573L"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82583V, "Intel(R) 82583V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_80003ES2LAN_COPPER_SPT, "Intel(R) 80003ES2LAN (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_80003ES2LAN_SERDES_SPT, "Intel(R) 80003ES2LAN (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_80003ES2LAN_COPPER_DPT, "Intel(R) 80003ES2LAN (Dual Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_80003ES2LAN_SERDES_DPT, "Intel(R) 80003ES2LAN (Dual SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IGP_M_AMT, "Intel(R) 82566MM ICH8 AMT (Mobile)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IGP_AMT, "Intel(R) 82566DM ICH8 AMT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IGP_C, "Intel(R) 82566DC ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IFE, "Intel(R) 82562V ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IFE_GT, "Intel(R) 82562GT ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IFE_G, "Intel(R) 82562G ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_IGP_M, "Intel(R) 82566MC ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH8_82567V_3, "Intel(R) 82567V-3 ICH8"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IGP_M_AMT, "Intel(R) 82567LM ICH9 AMT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IGP_AMT, "Intel(R) 82566DM-2 ICH9 AMT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IGP_C, "Intel(R) 82566DC-2 ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IGP_M, "Intel(R) 82567LF ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IGP_M_V, "Intel(R) 82567V ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IFE, "Intel(R) 82562V-2 ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IFE_GT, "Intel(R) 82562GT-2 ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_IFE_G, "Intel(R) 82562G-2 ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH9_BM, "Intel(R) 82567LM-4 ICH9"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82574L, "Intel(R) Gigabit CT 82574L"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82574LA, "Intel(R) 82574L-Apple"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_R_BM_LM, "Intel(R) 82567LM-2 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_R_BM_LF, "Intel(R) 82567LF-2 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_R_BM_V, "Intel(R) 82567V-2 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_D_BM_LM, "Intel(R) 82567LM-3 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_D_BM_LF, "Intel(R) 82567LF-3 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_ICH10_D_BM_V, "Intel(R) 82567V-4 ICH10"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_M_HV_LM, "Intel(R) 82577LM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_M_HV_LC, "Intel(R) 82577LC"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_D_HV_DM, "Intel(R) 82578DM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_D_HV_DC, "Intel(R) 82578DC"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH2_LV_LM, "Intel(R) 82579LM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH2_LV_V, "Intel(R) 82579V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LPT_I217_LM, "Intel(R) I217-LM LPT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LPT_I217_V, "Intel(R) I217-V LPT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LPTLP_I218_LM, "Intel(R) I218-LM LPTLP"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LPTLP_I218_V, "Intel(R) I218-V LPTLP"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_I218_LM2, "Intel(R) I218-LM (2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_I218_V2, "Intel(R) I218-V (2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_I218_LM3, "Intel(R) I218-LM (3)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_I218_V3, "Intel(R) I218-V (3)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_LM, "Intel(R) I219-LM SPT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_V, "Intel(R) I219-V SPT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_LM2, "Intel(R) I219-LM SPT-H(2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_V2, "Intel(R) I219-V SPT-H(2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LBG_I219_LM3, "Intel(R) I219-LM LBG(3)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_LM4, "Intel(R) I219-LM SPT(4)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_V4, "Intel(R) I219-V SPT(4)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_LM5, "Intel(R) I219-LM SPT(5)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_SPT_I219_V5, "Intel(R) I219-V SPT(5)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CNP_I219_LM6, "Intel(R) I219-LM CNP(6)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CNP_I219_V6, "Intel(R) I219-V CNP(6)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CNP_I219_LM7, "Intel(R) I219-LM CNP(7)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CNP_I219_V7, "Intel(R) I219-V CNP(7)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ICP_I219_LM8, "Intel(R) I219-LM ICP(8)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ICP_I219_V8, "Intel(R) I219-V ICP(8)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ICP_I219_LM9, "Intel(R) I219-LM ICP(9)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ICP_I219_V9, "Intel(R) I219-V ICP(9)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_LM10, "Intel(R) I219-LM CMP(10)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_V10, "Intel(R) I219-V CMP(10)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_LM11, "Intel(R) I219-LM CMP(11)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_V11, "Intel(R) I219-V CMP(11)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_LM12, "Intel(R) I219-LM CMP(12)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_CMP_I219_V12, "Intel(R) I219-V CMP(12)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_LM13, "Intel(R) I219-LM TGP(13)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_V13, "Intel(R) I219-V TGP(13)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_LM14, "Intel(R) I219-LM TGP(14)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_V14, "Intel(R) I219-V GTP(14)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_LM15, "Intel(R) I219-LM TGP(15)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_TGP_I219_V15, "Intel(R) I219-V TGP(15)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ADL_I219_LM16, "Intel(R) I219-LM ADL(16)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ADL_I219_V16, "Intel(R) I219-V ADL(16)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ADL_I219_LM17, "Intel(R) I219-LM ADL(17)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ADL_I219_V17, "Intel(R) I219-V ADL(17)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_MTP_I219_LM18, "Intel(R) I219-LM MTP(18)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_MTP_I219_V18, "Intel(R) I219-V MTP(18)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_MTP_I219_LM19, "Intel(R) I219-LM MTP(19)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_MTP_I219_V19, "Intel(R) I219-V MTP(19)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LNL_I219_LM20, "Intel(R) I219-LM LNL(20)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LNL_I219_V20, "Intel(R) I219-V LNL(20)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LNL_I219_LM21, "Intel(R) I219-LM LNL(21)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_LNL_I219_V21, "Intel(R) I219-V LNL(21)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_RPL_I219_LM22, "Intel(R) I219-LM RPL(22)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_RPL_I219_V22, "Intel(R) I219-V RPL(22)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_RPL_I219_LM23, "Intel(R) I219-LM RPL(23)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_RPL_I219_V23, "Intel(R) I219-V RPL(23)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ARL_I219_LM24, "Intel(R) I219-LM ARL(24)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_ARL_I219_V24, "Intel(R) I219-V ARL(24)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_LM25, "Intel(R) I219-LM PTP(25)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_V25, "Intel(R) I219-V PTP(25)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_LM26, "Intel(R) I219-LM PTP(26)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_V26, "Intel(R) I219-V PTP(26)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_LM27, "Intel(R) I219-LM PTP(27)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_PCH_PTP_I219_V27, "Intel(R) I219-V PTP(27)"), /* required last entry */ PVID_END }; @@ -217,46 +219,46 @@ static const pci_vendor_info_t igb_vendor_info_array[] = { /* Intel(R) - igb-class devices */ - PVID(0x8086, E1000_DEV_ID_82575EB_COPPER, "Intel(R) PRO/1000 82575EB (Copper)"), - PVID(0x8086, E1000_DEV_ID_82575EB_FIBER_SERDES, "Intel(R) PRO/1000 82575EB (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82575GB_QUAD_COPPER, "Intel(R) PRO/1000 VT 82575GB (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82576, "Intel(R) PRO/1000 82576"), - PVID(0x8086, E1000_DEV_ID_82576_NS, "Intel(R) PRO/1000 82576NS"), - PVID(0x8086, E1000_DEV_ID_82576_NS_SERDES, "Intel(R) PRO/1000 82576NS (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82576_FIBER, "Intel(R) PRO/1000 EF 82576 (Dual Fiber)"), - PVID(0x8086, E1000_DEV_ID_82576_SERDES, "Intel(R) PRO/1000 82576 (Dual SERDES)"), - PVID(0x8086, E1000_DEV_ID_82576_SERDES_QUAD, "Intel(R) PRO/1000 ET 82576 (Quad SERDES)"), - PVID(0x8086, E1000_DEV_ID_82576_QUAD_COPPER, "Intel(R) PRO/1000 ET 82576 (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82576_QUAD_COPPER_ET2, "Intel(R) PRO/1000 ET(2) 82576 (Quad Copper)"), - PVID(0x8086, E1000_DEV_ID_82576_VF, "Intel(R) PRO/1000 82576 Virtual Function"), - PVID(0x8086, E1000_DEV_ID_82580_COPPER, "Intel(R) I340 82580 (Copper)"), - PVID(0x8086, E1000_DEV_ID_82580_FIBER, "Intel(R) I340 82580 (Fiber)"), - PVID(0x8086, E1000_DEV_ID_82580_SERDES, "Intel(R) I340 82580 (SERDES)"), - PVID(0x8086, E1000_DEV_ID_82580_SGMII, "Intel(R) I340 82580 (SGMII)"), - PVID(0x8086, E1000_DEV_ID_82580_COPPER_DUAL, "Intel(R) I340-T2 82580 (Dual Copper)"), - PVID(0x8086, E1000_DEV_ID_82580_QUAD_FIBER, "Intel(R) I340-F4 82580 (Quad Fiber)"), - PVID(0x8086, E1000_DEV_ID_DH89XXCC_SERDES, "Intel(R) DH89XXCC (SERDES)"), - PVID(0x8086, E1000_DEV_ID_DH89XXCC_SGMII, "Intel(R) I347-AT4 DH89XXCC"), - PVID(0x8086, E1000_DEV_ID_DH89XXCC_SFP, "Intel(R) DH89XXCC (SFP)"), - PVID(0x8086, E1000_DEV_ID_DH89XXCC_BACKPLANE, "Intel(R) DH89XXCC (Backplane)"), - PVID(0x8086, E1000_DEV_ID_I350_COPPER, "Intel(R) I350 (Copper)"), - PVID(0x8086, E1000_DEV_ID_I350_FIBER, "Intel(R) I350 (Fiber)"), - PVID(0x8086, E1000_DEV_ID_I350_SERDES, "Intel(R) I350 (SERDES)"), - PVID(0x8086, E1000_DEV_ID_I350_SGMII, "Intel(R) I350 (SGMII)"), - PVID(0x8086, E1000_DEV_ID_I350_VF, "Intel(R) I350 Virtual Function"), - PVID(0x8086, E1000_DEV_ID_I210_COPPER, "Intel(R) I210 (Copper)"), - PVID(0x8086, E1000_DEV_ID_I210_COPPER_IT, "Intel(R) I210 IT (Copper)"), - PVID(0x8086, E1000_DEV_ID_I210_COPPER_OEM1, "Intel(R) I210 (OEM)"), - PVID(0x8086, E1000_DEV_ID_I210_COPPER_FLASHLESS, "Intel(R) I210 Flashless (Copper)"), - PVID(0x8086, E1000_DEV_ID_I210_SERDES_FLASHLESS, "Intel(R) I210 Flashless (SERDES)"), - PVID(0x8086, E1000_DEV_ID_I210_SGMII_FLASHLESS, "Intel(R) I210 Flashless (SGMII)"), - PVID(0x8086, E1000_DEV_ID_I210_FIBER, "Intel(R) I210 (Fiber)"), - PVID(0x8086, E1000_DEV_ID_I210_SERDES, "Intel(R) I210 (SERDES)"), - PVID(0x8086, E1000_DEV_ID_I210_SGMII, "Intel(R) I210 (SGMII)"), - PVID(0x8086, E1000_DEV_ID_I211_COPPER, "Intel(R) I211 (Copper)"), - PVID(0x8086, E1000_DEV_ID_I354_BACKPLANE_1GBPS, "Intel(R) I354 (1.0 GbE Backplane)"), - PVID(0x8086, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS, "Intel(R) I354 (2.5 GbE Backplane)"), - PVID(0x8086, E1000_DEV_ID_I354_SGMII, "Intel(R) I354 (SGMII)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82575EB_COPPER, "Intel(R) PRO/1000 82575EB (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82575EB_FIBER_SERDES, "Intel(R) PRO/1000 82575EB (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82575GB_QUAD_COPPER, "Intel(R) PRO/1000 VT 82575GB (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576, "Intel(R) PRO/1000 82576"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_NS, "Intel(R) PRO/1000 82576NS"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_NS_SERDES, "Intel(R) PRO/1000 82576NS (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_FIBER, "Intel(R) PRO/1000 EF 82576 (Dual Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_SERDES, "Intel(R) PRO/1000 82576 (Dual SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_SERDES_QUAD, "Intel(R) PRO/1000 ET 82576 (Quad SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_QUAD_COPPER, "Intel(R) PRO/1000 ET 82576 (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_QUAD_COPPER_ET2, "Intel(R) PRO/1000 ET(2) 82576 (Quad Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82576_VF, "Intel(R) PRO/1000 82576 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_COPPER, "Intel(R) I340 82580 (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_FIBER, "Intel(R) I340 82580 (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_SERDES, "Intel(R) I340 82580 (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_SGMII, "Intel(R) I340 82580 (SGMII)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_COPPER_DUAL, "Intel(R) I340-T2 82580 (Dual Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_82580_QUAD_FIBER, "Intel(R) I340-F4 82580 (Quad Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_DH89XXCC_SERDES, "Intel(R) DH89XXCC (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_DH89XXCC_SGMII, "Intel(R) I347-AT4 DH89XXCC"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_DH89XXCC_SFP, "Intel(R) DH89XXCC (SFP)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_DH89XXCC_BACKPLANE, "Intel(R) DH89XXCC (Backplane)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I350_COPPER, "Intel(R) I350 (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I350_FIBER, "Intel(R) I350 (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I350_SERDES, "Intel(R) I350 (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I350_SGMII, "Intel(R) I350 (SGMII)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I350_VF, "Intel(R) I350 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_COPPER, "Intel(R) I210 (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_COPPER_IT, "Intel(R) I210 IT (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_COPPER_OEM1, "Intel(R) I210 (OEM)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_COPPER_FLASHLESS, "Intel(R) I210 Flashless (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_SERDES_FLASHLESS, "Intel(R) I210 Flashless (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_SGMII_FLASHLESS, "Intel(R) I210 Flashless (SGMII)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_FIBER, "Intel(R) I210 (Fiber)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_SERDES, "Intel(R) I210 (SERDES)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I210_SGMII, "Intel(R) I210 (SGMII)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I211_COPPER, "Intel(R) I211 (Copper)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I354_BACKPLANE_1GBPS, "Intel(R) I354 (1.0 GbE Backplane)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS, "Intel(R) I354 (2.5 GbE Backplane)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, E1000_DEV_ID_I354_SGMII, "Intel(R) I354 (SGMII)"), /* required last entry */ PVID_END }; diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -177,7 +178,7 @@ device_set_desc(dev, "Lucent FW322/323"); return BUS_PROBE_DEFAULT; } - if (id == (FW_VENDORID_INTEL | FW_DEVICE_82372FB)) { + if (id == (PCI_VENDOR_INTEL_CORPORATION | FW_DEVICE_82372FB)) { device_set_desc(dev, "Intel 82372FB"); return BUS_PROBE_DEFAULT; } diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h --- a/sys/dev/firewire/fwohcireg.h +++ b/sys/dev/firewire/fwohcireg.h @@ -46,7 +46,6 @@ #define FW_VENDORID_RICOH 0x1180 #define FW_VENDORID_APPLE 0x106b #define FW_VENDORID_LUCENT 0x11c1 -#define FW_VENDORID_INTEL 0x8086 #define FW_VENDORID_ADAPTEC 0x9004 #define FW_DEVICE_CS4210 (0x000f << 16) diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -34,6 +34,8 @@ * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ +#include + #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #endif @@ -158,51 +160,51 @@ * them. */ static const struct fxp_ident fxp_ident_table[] = { - { 0x8086, 0x1029, -1, 0, "Intel 82559 PCI/CardBus Pro/100" }, - { 0x8086, 0x1030, -1, 0, "Intel 82559 Pro/100 Ethernet" }, - { 0x8086, 0x1031, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" }, - { 0x8086, 0x1032, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" }, - { 0x8086, 0x1033, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, - { 0x8086, 0x1034, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, - { 0x8086, 0x1035, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, - { 0x8086, 0x1036, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, - { 0x8086, 0x1037, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, - { 0x8086, 0x1038, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, - { 0x8086, 0x1039, -1, 4, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" }, - { 0x8086, 0x103A, -1, 4, "Intel 82801DB (ICH4) Pro/100 Ethernet" }, - { 0x8086, 0x103B, -1, 4, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" }, - { 0x8086, 0x103C, -1, 4, "Intel 82801DB (ICH4) Pro/100 Ethernet" }, - { 0x8086, 0x103D, -1, 4, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" }, - { 0x8086, 0x103E, -1, 4, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" }, - { 0x8086, 0x1050, -1, 5, "Intel 82801BA (D865) Pro/100 VE Ethernet" }, - { 0x8086, 0x1051, -1, 5, "Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet" }, - { 0x8086, 0x1059, -1, 0, "Intel 82551QM Pro/100 M Mobile Connection" }, - { 0x8086, 0x1064, -1, 6, "Intel 82562EZ (ICH6)" }, - { 0x8086, 0x1065, -1, 6, "Intel 82562ET/EZ/GT/GZ PRO/100 VE Ethernet" }, - { 0x8086, 0x1068, -1, 6, "Intel 82801FBM (ICH6-M) Pro/100 VE Ethernet" }, - { 0x8086, 0x1069, -1, 6, "Intel 82562EM/EX/GX Pro/100 Ethernet" }, - { 0x8086, 0x1091, -1, 7, "Intel 82562GX Pro/100 Ethernet" }, - { 0x8086, 0x1092, -1, 7, "Intel Pro/100 VE Network Connection" }, - { 0x8086, 0x1093, -1, 7, "Intel Pro/100 VM Network Connection" }, - { 0x8086, 0x1094, -1, 7, "Intel Pro/100 946GZ (ICH7) Network Connection" }, - { 0x8086, 0x1209, -1, 0, "Intel 82559ER Embedded 10/100 Ethernet" }, - { 0x8086, 0x1229, 0x01, 0, "Intel 82557 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x02, 0, "Intel 82557 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x03, 0, "Intel 82557 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x04, 0, "Intel 82558 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x05, 0, "Intel 82558 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x06, 0, "Intel 82559 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x07, 0, "Intel 82559 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x08, 0, "Intel 82559 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x09, 0, "Intel 82559ER Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x0c, 0, "Intel 82550 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x0d, 0, "Intel 82550C Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x0e, 0, "Intel 82550 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x0f, 0, "Intel 82551 Pro/100 Ethernet" }, - { 0x8086, 0x1229, 0x10, 0, "Intel 82551 Pro/100 Ethernet" }, - { 0x8086, 0x1229, -1, 0, "Intel 82557/8/9 Pro/100 Ethernet" }, - { 0x8086, 0x2449, -1, 2, "Intel 82801BA/CAM (ICH2/3) Pro/100 Ethernet" }, - { 0x8086, 0x27dc, -1, 7, "Intel 82801GB (ICH7) 10/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1029, -1, 0, "Intel 82559 PCI/CardBus Pro/100" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1030, -1, 0, "Intel 82559 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1031, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1032, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1033, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1034, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1035, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1036, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1037, -1, 3, "Intel 82801CAM (ICH3) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1038, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1039, -1, 4, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x103A, -1, 4, "Intel 82801DB (ICH4) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x103B, -1, 4, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x103C, -1, 4, "Intel 82801DB (ICH4) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x103D, -1, 4, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x103E, -1, 4, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1050, -1, 5, "Intel 82801BA (D865) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1051, -1, 5, "Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1059, -1, 0, "Intel 82551QM Pro/100 M Mobile Connection" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1064, -1, 6, "Intel 82562EZ (ICH6)" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1065, -1, 6, "Intel 82562ET/EZ/GT/GZ PRO/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1068, -1, 6, "Intel 82801FBM (ICH6-M) Pro/100 VE Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1069, -1, 6, "Intel 82562EM/EX/GX Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1091, -1, 7, "Intel 82562GX Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1092, -1, 7, "Intel Pro/100 VE Network Connection" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1093, -1, 7, "Intel Pro/100 VM Network Connection" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1094, -1, 7, "Intel Pro/100 946GZ (ICH7) Network Connection" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1209, -1, 0, "Intel 82559ER Embedded 10/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x01, 0, "Intel 82557 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x02, 0, "Intel 82557 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x03, 0, "Intel 82557 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x04, 0, "Intel 82558 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x05, 0, "Intel 82558 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x06, 0, "Intel 82559 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x07, 0, "Intel 82559 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x08, 0, "Intel 82559 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x09, 0, "Intel 82559ER Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x0c, 0, "Intel 82550 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x0d, 0, "Intel 82550C Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x0e, 0, "Intel 82550 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x0f, 0, "Intel 82551 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, 0x10, 0, "Intel 82551 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1229, -1, 0, "Intel 82557/8/9 Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x2449, -1, 2, "Intel 82801BA/CAM (ICH2/3) Pro/100 Ethernet" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x27dc, -1, 7, "Intel 82801GB (ICH7) 10/100 Ethernet" }, { 0, 0, -1, 0, NULL }, }; diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -74,6 +74,9 @@ #include #include + +#include + #include "hv_vstorage.h" #include "vmbus_if.h" @@ -2486,7 +2489,6 @@ return DRIVER_UNKNOWN; } -#define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_PIIX4 0x7111 static void @@ -2505,7 +2507,7 @@ xpt_path_inq(&cpi, path); if (cpi.ccb_h.status == CAM_REQ_CMP && - cpi.hba_vendor == PCI_VENDOR_INTEL && + cpi.hba_vendor == PCI_VENDOR_INTEL_CORPORATION && cpi.hba_device == PCI_PRODUCT_PIIX4) { (*veto)++; if (bootverbose) { diff --git a/sys/dev/iavf/iavf_common.c b/sys/dev/iavf/iavf_common.c --- a/sys/dev/iavf/iavf_common.c +++ b/sys/dev/iavf/iavf_common.c @@ -29,6 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "iavf_type.h" #include "iavf_adminq.h" #include "iavf_prototype.h" @@ -47,7 +49,7 @@ DEBUGFUNC("iavf_set_mac_type\n"); - if (hw->vendor_id == IAVF_INTEL_VENDOR_ID) { + if (hw->vendor_id == PCI_VENDOR_INTEL_CORPORATION) { switch (hw->device_id) { case IAVF_DEV_ID_X722_VF: hw->mac.type = IAVF_MAC_X722_VF; diff --git a/sys/dev/iavf/iavf_devids.h b/sys/dev/iavf/iavf_devids.h --- a/sys/dev/iavf/iavf_devids.h +++ b/sys/dev/iavf/iavf_devids.h @@ -32,9 +32,6 @@ #ifndef _IAVF_DEVIDS_H_ #define _IAVF_DEVIDS_H_ -/* Vendor ID */ -#define IAVF_INTEL_VENDOR_ID 0x8086 - /* Device IDs for the VF driver */ #define IAVF_DEV_ID_VF 0x154C #define IAVF_DEV_ID_VF_HV 0x1571 diff --git a/sys/dev/iavf/iavf_drv_info.h b/sys/dev/iavf/iavf_drv_info.h --- a/sys/dev/iavf/iavf_drv_info.h +++ b/sys/dev/iavf/iavf_drv_info.h @@ -29,6 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + /** * @file iavf_drv_info.h * @brief device IDs and driver version @@ -66,12 +68,13 @@ * to most-generic entry; e.g. PVIDV_OEM()s for a device ID must come before * the PVIDV() for it. */ + static const pci_vendor_info_t iavf_vendor_info_array[] = { - PVIDV(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, IAVF_DEV_ID_VF, "Intel(R) Ethernet Virtual Function 700 Series"), - PVIDV(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, IAVF_DEV_ID_X722_VF, "Intel(R) Ethernet Virtual Function 700 Series (X722)"), - PVIDV(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, IAVF_DEV_ID_ADAPTIVE_VF, "Intel(R) Ethernet Adaptive Virtual Function"), PVID_END }; diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -29,6 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "ice_common.h" #include "ice_sched.h" #include "ice_adminq_cmd.h" @@ -155,7 +157,7 @@ { ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); - if (hw->vendor_id != ICE_INTEL_VENDOR_ID) + if (hw->vendor_id != PCI_VENDOR_INTEL_CORPORATION) return ICE_ERR_DEVICE_NOT_SUPPORTED; switch (hw->device_id) { diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -29,6 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + /** * @file ice_drv_info.h * @brief device IDs and driver version @@ -86,109 +88,109 @@ * the PVIDV() for it. */ static const pci_vendor_info_t ice_vendor_info_array[] = { - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_BACKPLANE, "Intel(R) Ethernet Controller E810-C for backplane"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0001, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0001, 0, "Intel(R) Ethernet Network Adapter E810-C-Q1"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0002, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0002, 0, "Intel(R) Ethernet Network Adapter E810-C-Q2"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0003, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0003, 0, "Intel(R) Ethernet Network Adapter E810-C-Q1"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0004, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0004, 0, "Intel(R) Ethernet Network Adapter E810-C-Q2"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0005, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0005, 0, "Intel(R) Ethernet Network Adapter E810-C-Q1 for OCP3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0006, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0006, 0, "Intel(R) Ethernet Network Adapter E810-C-Q2 for OCP3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0007, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0007, 0, "Intel(R) Ethernet Network Adapter E810-C-Q1 for OCP3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x0008, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0008, 0, "Intel(R) Ethernet Network Adapter E810-C-Q2 for OCP3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x000D, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x000D, 0, "Intel(R) Ethernet Network Adapter E810-L-Q2 for OCP3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, - ICE_INTEL_VENDOR_ID, 0x000E, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, + PCI_VENDOR_INTEL_CORPORATION, 0x000E, 0, "Intel(R) Ethernet Network Adapter E810-2C-Q2"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_QSFP, "Intel(R) Ethernet Controller E810-C for QSFP"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_SFP, - ICE_INTEL_VENDOR_ID, 0x0005, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0005, 0, "Intel(R) Ethernet Network Adapter E810-XXV-4"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_SFP, - ICE_INTEL_VENDOR_ID, 0x0006, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0006, 0, "Intel(R) Ethernet Network Adapter E810-XXV-4"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_SFP, - ICE_INTEL_VENDOR_ID, 0x0007, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0007, 0, "Intel(R) Ethernet Network Adapter E810-XXV-4"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_SFP, - ICE_INTEL_VENDOR_ID, 0x000C, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x000C, 0, "Intel(R) Ethernet Network Adapter E810-XXV-4 for OCP 3.0"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810C_SFP, "Intel(R) Ethernet Controller E810-C for SFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822C_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822C_BACKPLANE, "Intel(R) Ethernet Connection E822-C for backplane"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822C_QSFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822C_QSFP, "Intel(R) Ethernet Connection E822-C for QSFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822C_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822C_SFP, "Intel(R) Ethernet Connection E822-C for SFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822C_10G_BASE_T, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822C_10G_BASE_T, "Intel(R) Ethernet Connection E822-C/X557-AT 10GBASE-T"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822C_SGMII, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822C_SGMII, "Intel(R) Ethernet Connection E822-C 1GbE"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822L_BACKPLANE, "Intel(R) Ethernet Connection E822-L for backplane"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822L_SFP, "Intel(R) Ethernet Connection E822-L for SFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_10G_BASE_T, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822L_10G_BASE_T, "Intel(R) Ethernet Connection E822-L/X557-AT 10GBASE-T"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_SGMII, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E822L_SGMII, "Intel(R) Ethernet Connection E822-L 1GbE"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823L_BACKPLANE, "Intel(R) Ethernet Connection E823-L for backplane"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823L_SFP, "Intel(R) Ethernet Connection E823-L for SFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_QSFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823L_QSFP, "Intel(R) Ethernet Connection E823-L for QSFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_10G_BASE_T, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823L_10G_BASE_T, "Intel(R) Ethernet Connection E823-L/X557-AT 10GBASE-T"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_1GBE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823L_1GBE, "Intel(R) Ethernet Connection E823-L 1GbE"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823C_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823C_BACKPLANE, "Intel(R) Ethernet Connection E823-C for backplane"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823C_QSFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823C_QSFP, "Intel(R) Ethernet Connection E823-C for QSFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823C_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823C_SFP, "Intel(R) Ethernet Connection E823-C for SFP"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823C_10G_BASE_T, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823C_10G_BASE_T, "Intel(R) Ethernet Connection E823-C/X557-AT 10GBASE-T"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823C_SGMII, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E823C_SGMII, "Intel(R) Ethernet Connection E823-C 1GbE"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_BACKPLANE, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_BACKPLANE, "Intel(R) Ethernet Controller E810-XXV for backplane"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_QSFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_QSFP, "Intel(R) Ethernet Controller E810-XXV for QSFP"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP, - ICE_INTEL_VENDOR_ID, 0x0003, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0003, 0, "Intel(R) Ethernet Network Adapter E810-XXV-2"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP, - ICE_INTEL_VENDOR_ID, 0x0004, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0004, 0, "Intel(R) Ethernet Network Adapter E810-XXV-2"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP, - ICE_INTEL_VENDOR_ID, 0x0005, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0005, 0, "Intel(R) Ethernet Network Adapter E810-XXV-2 for OCP 3.0"), - PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP, - ICE_INTEL_VENDOR_ID, 0x0006, 0, + PVIDV_OEM(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_SFP, + PCI_VENDOR_INTEL_CORPORATION, 0x0006, 0, "Intel(R) Ethernet Network Adapter E810-XXV-2 for OCP 3.0"), - PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP, + PVIDV(PCI_VENDOR_INTEL_CORPORATION, ICE_DEV_ID_E810_XXV_SFP, "Intel(R) Ethernet Controller E810-XXV for SFP"), PVID_END }; diff --git a/sys/dev/ice/ice_osdep.h b/sys/dev/ice/ice_osdep.h --- a/sys/dev/ice/ice_osdep.h +++ b/sys/dev/ice/ice_osdep.h @@ -56,8 +56,6 @@ #include "ice_alloc.h" -#define ICE_INTEL_VENDOR_ID 0x8086 - #define ICE_STR_BUF_LEN 32 struct ice_hw; diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -58,6 +58,7 @@ #include #include +#include #include @@ -65,7 +66,6 @@ #include /* PCI unique identifiers */ -#define PCI_VENDOR_INTEL 0x8086 #define ID_82801AA 0x2413 #define ID_82801AB 0x2423 #define ID_82801BA 0x2443 @@ -114,103 +114,103 @@ #define ID_ALDERLAKE3 0x54a3 static const struct pci_device_table ichsmb_devices[] = { - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801AA), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801AA), PCI_DESCR("Intel 82801AA (ICH) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801AB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801AB), PCI_DESCR("Intel 82801AB (ICH0) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801BA), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801BA), PCI_DESCR("Intel 82801BA (ICH2) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801CA), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801CA), PCI_DESCR("Intel 82801CA (ICH3) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801DC), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801DC), PCI_DESCR("Intel 82801DC (ICH4) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801EB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801EB), PCI_DESCR("Intel 82801EB (ICH5) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801FB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801FB), PCI_DESCR("Intel 82801FB (ICH6) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801GB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801GB), PCI_DESCR("Intel 82801GB (ICH7) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801H), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801H), PCI_DESCR("Intel 82801H (ICH8) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801I), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801I), PCI_DESCR("Intel 82801I (ICH9) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801GB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801GB), PCI_DESCR("Intel 82801GB (ICH7) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801H), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801H), PCI_DESCR("Intel 82801H (ICH8) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801I), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801I), PCI_DESCR("Intel 82801I (ICH9) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_EP80579), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_EP80579), PCI_DESCR("Intel EP80579 SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801JI), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801JI), PCI_DESCR("Intel 82801JI (ICH10) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_82801JD), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_82801JD), PCI_DESCR("Intel 82801JD (ICH10) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_PCH), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_PCH), PCI_DESCR("Intel PCH SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_6300ESB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_6300ESB), PCI_DESCR("Intel 6300ESB (ICH) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_631xESB), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_631xESB), PCI_DESCR("Intel 631xESB/6321ESB (ESB2) SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_DH89XXCC), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_DH89XXCC), PCI_DESCR("Intel DH89xxCC SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_PATSBURG), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_PATSBURG), PCI_DESCR("Intel Patsburg SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_CPT), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_CPT), PCI_DESCR("Intel Cougar Point SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_PPT), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_PPT), PCI_DESCR("Intel Panther Point SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_AVOTON), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_AVOTON), PCI_DESCR("Intel Avoton SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_LPT), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_LPT), PCI_DESCR("Intel Lynx Point SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_LPTLP), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_LPTLP), PCI_DESCR("Intel Lynx Point-LP SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_WCPT), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_WCPT), PCI_DESCR("Intel Wildcat Point SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_WCPTLP), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_WCPTLP), PCI_DESCR("Intel Wildcat Point-LP SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_BAYTRAIL), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_BAYTRAIL), PCI_DESCR("Intel Baytrail SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_BRASWELL), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_BRASWELL), PCI_DESCR("Intel Braswell SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_COLETOCRK), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_COLETOCRK), PCI_DESCR("Intel Coleto Creek SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_WELLSBURG), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_WELLSBURG), PCI_DESCR("Intel Wellsburg SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_SRPT), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_SRPT), PCI_DESCR("Intel Sunrise Point-H SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_SRPTLP), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_SRPTLP), PCI_DESCR("Intel Sunrise Point-LP SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_DENVERTON), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_DENVERTON), PCI_DESCR("Intel Denverton SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_BROXTON), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_BROXTON), PCI_DESCR("Intel Broxton SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_LEWISBURG), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_LEWISBURG), PCI_DESCR("Intel Lewisburg SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_LEWISBURG2), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_LEWISBURG2), PCI_DESCR("Intel Lewisburg SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_KABYLAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_KABYLAKE), PCI_DESCR("Intel Kaby Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_CANNONLAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_CANNONLAKE), PCI_DESCR("Intel Cannon Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_COMETLAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_COMETLAKE), PCI_DESCR("Intel Comet Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_COMETLAKE2), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_COMETLAKE2), PCI_DESCR("Intel Comet Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_TIGERLAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_TIGERLAKE), PCI_DESCR("Intel Tiger Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_TIGERLAKE2), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_TIGERLAKE2), PCI_DESCR("Intel Tiger Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_GEMINILAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_GEMINILAKE), PCI_DESCR("Intel Gemini Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_ICELAKE), PCI_DESCR("Intel Ice Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_ALDERLAKE), PCI_DESCR("Intel Alder Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE2), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_ALDERLAKE2), PCI_DESCR("Intel Alder Lake SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE3), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, ID_ALDERLAKE3), PCI_DESCR("Intel Alder Lake SMBus controller") }, }; diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h --- a/sys/dev/ichwd/ichwd.h +++ b/sys/dev/ichwd/ichwd.h @@ -64,7 +64,6 @@ eventhandler_tag ev_tag; }; -#define VENDORID_INTEL 0x8086 #define DEVICEID_BAYTRAIL 0x0f1c #define DEVICEID_C3000 0x19df #define DEVICEID_CPT0 0x1c40 diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -71,12 +71,14 @@ #include #include +#include #include #include #include #include +#include static struct ichwd_device ichwd_devices[] = { { DEVICEID_82801AA, "Intel 82801AA watchdog timer", 1, 1 }, @@ -569,7 +571,7 @@ pci = device_get_parent(isab); if (pci == NULL || device_get_devclass(pci) != devclass_find("pci")) return (NULL); - if (pci_get_vendor(isab) != VENDORID_INTEL) + if (pci_get_vendor(isab) != PCI_VENDOR_INTEL_CORPORATION) return (NULL); devid = pci_get_device(isab); for (id = ichwd_devices; id->desc != NULL; ++id) { @@ -599,7 +601,7 @@ smb = pci_find_dbsf(pci_get_domain(isab), pci_get_bus(isab), 31, 4); if (smb == NULL) return (NULL); - if (pci_get_vendor(smb) != VENDORID_INTEL) + if (pci_get_vendor(smb) != PCI_VENDOR_INTEL_CORPORATION) return (NULL); devid = pci_get_device(smb); for (id = ichwd_smb_devices; id->desc != NULL; ++id) { diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -32,6 +32,8 @@ #include #include +#include + #ifdef RSS #include #include @@ -49,22 +51,22 @@ static const pci_vendor_info_t igc_vendor_info_array[] = { /* Intel(R) PRO/1000 Network Connection - igc */ - PVID(0x8086, IGC_DEV_ID_I225_LM, "Intel(R) Ethernet Controller I225-LM"), - PVID(0x8086, IGC_DEV_ID_I225_V, "Intel(R) Ethernet Controller I225-V"), - PVID(0x8086, IGC_DEV_ID_I225_K, "Intel(R) Ethernet Controller I225-K"), - PVID(0x8086, IGC_DEV_ID_I225_I, "Intel(R) Ethernet Controller I225-I"), - PVID(0x8086, IGC_DEV_ID_I220_V, "Intel(R) Ethernet Controller I220-V"), - PVID(0x8086, IGC_DEV_ID_I225_K2, "Intel(R) Ethernet Controller I225-K(2)"), - PVID(0x8086, IGC_DEV_ID_I225_LMVP, "Intel(R) Ethernet Controller I225-LMvP(2)"), - PVID(0x8086, IGC_DEV_ID_I226_K, "Intel(R) Ethernet Controller I226-K"), - PVID(0x8086, IGC_DEV_ID_I226_LMVP, "Intel(R) Ethernet Controller I226-LMvP"), - PVID(0x8086, IGC_DEV_ID_I225_IT, "Intel(R) Ethernet Controller I225-IT(2)"), - PVID(0x8086, IGC_DEV_ID_I226_LM, "Intel(R) Ethernet Controller I226-LM"), - PVID(0x8086, IGC_DEV_ID_I226_V, "Intel(R) Ethernet Controller I226-V"), - PVID(0x8086, IGC_DEV_ID_I226_IT, "Intel(R) Ethernet Controller I226-IT"), - PVID(0x8086, IGC_DEV_ID_I221_V, "Intel(R) Ethernet Controller I221-V"), - PVID(0x8086, IGC_DEV_ID_I226_BLANK_NVM, "Intel(R) Ethernet Controller I226(blankNVM)"), - PVID(0x8086, IGC_DEV_ID_I225_BLANK_NVM, "Intel(R) Ethernet Controller I225(blankNVM)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_LM, "Intel(R) Ethernet Controller I225-LM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_V, "Intel(R) Ethernet Controller I225-V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_K, "Intel(R) Ethernet Controller I225-K"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_I, "Intel(R) Ethernet Controller I225-I"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I220_V, "Intel(R) Ethernet Controller I220-V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_K2, "Intel(R) Ethernet Controller I225-K(2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_LMVP, "Intel(R) Ethernet Controller I225-LMvP(2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_K, "Intel(R) Ethernet Controller I226-K"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_LMVP, "Intel(R) Ethernet Controller I226-LMvP"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_IT, "Intel(R) Ethernet Controller I225-IT(2)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_LM, "Intel(R) Ethernet Controller I226-LM"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_V, "Intel(R) Ethernet Controller I226-V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_IT, "Intel(R) Ethernet Controller I226-IT"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I221_V, "Intel(R) Ethernet Controller I221-V"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I226_BLANK_NVM, "Intel(R) Ethernet Controller I226(blankNVM)"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IGC_DEV_ID_I225_BLANK_NVM, "Intel(R) Ethernet Controller I225(blankNVM)"), /* required last entry */ PVID_END }; diff --git a/sys/dev/imcsmb/imcsmb_pci.c b/sys/dev/imcsmb/imcsmb_pci.c --- a/sys/dev/imcsmb/imcsmb_pci.c +++ b/sys/dev/imcsmb/imcsmb_pci.c @@ -43,6 +43,7 @@ #include #include +#include #include @@ -100,7 +101,6 @@ */ /* PCIe device IDs for (Sandy,Ivy)bridge)-Xeon and (Has,Broad)well-Xeon */ -#define PCI_VENDOR_INTEL 0x8086 #define IMCSMB_PCI_DEV_ID_IMC0_SBX 0x3ca8 #define IMCSMB_PCI_DEV_ID_IMC0_IBX 0x0ea8 #define IMCSMB_PCI_DEV_ID_IMC0_HSX 0x2fa8 @@ -238,7 +238,7 @@ rc = ENXIO; - if (pci_get_vendor(dev) != PCI_VENDOR_INTEL) { + if (pci_get_vendor(dev) != PCI_VENDOR_INTEL_CORPORATION) { goto out; } diff --git a/sys/dev/intel/pchtherm.c b/sys/dev/intel/pchtherm.c --- a/sys/dev/intel/pchtherm.c +++ b/sys/dev/intel/pchtherm.c @@ -39,6 +39,7 @@ #include #include #include +#include #define PCHTHERM_REG_TEMP 0 #define PCHTHERM_REG_TSC 4 @@ -82,27 +83,27 @@ static const struct pci_device_table pchtherm_devices[] = { - { PCI_DEV(0x8086, 0x9c24), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x9c24), PCI_DESCR("Haswell Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x8c24), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x8c24), PCI_DESCR("Haswell Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x9ca4), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x9ca4), PCI_DESCR("Wildcat Point Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x9d31), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x9d31), PCI_DESCR("Skylake PCH Thermal Subsystem")}, - { PCI_DEV(0x8086, 0xa131), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0xa131), PCI_DESCR("Skylake PCH 100 Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x9df9), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x9df9), PCI_DESCR("CannonLake-LP Thermal Subsystem")}, - { PCI_DEV(0x8086, 0xa379), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0xa379), PCI_DESCR("CannonLake-H Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x02f9), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x02f9), PCI_DESCR("CometLake-LP Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x06f9), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x06f9), PCI_DESCR("CometLake-H Thermal Subsystem")}, - { PCI_DEV(0x8086, 0xa1b1), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0xa1b1), PCI_DESCR("Lewisburg Thermal Subsystem")}, - { PCI_DEV(0x8086, 0x8d24), + { PCI_DEV(PCI_VENDOR_INTEL_CORPORATION, 0x8d24), PCI_DESCR("Wellsburg Thermal Subsystem")}, }; diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -57,6 +57,7 @@ #include #include +#include #include #include @@ -101,7 +102,7 @@ }; static const struct ipw_ident ipw_ident_table[] = { - { 0x8086, 0x1043, "Intel(R) PRO/Wireless 2100 MiniPCI" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x1043, "Intel(R) PRO/Wireless 2100 MiniPCI" }, { 0, 0, NULL } }; diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -61,6 +61,7 @@ #include #include +#include #include #include @@ -122,10 +123,10 @@ }; static const struct iwi_ident iwi_ident_table[] = { - { 0x8086, 0x4220, "Intel(R) PRO/Wireless 2200BG" }, - { 0x8086, 0x4221, "Intel(R) PRO/Wireless 2225BG" }, - { 0x8086, 0x4223, "Intel(R) PRO/Wireless 2915ABG" }, - { 0x8086, 0x4224, "Intel(R) PRO/Wireless 2915ABG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4220, "Intel(R) PRO/Wireless 2200BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4221, "Intel(R) PRO/Wireless 2225BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4223, "Intel(R) PRO/Wireless 2915ABG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4224, "Intel(R) PRO/Wireless 2915ABG" }, { 0, 0, NULL } }; diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -129,6 +129,7 @@ #include #include +#include #include @@ -5768,7 +5769,6 @@ /* * Autoconf glue-sniffing */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_INTEL_WL_3160_1 0x08b3 #define PCI_PRODUCT_INTEL_WL_3160_2 0x08b4 #define PCI_PRODUCT_INTEL_WL_3165_1 0x3165 @@ -5814,7 +5814,7 @@ int i; for (i = 0; i < nitems(iwm_devices); i++) { - if (pci_get_vendor(dev) == PCI_VENDOR_INTEL && + if (pci_get_vendor(dev) == PCI_VENDOR_INTEL_CORPORATION && pci_get_device(dev) == iwm_devices[i].device) { device_set_desc(dev, iwm_devices[i].cfg->name); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -53,6 +53,7 @@ #include #include +#include #include #include @@ -81,49 +82,49 @@ }; static const struct iwn_ident iwn_ident_table[] = { - { 0x8086, IWN_DID_6x05_1, "Intel Centrino Advanced-N 6205" }, - { 0x8086, IWN_DID_1000_1, "Intel Centrino Wireless-N 1000" }, - { 0x8086, IWN_DID_1000_2, "Intel Centrino Wireless-N 1000" }, - { 0x8086, IWN_DID_6x05_2, "Intel Centrino Advanced-N 6205" }, - { 0x8086, IWN_DID_6050_1, "Intel Centrino Advanced-N + WiMAX 6250" }, - { 0x8086, IWN_DID_6050_2, "Intel Centrino Advanced-N + WiMAX 6250" }, - { 0x8086, IWN_DID_x030_1, "Intel Centrino Wireless-N 1030" }, - { 0x8086, IWN_DID_x030_2, "Intel Centrino Wireless-N 1030" }, - { 0x8086, IWN_DID_x030_3, "Intel Centrino Advanced-N 6230" }, - { 0x8086, IWN_DID_x030_4, "Intel Centrino Advanced-N 6230" }, - { 0x8086, IWN_DID_6150_1, "Intel Centrino Wireless-N + WiMAX 6150" }, - { 0x8086, IWN_DID_6150_2, "Intel Centrino Wireless-N + WiMAX 6150" }, - { 0x8086, IWN_DID_2x00_1, "Intel(R) Centrino(R) Wireless-N 2200 BGN" }, - { 0x8086, IWN_DID_2x00_2, "Intel(R) Centrino(R) Wireless-N 2200 BGN" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x05_1, "Intel Centrino Advanced-N 6205" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_1000_1, "Intel Centrino Wireless-N 1000" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_1000_2, "Intel Centrino Wireless-N 1000" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x05_2, "Intel Centrino Advanced-N 6205" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6050_1, "Intel Centrino Advanced-N + WiMAX 6250" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6050_2, "Intel Centrino Advanced-N + WiMAX 6250" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_x030_1, "Intel Centrino Wireless-N 1030" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_x030_2, "Intel Centrino Wireless-N 1030" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_x030_3, "Intel Centrino Advanced-N 6230" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_x030_4, "Intel Centrino Advanced-N 6230" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6150_1, "Intel Centrino Wireless-N + WiMAX 6150" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6150_2, "Intel Centrino Wireless-N + WiMAX 6150" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_2x00_1, "Intel(R) Centrino(R) Wireless-N 2200 BGN" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_2x00_2, "Intel(R) Centrino(R) Wireless-N 2200 BGN" }, /* XXX 2200D is IWN_SDID_2x00_4; there's no way to express this here! */ - { 0x8086, IWN_DID_2x30_1, "Intel Centrino Wireless-N 2230" }, - { 0x8086, IWN_DID_2x30_2, "Intel Centrino Wireless-N 2230" }, - { 0x8086, IWN_DID_130_1, "Intel Centrino Wireless-N 130" }, - { 0x8086, IWN_DID_130_2, "Intel Centrino Wireless-N 130" }, - { 0x8086, IWN_DID_100_1, "Intel Centrino Wireless-N 100" }, - { 0x8086, IWN_DID_100_2, "Intel Centrino Wireless-N 100" }, - { 0x8086, IWN_DID_105_1, "Intel Centrino Wireless-N 105" }, - { 0x8086, IWN_DID_105_2, "Intel Centrino Wireless-N 105" }, - { 0x8086, IWN_DID_135_1, "Intel Centrino Wireless-N 135" }, - { 0x8086, IWN_DID_135_2, "Intel Centrino Wireless-N 135" }, - { 0x8086, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965" }, - { 0x8086, IWN_DID_6x00_1, "Intel Centrino Ultimate-N 6300" }, - { 0x8086, IWN_DID_6x00_2, "Intel Centrino Advanced-N 6200" }, - { 0x8086, IWN_DID_4965_2, "Intel Wireless WiFi Link 4965" }, - { 0x8086, IWN_DID_4965_3, "Intel Wireless WiFi Link 4965" }, - { 0x8086, IWN_DID_5x00_1, "Intel WiFi Link 5100" }, - { 0x8086, IWN_DID_4965_4, "Intel Wireless WiFi Link 4965" }, - { 0x8086, IWN_DID_5x00_3, "Intel Ultimate N WiFi Link 5300" }, - { 0x8086, IWN_DID_5x00_4, "Intel Ultimate N WiFi Link 5300" }, - { 0x8086, IWN_DID_5x00_2, "Intel WiFi Link 5100" }, - { 0x8086, IWN_DID_6x00_3, "Intel Centrino Ultimate-N 6300" }, - { 0x8086, IWN_DID_6x00_4, "Intel Centrino Advanced-N 6200" }, - { 0x8086, IWN_DID_5x50_1, "Intel WiMAX/WiFi Link 5350" }, - { 0x8086, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350" }, - { 0x8086, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150" }, - { 0x8086, IWN_DID_5x50_4, "Intel WiMAX/WiFi Link 5150" }, - { 0x8086, IWN_DID_6035_1, "Intel Centrino Advanced 6235" }, - { 0x8086, IWN_DID_6035_2, "Intel Centrino Advanced 6235" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_2x30_1, "Intel Centrino Wireless-N 2230" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_2x30_2, "Intel Centrino Wireless-N 2230" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_130_1, "Intel Centrino Wireless-N 130" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_130_2, "Intel Centrino Wireless-N 130" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_100_1, "Intel Centrino Wireless-N 100" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_100_2, "Intel Centrino Wireless-N 100" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_105_1, "Intel Centrino Wireless-N 105" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_105_2, "Intel Centrino Wireless-N 105" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_135_1, "Intel Centrino Wireless-N 135" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_135_2, "Intel Centrino Wireless-N 135" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x00_1, "Intel Centrino Ultimate-N 6300" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x00_2, "Intel Centrino Advanced-N 6200" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_4965_2, "Intel Wireless WiFi Link 4965" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_4965_3, "Intel Wireless WiFi Link 4965" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x00_1, "Intel WiFi Link 5100" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_4965_4, "Intel Wireless WiFi Link 4965" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x00_3, "Intel Ultimate N WiFi Link 5300" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x00_4, "Intel Ultimate N WiFi Link 5300" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x00_2, "Intel WiFi Link 5100" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x00_3, "Intel Centrino Ultimate-N 6300" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6x00_4, "Intel Centrino Advanced-N 6200" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x50_1, "Intel WiMAX/WiFi Link 5350" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_5x50_4, "Intel WiMAX/WiFi Link 5150" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6035_1, "Intel Centrino Advanced 6235" }, + { PCI_VENDOR_INTEL_CORPORATION, IWN_DID_6035_2, "Intel Centrino Advanced 6235" }, { 0, 0, NULL } }; diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -39,6 +39,8 @@ #include "ixgbe_sriov.h" #include "ifdi_if.h" +#include + #include #include diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -39,6 +39,8 @@ #include "ixgbe.h" #include "ifdi_if.h" +#include + #include #include @@ -58,11 +60,11 @@ ************************************************************************/ static const pci_vendor_info_t ixv_vendor_info_array[] = { - PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_VF, "Intel(R) X520 82599 Virtual Function"), - PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X540_VF, "Intel(R) X540 Virtual Function"), - PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550_VF, "Intel(R) X550 Virtual Function"), - PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_X_VF, "Intel(R) X552 Virtual Function"), - PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_VF, "Intel(R) X553 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IXGBE_DEV_ID_82599_VF, "Intel(R) X520 82599 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IXGBE_DEV_ID_X540_VF, "Intel(R) X540 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IXGBE_DEV_ID_X550_VF, "Intel(R) X550 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IXGBE_DEV_ID_X550EM_X_VF, "Intel(R) X552 Virtual Function"), + PVID(PCI_VENDOR_INTEL_CORPORATION, IXGBE_DEV_ID_X550EM_A_VF, "Intel(R) X553 Virtual Function"), /* required last entry */ PVID_END }; diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c --- a/sys/dev/ixgbe/ixgbe_api.c +++ b/sys/dev/ixgbe/ixgbe_api.c @@ -32,6 +32,8 @@ ******************************************************************************/ +#include + #include "ixgbe_api.h" #include "ixgbe_common.h" @@ -141,7 +143,7 @@ DEBUGFUNC("ixgbe_set_mac_type\n"); - if (hw->vendor_id != IXGBE_INTEL_VENDOR_ID) { + if (hw->vendor_id != PCI_VENDOR_INTEL_CORPORATION) { ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED, "Unsupported vendor id: %x", hw->vendor_id); return IXGBE_ERR_DEVICE_NOT_SUPPORTED; diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -117,9 +117,6 @@ #define CMD_MEM_WRT_INVALIDATE 0x0010 /* BIT_4 */ #define PCI_COMMAND_REGISTER PCIR_COMMAND -/* Shared code dropped this define.. */ -#define IXGBE_INTEL_VENDOR_ID 0x8086 - /* Bunch of defines for shared code bogosity */ #define UNREFERENCED_PARAMETER(_p) #define UNREFERENCED_1PARAMETER(_p) diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -78,9 +78,6 @@ /* Override this by setting IOMEM in your ixgbe_osdep.h header */ #define IOMEM -/* Vendor ID */ -#define IXGBE_INTEL_VENDOR_ID 0x8086 - /* Device IDs */ #define IXGBE_DEV_ID_82598 0x10B6 #define IXGBE_DEV_ID_82598_BX 0x1508 diff --git a/sys/dev/ixl/i40e_common.c b/sys/dev/ixl/i40e_common.c --- a/sys/dev/ixl/i40e_common.c +++ b/sys/dev/ixl/i40e_common.c @@ -31,12 +31,13 @@ ******************************************************************************/ +#include + #include "i40e_type.h" #include "i40e_adminq.h" #include "i40e_prototype.h" #include "virtchnl.h" - /** * i40e_set_mac_type - Sets MAC type * @hw: pointer to the HW structure @@ -50,7 +51,7 @@ DEBUGFUNC("i40e_set_mac_type\n"); - if (hw->vendor_id == I40E_INTEL_VENDOR_ID) { + if (hw->vendor_id == PCI_VENDOR_INTEL_CORPORATION) { switch (hw->device_id) { case I40E_DEV_ID_SFP_XL710: case I40E_DEV_ID_QEMU: diff --git a/sys/dev/ixl/i40e_devids.h b/sys/dev/ixl/i40e_devids.h --- a/sys/dev/ixl/i40e_devids.h +++ b/sys/dev/ixl/i40e_devids.h @@ -34,9 +34,6 @@ #ifndef _I40E_DEVIDS_H_ #define _I40E_DEVIDS_H_ -/* Vendor ID */ -#define I40E_INTEL_VENDOR_ID 0x8086 - /* Device IDs */ #define I40E_DEV_ID_X710_N3000 0x0CF8 #define I40E_DEV_ID_XXV710_N3000 0x0D58 diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -31,6 +31,8 @@ ******************************************************************************/ +#include + #include "ixl.h" #include "ixl_pf.h" diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c --- a/sys/dev/mps/mps_pci.c +++ b/sys/dev/mps/mps_pci.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -125,13 +126,13 @@ // Add Customer specific vender/subdevice id before generic // (0xffff) vender/subdevice id. { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, - 0x8086, 0x3516, 0, "Intel(R) Integrated RAID Module RMS25JB080" }, + PCI_VENDOR_INTEL_CORPORATION, 0x3516, 0, "Intel(R) Integrated RAID Module RMS25JB080" }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, - 0x8086, 0x3517, 0, "Intel(R) Integrated RAID Module RMS25JB040" }, + PCI_VENDOR_INTEL_CORPORATION, 0x3517, 0, "Intel(R) Integrated RAID Module RMS25JB040" }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, - 0x8086, 0x3518, 0, "Intel(R) Integrated RAID Module RMS25KB080" }, + PCI_VENDOR_INTEL_CORPORATION, 0x3518, 0, "Intel(R) Integrated RAID Module RMS25KB080" }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, - 0x8086, 0x3519, 0, "Intel(R) Integrated RAID Module RMS25KB040" }, + PCI_VENDOR_INTEL_CORPORATION, 0x3519, 0, "Intel(R) Integrated RAID Module RMS25KB040" }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, 0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS2308" }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3, diff --git a/sys/dev/qat_c2xxx/qat.c b/sys/dev/qat_c2xxx/qat.c --- a/sys/dev/qat_c2xxx/qat.c +++ b/sys/dev/qat_c2xxx/qat.c @@ -85,6 +85,7 @@ #include #include +#include #include "qatreg.h" #include "qatvar.h" @@ -92,7 +93,6 @@ extern struct qat_hw qat_hw_c2xxx; -#define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_INTEL_C2000_IQIA_PHYS 0x1f18 static const struct qat_product { @@ -102,7 +102,7 @@ enum qat_chip_type qatp_chip; const struct qat_hw *qatp_hw; } qat_products[] = { - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_IQIA_PHYS, + { PCI_VENDOR_INTEL_CORPORATION, PCI_PRODUCT_INTEL_C2000_IQIA_PHYS, "Intel C2000 QuickAssist PF", QAT_CHIP_C2XXX, &qat_hw_c2xxx }, { 0, 0, NULL, 0, NULL }, diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -219,7 +220,7 @@ uint8_t mask; uint8_t enable; } hdac_pcie_snoop[] = { - { INTEL_VENDORID, 0x00, 0x00, 0x00 }, + { PCI_VENDOR_INTEL_CORPORATION, 0x00, 0x00, 0x00 }, { ATI_VENDORID, 0x42, 0xf8, 0x02 }, { AMD_VENDORID, 0x42, 0xf8, 0x02 }, { NVIDIA_VENDORID, 0x4e, 0xf0, 0x0f }, @@ -1203,7 +1204,7 @@ pci_enable_busmaster(dev); vendor = pci_get_vendor(dev); - if (vendor == INTEL_VENDORID) { + if (vendor == PCI_VENDOR_INTEL_CORPORATION) { /* TCSEL -> TC0 */ v = pci_read_config(dev, 0x44, 1); pci_write_config(dev, 0x44, v & 0xf8, 1); diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -37,6 +37,7 @@ #include #include +#include /* -------------------------------------------------------------------- */ @@ -50,7 +51,6 @@ #define ICH_MIN_BLKCNT 2 #define ICH_MIN_BLKSZ 64 -#define INTEL_VENDORID 0x8086 #define SIS_VENDORID 0x1039 #define NVIDIA_VENDORID 0x10de #define AMD_VENDORID 0x1022 @@ -103,25 +103,25 @@ #define PROBE_LOW 0x01 char *name; } ich_devs[] = { - { INTEL_VENDORID, INTEL_82440MX, 0, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82440MX, 0, "Intel 440MX" }, - { INTEL_VENDORID, INTEL_82801AA, 0, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801AA, 0, "Intel ICH (82801AA)" }, - { INTEL_VENDORID, INTEL_82801AB, 0, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801AB, 0, "Intel ICH (82801AB)" }, - { INTEL_VENDORID, INTEL_82801BA, 0, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801BA, 0, "Intel ICH2 (82801BA)" }, - { INTEL_VENDORID, INTEL_82801CA, 0, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801CA, 0, "Intel ICH3 (82801CA)" }, - { INTEL_VENDORID, INTEL_82801DB, PROBE_LOW, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801DB, PROBE_LOW, "Intel ICH4 (82801DB)" }, - { INTEL_VENDORID, INTEL_82801EB, PROBE_LOW, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801EB, PROBE_LOW, "Intel ICH5 (82801EB)" }, - { INTEL_VENDORID, INTEL_6300ESB, PROBE_LOW, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_6300ESB, PROBE_LOW, "Intel 6300ESB" }, - { INTEL_VENDORID, INTEL_82801FB, PROBE_LOW, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801FB, PROBE_LOW, "Intel ICH6 (82801FB)" }, - { INTEL_VENDORID, INTEL_82801GB, PROBE_LOW, + { PCI_VENDOR_INTEL_CORPORATION, INTEL_82801GB, PROBE_LOW, "Intel ICH7 (82801GB)" }, { SIS_VENDORID, SIS_7012, 0, "SiS 7012" }, @@ -834,7 +834,7 @@ if ((stat & ICH_GLOB_STA_PCR) == 0) { /* ICH4/ICH5 may fail when busmastering is enabled. Continue */ - if (sc->vendor == INTEL_VENDORID && ( + if (sc->vendor == PCI_VENDOR_INTEL_CORPORATION && ( sc->devid == INTEL_82801DB || sc->devid == INTEL_82801EB || sc->devid == INTEL_6300ESB || sc->devid == INTEL_82801FB || sc->devid == INTEL_82801GB)) { @@ -912,7 +912,7 @@ * * http://www.intel.com/design/chipsets/specupdt/245051.htm */ - if (vendor == INTEL_VENDORID && devid == INTEL_82440MX) + if (vendor == PCI_VENDOR_INTEL_CORPORATION && devid == INTEL_82440MX) sc->flags |= ICH_DMA_NOCACHE; /* @@ -928,7 +928,7 @@ * but doing so will mess things up here. ich4 has enough new * features it warrants it's own driver. */ - if (vendor == INTEL_VENDORID && (devid == INTEL_82801DB || + if (vendor == PCI_VENDOR_INTEL_CORPORATION && (devid == INTEL_82801DB || devid == INTEL_82801EB || devid == INTEL_6300ESB || devid == INTEL_82801FB || devid == INTEL_82801GB)) { sc->nambarid = PCIR_MMBAR; diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -135,51 +136,51 @@ { 0x1d0f, 0x8250, 0x1d0f, 0, "Amazon PCI serial device", 0x10 }, { 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10, 8 * DEFAULT_RCLK }, -{ 0x8086, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x108f, 0xffff, 0, "Intel AMT - SOL", 0x10 }, -{ 0x8086, 0x19d8, 0xffff, 0, "Intel Denverton UART", 0x10 }, -{ 0x8086, 0x1c3d, 0xffff, 0, "Intel AMT - KT Controller", 0x10 }, -{ 0x8086, 0x1d3d, 0xffff, 0, "Intel C600/X79 Series Chipset KT Controller", +{ PCI_VENDOR_INTEL_CORPORATION, 0x108f, 0xffff, 0, "Intel AMT - SOL", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x19d8, 0xffff, 0, "Intel Denverton UART", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x1c3d, 0xffff, 0, "Intel AMT - KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x1d3d, 0xffff, 0, "Intel C600/X79 Series Chipset KT Controller", 0x10 }, -{ 0x8086, 0x1e3d, 0xffff, 0, "Intel Panther Point KT Controller", 0x10 }, -{ 0x8086, 0x228a, 0xffff, 0, "Intel Cherryview SIO HSUART#1", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x1e3d, 0xffff, 0, "Intel Panther Point KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x228a, 0xffff, 0, "Intel Cherryview SIO HSUART#1", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x228c, 0xffff, 0, "Intel Cherryview SIO HSUART#2", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x228c, 0xffff, 0, "Intel Cherryview SIO HSUART#2", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x2a07, 0xffff, 0, "Intel AMT - PM965/GM965 KT Controller", 0x10 }, -{ 0x8086, 0x2a47, 0xffff, 0, "Mobile 4 Series Chipset KT Controller", 0x10 }, -{ 0x8086, 0x2e17, 0xffff, 0, "4 Series Chipset Serial KT Controller", 0x10 }, -{ 0x8086, 0x31bc, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 0", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x2a07, 0xffff, 0, "Intel AMT - PM965/GM965 KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x2a47, 0xffff, 0, "Mobile 4 Series Chipset KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x2e17, 0xffff, 0, "4 Series Chipset Serial KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x31bc, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 0", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x31be, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 1", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x31be, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 1", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x31c0, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 2", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x31c0, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 2", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x31ee, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 3", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x31ee, 0xffff, 0, "Intel Gemini Lake SIO/LPSS UART 3", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x3b67, 0xffff, 0, "5 Series/3400 Series Chipset KT Controller", +{ PCI_VENDOR_INTEL_CORPORATION, 0x3b67, 0xffff, 0, "5 Series/3400 Series Chipset KT Controller", 0x10 }, -{ 0x8086, 0x5abc, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 0", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x5abc, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 0", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x5abe, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 1", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x5abe, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 1", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x5ac0, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 2", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x5ac0, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 2", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x5aee, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 3", 0x10, +{ PCI_VENDOR_INTEL_CORPORATION, 0x5aee, 0xffff, 0, "Intel Apollo Lake SIO/LPSS UART 3", 0x10, 24 * DEFAULT_RCLK, 2 }, -{ 0x8086, 0x8811, 0xffff, 0, "Intel EG20T Serial Port 0", 0x10 }, -{ 0x8086, 0x8812, 0xffff, 0, "Intel EG20T Serial Port 1", 0x10 }, -{ 0x8086, 0x8813, 0xffff, 0, "Intel EG20T Serial Port 2", 0x10 }, -{ 0x8086, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 }, -{ 0x8086, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 }, -{ 0x8086, 0x8cbd, 0xffff, 0, "Intel Wildcat Point KT Controller", 0x10 }, -{ 0x8086, 0x8d3d, 0xffff, 0, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8811, 0xffff, 0, "Intel EG20T Serial Port 0", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8812, 0xffff, 0, "Intel EG20T Serial Port 1", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8813, 0xffff, 0, "Intel EG20T Serial Port 2", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8cbd, 0xffff, 0, "Intel Wildcat Point KT Controller", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0x8d3d, 0xffff, 0, "Intel Corporation C610/X99 series chipset KT Controller", 0x10 }, -{ 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, -{ 0x8086, 0xa13d, 0xffff, 0, +{ PCI_VENDOR_INTEL_CORPORATION, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, +{ PCI_VENDOR_INTEL_CORPORATION, 0xa13d, 0xffff, 0, "100 Series/C230 Series Chipset Family KT Redirection", 0x10 | PCI_NO_MSI }, { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 }, diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -64,6 +64,8 @@ #include #include +#include + #include #include @@ -85,7 +87,6 @@ #define PCI_EHCI_VENDORID_ATI 0x1002 #define PCI_EHCI_VENDORID_CMDTECH 0x1095 #define PCI_EHCI_VENDORID_HYGON 0x1d94 -#define PCI_EHCI_VENDORID_INTEL 0x8086 #define PCI_EHCI_VENDORID_NEC 0x1033 #define PCI_EHCI_VENDORID_OPTI 0x1045 #define PCI_EHCI_VENDORID_PHILIPS 0x1131 @@ -391,7 +392,7 @@ case PCI_EHCI_VENDORID_HYGON: sprintf(sc->sc_vendor, "Hygon"); break; - case PCI_EHCI_VENDORID_INTEL: + case PCI_VENDOR_INTEL_CORPORATION: sprintf(sc->sc_vendor, "Intel"); break; case PCI_EHCI_VENDORID_NEC: diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -60,6 +60,8 @@ #include #include +#include + #include #include @@ -76,7 +78,6 @@ #include #include "usb_if.h" -#define PCI_UHCI_VENDORID_INTEL 0x8086 #define PCI_UHCI_VENDORID_HP 0x103c #define PCI_UHCI_VENDORID_VIA 0x1106 #define PCI_UHCI_VENDORID_VMWARE 0x15ad @@ -336,7 +337,7 @@ */ device_set_desc(sc->sc_bus.bdev, uhci_pci_match(self)); switch (pci_get_vendor(self)) { - case PCI_UHCI_VENDORID_INTEL: + case PCI_VENDOR_INTEL_CORPORATION: sprintf(sc->sc_vendor, "Intel"); break; case PCI_UHCI_VENDORID_HP: diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -45,6 +45,8 @@ #include #include +#include + #include #include @@ -397,7 +399,7 @@ case PCI_XHCI_VENDORID_AMD: strlcpy(sc->sc_vendor, "AMD", sizeof(sc->sc_vendor)); break; - case PCI_XHCI_VENDORID_INTEL: + case PCI_VENDOR_INTEL_CORPORATION: strlcpy(sc->sc_vendor, "Intel", sizeof(sc->sc_vendor)); break; case PCI_XHCI_VENDORID_VMWARE: diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -104,14 +105,14 @@ "Maximum number of MSI-X vectors per device"); static struct vmd_type vmd_devs[] = { - { 0x8086, 0x201d, "Intel Volume Management Device", 0 }, - { 0x8086, 0x28c0, "Intel Volume Management Device", BUS_RESTRICT | CAN_BYPASS_MSI }, - { 0x8086, 0x467f, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, - { 0x8086, 0x4c3d, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, - { 0x8086, 0x7d0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, - { 0x8086, 0x9a0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, - { 0x8086, 0xa77f, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, - { 0x8086, 0xad0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0x201d, "Intel Volume Management Device", 0 }, + { PCI_VENDOR_INTEL_CORPORATION, 0x28c0, "Intel Volume Management Device", BUS_RESTRICT | CAN_BYPASS_MSI }, + { PCI_VENDOR_INTEL_CORPORATION, 0x467f, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4c3d, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0x7d0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0x9a0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0xa77f, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, + { PCI_VENDOR_INTEL_CORPORATION, 0xad0b, "Intel Volume Management Device", BUS_RESTRICT | VECTOR_OFFSET }, { 0, 0, NULL, 0 } }; diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -81,6 +81,7 @@ #include #include +#include #include #include @@ -115,13 +116,13 @@ static const struct wpi_ident wpi_ident_table[] = { /* The below entries support ABG regardless of the subid */ - { 0x8086, 0x4222, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, - { 0x8086, 0x4227, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4222, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4227, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, /* The below entries only support BG */ - { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG" }, - { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG" }, - { 0x8086, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG" }, - { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG" }, + { PCI_VENDOR_INTEL_CORPORATION, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG" }, { 0, 0, 0, NULL } };