Quantcast

add new em(4) variant for X270

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

add new em(4) variant for X270

Claudio Jeker
The X270 seems to have a new I219-LM variant that em(4) doesn't know.
Adding it to the driver seems to be enough.

OK?
--
:wq Claudio

OpenBSD 6.1-beta (GENERIC.MP) #1: Sat Mar 18 15:02:14 CET 2017
    [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 17054765056 (16264MB)
avail mem = 16533217280 (15767MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 3.0 @ 0xca7ae000 (62 entries)
bios0: vendor LENOVO version "R0IET30W (1.08 )" date 01/16/2017
bios0: LENOVO 20HMS03V00
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP UEFI SSDT SSDT HPET APIC MCFG ECDT SSDT SSDT BOOT BATB SSDT SSDT SSDT WSMT DBGP DBG2 POAT DMAR ASF! FPDT UEFI
acpi0: wakeup devices GLAN(S4) XHC_(S3) XDCI(S4) HDAS(S4) RP01(S4) RP02(S4) RP04(S4) RP05(S4) RP06(S4) RP07(S4) RP08(S4) RP09(S4) RP10(S4) RP11(S4) RP12(S4) RP13(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 23999999 Hz
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: TSC frequency 2904000000 Hz
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 23MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 0, core 1, package 0
cpu2 at mainbus0: apid 1 (application processor)
cpu2: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 1, core 0, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 120 pins
acpimcfg0 at acpi0 addr 0xf0000000, bus 0-63
acpiec0 at acpi0
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 2 (RP01)
acpiprt2 at acpi0: bus -1 (RP02)
acpiprt3 at acpi0: bus 3 (RP03)
acpiprt4 at acpi0: bus -1 (RP04)
acpiprt5 at acpi0: bus 4 (RP05)
acpiprt6 at acpi0: bus -1 (RP06)
acpiprt7 at acpi0: bus -1 (RP07)
acpiprt8 at acpi0: bus -1 (RP08)
acpiprt9 at acpi0: bus -1 (RP09)
acpiprt10 at acpi0: bus -1 (RP10)
acpiprt11 at acpi0: bus -1 (RP11)
acpiprt12 at acpi0: bus -1 (RP12)
acpiprt13 at acpi0: bus -1 (RP13)
acpiprt14 at acpi0: bus -1 (RP14)
acpiprt15 at acpi0: bus -1 (RP15)
acpiprt16 at acpi0: bus -1 (RP16)
acpiprt17 at acpi0: bus -1 (RP17)
acpiprt18 at acpi0: bus -1 (RP18)
acpiprt19 at acpi0: bus -1 (RP19)
acpiprt20 at acpi0: bus -1 (RP20)
acpiprt21 at acpi0: bus -1 (RP21)
acpiprt22 at acpi0: bus -1 (RP22)
acpiprt23 at acpi0: bus -1 (RP23)
acpiprt24 at acpi0: bus -1 (RP24)
acpicpu0 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu1 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu2 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu3 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpipwrres0 at acpi0: PUBS, resource for XHC_
acpipwrres1 at acpi0: WRST
acpipwrres2 at acpi0: WRST
acpitz0 at acpi0: critical temperature is 128 degC
acpithinkpad0 at acpi0
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT0 model "45N1113" serial 13068 type LION oem "LGC"
acpibat1 at acpi0: BAT1 model "45N1127" serial 10565 type LION oem "LGC"
"INT3F0D" at acpi0 not configured
"LEN0071" at acpi0 not configured
"LEN2046" at acpi0 not configured
acpibtn0 at acpi0: SLPB
"PNP0C14" at acpi0 not configured
acpibtn1 at acpi0: LID_
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"INT3394" at acpi0 not configured
acpivideo0 at acpi0: GFX0
acpivout at acpivideo0 not configured
cpu0: Enhanced SpeedStep 2904 MHz: speeds: 2701, 2700, 2600, 2500, 2400, 2200, 2000, 1800, 1600, 1500, 1300, 1100, 800, 700, 600, 400 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 vendor "Intel", unknown product 0x5904 rev 0x02
vendor "Intel", unknown product 0x5916 (class display subclass VGA, rev 0x02) at pci0 dev 2 function 0 not configured
xhci0 at pci0 dev 20 function 0 "Intel 100 Series xHCI" rev 0x21: msi
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
pchtemp0 at pci0 dev 20 function 2 "Intel 100 Series Thermal" rev 0x21
"Intel 100 Series MEI" rev 0x21 at pci0 dev 22 function 0 not configured
ppb0 at pci0 dev 28 function 0 "Intel 100 Series PCIE" rev 0xf1: msi
pci1 at ppb0 bus 2
rtsx0 at pci1 dev 0 function 0 "Realtek RTS522A Card Reader" rev 0x01: msi
sdmmc0 at rtsx0: 4-bit
ppb1 at pci0 dev 28 function 2 "Intel 100 Series PCIE" rev 0xf1: msi
pci2 at ppb1 bus 3
vendor "Intel", unknown product 0x24fd (class network subclass miscellaneous, rev 0x78) at pci2 dev 0 function 0 not configured
ppb2 at pci0 dev 28 function 4 "Intel 100 Series PCIE" rev 0xf1: msi
pci3 at ppb2 bus 4
nvme0 at pci3 dev 0 function 0 vendor "Toshiba", unknown product 0x0115 rev 0x01: msi, NVMe 1.1
nvme0: THNSF5512GPUK TOSHIBA, firmware 51025KLA, serial Y6GS1092TANT
scsibus1 at nvme0: 1 targets
sd0 at scsibus1 targ 0 lun 0: <NVMe, THNSF5512GPUK TO, 5102> SCSI4 0/direct fixed
sd0: 488386MB, 512 bytes/sector, 1000215217 sectors
pcib0 at pci0 dev 31 function 0 vendor "Intel", unknown product 0x9d58 rev 0x21
"Intel 100 Series PMC" rev 0x21 at pci0 dev 31 function 2 not configured
azalia0 at pci0 dev 31 function 3 vendor "Intel", unknown product 0x9d71 rev 0x21: msi
azalia0: codecs: Realtek/0x0298, Intel/0x280b, using Realtek/0x0298
audio0 at azalia0
ichiic0 at pci0 dev 31 function 4 "Intel 100 Series SMBus" rev 0x21: apic 2 int 16
iic0 at ichiic0
em0 at pci0 dev 31 function 6 "Intel I219-LM3" rev 0x21: msi, address c8:5b:76:ce:98:a5
isa0 at pcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
pms0 at pckbc0 (aux slot)
wsmouse0 at pms0 mux 0
wsmouse1 at pms0 mux 0
pms0: Synaptics clickpad, firmware 8.2
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
efifb0 at mainbus0: 1920x1080, 32bpp
wsdisplay0 at efifb0 mux 1: console (std, vt100 emulation), using wskbd0
wsdisplay0: screen 1-5 added (std, vt100 emulation)
ugen0 at uhub0 port 7 "Intel Bluetooth" rev 2.00/0.10 addr 2
uvideo0 at uhub0 port 8 configuration 1 interface 0 "SunplusIT Inc Integrated Camera" rev 2.00/0.10 addr 3
video0 at uvideo0
ugen1 at uhub0 port 9 "Validity Sensors product 0x0097" rev 2.00/1.64 addr 4
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006> SCSI2 0/direct fixed
sd1: 409601MB, 512 bytes/sector, 838864553 sectors
root on sd1a (9189e27733f242f7.a) swap on sd1b dump on sd1b


Index: dev/pci/if_em.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em.c,v
retrieving revision 1.334
diff -u -p -r1.334 if_em.c
--- dev/pci/if_em.c 24 Jan 2017 03:57:35 -0000 1.334
+++ dev/pci/if_em.c 18 Mar 2017 13:54:36 -0000
@@ -149,6 +149,7 @@ const struct pci_matchid em_devices[] =
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2 },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3 },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES },
Index: dev/pci/if_em_hw.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em_hw.c,v
retrieving revision 1.92
diff -u -p -r1.92 if_em_hw.c
--- dev/pci/if_em_hw.c 23 Aug 2016 04:04:23 -0000 1.92
+++ dev/pci/if_em_hw.c 18 Mar 2017 13:55:40 -0000
@@ -615,6 +615,7 @@ em_set_mac_type(struct em_hw *hw)
  case E1000_DEV_ID_PCH_SPT_I219_V:
  case E1000_DEV_ID_PCH_SPT_I219_LM2:
  case E1000_DEV_ID_PCH_SPT_I219_V2:
+ case E1000_DEV_ID_PCH_SPT_I219_LM3:
  hw->mac_type = em_pch_spt;
  break;
  case E1000_DEV_ID_EP80579_LAN_1:
Index: dev/pci/if_em_hw.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em_hw.h,v
retrieving revision 1.68
diff -u -p -r1.68 if_em_hw.h
--- dev/pci/if_em_hw.h 18 Feb 2016 14:24:39 -0000 1.68
+++ dev/pci/if_em_hw.h 18 Mar 2017 13:55:20 -0000
@@ -559,6 +559,7 @@ int32_t em_check_phy_reset_block(struct
 #define E1000_DEV_ID_PCH_SPT_I219_V      0x1570
 #define E1000_DEV_ID_PCH_SPT_I219_LM2    0x15B7
 #define E1000_DEV_ID_PCH_SPT_I219_V2     0x15B8
+#define E1000_DEV_ID_PCH_SPT_I219_LM3    0x15D8
 #define E1000_DEV_ID_82575EB_PT          0x10A7
 #define E1000_DEV_ID_82575EB_PF          0x10A9
 #define E1000_DEV_ID_82575GB_QP          0x10D6
Index: dev/pci/pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1812
diff -u -p -r1.1812 pcidevs
--- dev/pci/pcidevs 13 Jan 2017 14:19:42 -0000 1.1812
+++ dev/pci/pcidevs 18 Mar 2017 13:53:51 -0000
@@ -3392,6 +3392,7 @@ product INTEL X550EM_A_SGMII_L 0x15c7 X5
 product INTEL X550EM_A_10G_T 0x15c8 X553 10GBaseT
 product INTEL X550EM_A_SFP 0x15ce X553 SFP+
 product INTEL X550T1 0x15d1 X550T
+product INTEL I219_LM3 0x15d8 I219-LM3
 product INTEL CORE5G_H_PCIE_X16 0x1601 Core 5G PCIE
 product INTEL CORE5G_M_GT1_1 0x1602 HD Graphics
 product INTEL CORE5G_HB_1 0x1604 Core 5G Host
Index: dev/pci/pcidevs.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
retrieving revision 1.1806
diff -u -p -r1.1806 pcidevs.h
--- dev/pci/pcidevs.h 13 Jan 2017 14:21:48 -0000 1.1806
+++ dev/pci/pcidevs.h 18 Mar 2017 13:55:46 -0000
@@ -3397,6 +3397,7 @@
 #define PCI_PRODUCT_INTEL_X550EM_A_10G_T 0x15c8 /* X553 10GBaseT */
 #define PCI_PRODUCT_INTEL_X550EM_A_SFP 0x15ce /* X553 SFP+ */
 #define PCI_PRODUCT_INTEL_X550T1 0x15d1 /* X550T */
+#define PCI_PRODUCT_INTEL_I219_LM3 0x15d8 /* I219-LM3 */
 #define PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16 0x1601 /* Core 5G PCIE */
 #define PCI_PRODUCT_INTEL_CORE5G_M_GT1_1 0x1602 /* HD Graphics */
 #define PCI_PRODUCT_INTEL_CORE5G_HB_1 0x1604 /* Core 5G Host */
Index: dev/pci/pcidevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
retrieving revision 1.1801
diff -u -p -r1.1801 pcidevs_data.h
--- dev/pci/pcidevs_data.h 13 Jan 2017 14:21:48 -0000 1.1801
+++ dev/pci/pcidevs_data.h 18 Mar 2017 13:55:46 -0000
@@ -11104,6 +11104,10 @@ static const struct pci_known_product pc
     "X550T",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3,
+    "I219-LM3",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16,
     "Core 5G PCIE",
  },

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: add new em(4) variant for X270

Jonathan Gray-11
On Sat, Mar 18, 2017 at 04:29:56PM +0100, Claudio Jeker wrote:
> The X270 seems to have a new I219-LM variant that em(4) doesn't know.
> Adding it to the driver seems to be enough.
>
> OK?

Can you also add the other variants we don't match and keep the same
name Intel uses?

At the moment we match

PCI_PRODUCT_INTEL_I219_LM
PCI_PRODUCT_INTEL_I219_V
PCI_PRODUCT_INTEL_I219_LM2
PCI_PRODUCT_INTEL_I219_V2

The board_pch_spt variants we lack are

#define E1000_DEV_ID_PCH_LBG_I219_LM3 0x15B9 /* LBG PCH */
#define E1000_DEV_ID_PCH_SPT_I219_LM4 0x15D7
#define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8
#define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3
#define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6

You've called the V4 variant V3 (Intel doesn't list a V3).

> --
> :wq Claudio
>
> OpenBSD 6.1-beta (GENERIC.MP) #1: Sat Mar 18 15:02:14 CET 2017
>     [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 17054765056 (16264MB)
> avail mem = 16533217280 (15767MB)
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 3.0 @ 0xca7ae000 (62 entries)
> bios0: vendor LENOVO version "R0IET30W (1.08 )" date 01/16/2017
> bios0: LENOVO 20HMS03V00
> acpi0 at bios0: rev 2
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP UEFI SSDT SSDT HPET APIC MCFG ECDT SSDT SSDT BOOT BATB SSDT SSDT SSDT WSMT DBGP DBG2 POAT DMAR ASF! FPDT UEFI
> acpi0: wakeup devices GLAN(S4) XHC_(S3) XDCI(S4) HDAS(S4) RP01(S4) RP02(S4) RP04(S4) RP05(S4) RP06(S4) RP07(S4) RP08(S4) RP09(S4) RP10(S4) RP11(S4) RP12(S4) RP13(S4) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpihpet0 at acpi0: 23999999 Hz
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
> cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
> cpu0: 256KB 64b/line 8-way L2 cache
> cpu0: TSC frequency 2904000000 Hz
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
> cpu0: apic clock running at 23MHz
> cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
> cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
> cpu1: 256KB 64b/line 8-way L2 cache
> cpu1: smt 0, core 1, package 0
> cpu2 at mainbus0: apid 1 (application processor)
> cpu2: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
> cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
> cpu2: 256KB 64b/line 8-way L2 cache
> cpu2: smt 1, core 0, package 0
> cpu3 at mainbus0: apid 3 (application processor)
> cpu3: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz, 2904.00 MHz
> cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SENSOR,ARAT
> cpu3: 256KB 64b/line 8-way L2 cache
> cpu3: smt 1, core 1, package 0
> ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 120 pins
> acpimcfg0 at acpi0 addr 0xf0000000, bus 0-63
> acpiec0 at acpi0
> acpiprt0 at acpi0: bus 0 (PCI0)
> acpiprt1 at acpi0: bus 2 (RP01)
> acpiprt2 at acpi0: bus -1 (RP02)
> acpiprt3 at acpi0: bus 3 (RP03)
> acpiprt4 at acpi0: bus -1 (RP04)
> acpiprt5 at acpi0: bus 4 (RP05)
> acpiprt6 at acpi0: bus -1 (RP06)
> acpiprt7 at acpi0: bus -1 (RP07)
> acpiprt8 at acpi0: bus -1 (RP08)
> acpiprt9 at acpi0: bus -1 (RP09)
> acpiprt10 at acpi0: bus -1 (RP10)
> acpiprt11 at acpi0: bus -1 (RP11)
> acpiprt12 at acpi0: bus -1 (RP12)
> acpiprt13 at acpi0: bus -1 (RP13)
> acpiprt14 at acpi0: bus -1 (RP14)
> acpiprt15 at acpi0: bus -1 (RP15)
> acpiprt16 at acpi0: bus -1 (RP16)
> acpiprt17 at acpi0: bus -1 (RP17)
> acpiprt18 at acpi0: bus -1 (RP18)
> acpiprt19 at acpi0: bus -1 (RP19)
> acpiprt20 at acpi0: bus -1 (RP20)
> acpiprt21 at acpi0: bus -1 (RP21)
> acpiprt22 at acpi0: bus -1 (RP22)
> acpiprt23 at acpi0: bus -1 (RP23)
> acpiprt24 at acpi0: bus -1 (RP24)
> acpicpu0 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
> acpicpu1 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
> acpicpu2 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
> acpicpu3 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
> acpipwrres0 at acpi0: PUBS, resource for XHC_
> acpipwrres1 at acpi0: WRST
> acpipwrres2 at acpi0: WRST
> acpitz0 at acpi0: critical temperature is 128 degC
> acpithinkpad0 at acpi0
> acpiac0 at acpi0: AC unit online
> acpibat0 at acpi0: BAT0 model "45N1113" serial 13068 type LION oem "LGC"
> acpibat1 at acpi0: BAT1 model "45N1127" serial 10565 type LION oem "LGC"
> "INT3F0D" at acpi0 not configured
> "LEN0071" at acpi0 not configured
> "LEN2046" at acpi0 not configured
> acpibtn0 at acpi0: SLPB
> "PNP0C14" at acpi0 not configured
> acpibtn1 at acpi0: LID_
> "PNP0C14" at acpi0 not configured
> "PNP0C14" at acpi0 not configured
> "PNP0C14" at acpi0 not configured
> "INT3394" at acpi0 not configured
> acpivideo0 at acpi0: GFX0
> acpivout at acpivideo0 not configured
> cpu0: Enhanced SpeedStep 2904 MHz: speeds: 2701, 2700, 2600, 2500, 2400, 2200, 2000, 1800, 1600, 1500, 1300, 1100, 800, 700, 600, 400 MHz
> pci0 at mainbus0 bus 0
> pchb0 at pci0 dev 0 function 0 vendor "Intel", unknown product 0x5904 rev 0x02
> vendor "Intel", unknown product 0x5916 (class display subclass VGA, rev 0x02) at pci0 dev 2 function 0 not configured
> xhci0 at pci0 dev 20 function 0 "Intel 100 Series xHCI" rev 0x21: msi
> usb0 at xhci0: USB revision 3.0
> uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
> pchtemp0 at pci0 dev 20 function 2 "Intel 100 Series Thermal" rev 0x21
> "Intel 100 Series MEI" rev 0x21 at pci0 dev 22 function 0 not configured
> ppb0 at pci0 dev 28 function 0 "Intel 100 Series PCIE" rev 0xf1: msi
> pci1 at ppb0 bus 2
> rtsx0 at pci1 dev 0 function 0 "Realtek RTS522A Card Reader" rev 0x01: msi
> sdmmc0 at rtsx0: 4-bit
> ppb1 at pci0 dev 28 function 2 "Intel 100 Series PCIE" rev 0xf1: msi
> pci2 at ppb1 bus 3
> vendor "Intel", unknown product 0x24fd (class network subclass miscellaneous, rev 0x78) at pci2 dev 0 function 0 not configured
> ppb2 at pci0 dev 28 function 4 "Intel 100 Series PCIE" rev 0xf1: msi
> pci3 at ppb2 bus 4
> nvme0 at pci3 dev 0 function 0 vendor "Toshiba", unknown product 0x0115 rev 0x01: msi, NVMe 1.1
> nvme0: THNSF5512GPUK TOSHIBA, firmware 51025KLA, serial Y6GS1092TANT
> scsibus1 at nvme0: 1 targets
> sd0 at scsibus1 targ 0 lun 0: <NVMe, THNSF5512GPUK TO, 5102> SCSI4 0/direct fixed
> sd0: 488386MB, 512 bytes/sector, 1000215217 sectors
> pcib0 at pci0 dev 31 function 0 vendor "Intel", unknown product 0x9d58 rev 0x21
> "Intel 100 Series PMC" rev 0x21 at pci0 dev 31 function 2 not configured
> azalia0 at pci0 dev 31 function 3 vendor "Intel", unknown product 0x9d71 rev 0x21: msi
> azalia0: codecs: Realtek/0x0298, Intel/0x280b, using Realtek/0x0298
> audio0 at azalia0
> ichiic0 at pci0 dev 31 function 4 "Intel 100 Series SMBus" rev 0x21: apic 2 int 16
> iic0 at ichiic0
> em0 at pci0 dev 31 function 6 "Intel I219-LM3" rev 0x21: msi, address c8:5b:76:ce:98:a5
> isa0 at pcib0
> isadma0 at isa0
> com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
> pckbc0 at isa0 port 0x60/5 irq 1 irq 12
> pckbd0 at pckbc0 (kbd slot)
> wskbd0 at pckbd0: console keyboard
> pms0 at pckbc0 (aux slot)
> wsmouse0 at pms0 mux 0
> wsmouse1 at pms0 mux 0
> pms0: Synaptics clickpad, firmware 8.2
> pcppi0 at isa0 port 0x61
> spkr0 at pcppi0
> vmm0 at mainbus0: VMX/EPT
> efifb0 at mainbus0: 1920x1080, 32bpp
> wsdisplay0 at efifb0 mux 1: console (std, vt100 emulation), using wskbd0
> wsdisplay0: screen 1-5 added (std, vt100 emulation)
> ugen0 at uhub0 port 7 "Intel Bluetooth" rev 2.00/0.10 addr 2
> uvideo0 at uhub0 port 8 configuration 1 interface 0 "SunplusIT Inc Integrated Camera" rev 2.00/0.10 addr 3
> video0 at uvideo0
> ugen1 at uhub0 port 9 "Validity Sensors product 0x0097" rev 2.00/1.64 addr 4
> vscsi0 at root
> scsibus2 at vscsi0: 256 targets
> softraid0 at root
> scsibus3 at softraid0: 256 targets
> sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006> SCSI2 0/direct fixed
> sd1: 409601MB, 512 bytes/sector, 838864553 sectors
> root on sd1a (9189e27733f242f7.a) swap on sd1b dump on sd1b
>
>
> Index: dev/pci/if_em.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em.c,v
> retrieving revision 1.334
> diff -u -p -r1.334 if_em.c
> --- dev/pci/if_em.c 24 Jan 2017 03:57:35 -0000 1.334
> +++ dev/pci/if_em.c 18 Mar 2017 13:54:36 -0000
> @@ -149,6 +149,7 @@ const struct pci_matchid em_devices[] =
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES },
> Index: dev/pci/if_em_hw.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em_hw.c,v
> retrieving revision 1.92
> diff -u -p -r1.92 if_em_hw.c
> --- dev/pci/if_em_hw.c 23 Aug 2016 04:04:23 -0000 1.92
> +++ dev/pci/if_em_hw.c 18 Mar 2017 13:55:40 -0000
> @@ -615,6 +615,7 @@ em_set_mac_type(struct em_hw *hw)
>   case E1000_DEV_ID_PCH_SPT_I219_V:
>   case E1000_DEV_ID_PCH_SPT_I219_LM2:
>   case E1000_DEV_ID_PCH_SPT_I219_V2:
> + case E1000_DEV_ID_PCH_SPT_I219_LM3:
>   hw->mac_type = em_pch_spt;
>   break;
>   case E1000_DEV_ID_EP80579_LAN_1:
> Index: dev/pci/if_em_hw.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em_hw.h,v
> retrieving revision 1.68
> diff -u -p -r1.68 if_em_hw.h
> --- dev/pci/if_em_hw.h 18 Feb 2016 14:24:39 -0000 1.68
> +++ dev/pci/if_em_hw.h 18 Mar 2017 13:55:20 -0000
> @@ -559,6 +559,7 @@ int32_t em_check_phy_reset_block(struct
>  #define E1000_DEV_ID_PCH_SPT_I219_V      0x1570
>  #define E1000_DEV_ID_PCH_SPT_I219_LM2    0x15B7
>  #define E1000_DEV_ID_PCH_SPT_I219_V2     0x15B8
> +#define E1000_DEV_ID_PCH_SPT_I219_LM3    0x15D8
>  #define E1000_DEV_ID_82575EB_PT          0x10A7
>  #define E1000_DEV_ID_82575EB_PF          0x10A9
>  #define E1000_DEV_ID_82575GB_QP          0x10D6
> Index: dev/pci/pcidevs
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs,v
> retrieving revision 1.1812
> diff -u -p -r1.1812 pcidevs
> --- dev/pci/pcidevs 13 Jan 2017 14:19:42 -0000 1.1812
> +++ dev/pci/pcidevs 18 Mar 2017 13:53:51 -0000
> @@ -3392,6 +3392,7 @@ product INTEL X550EM_A_SGMII_L 0x15c7 X5
>  product INTEL X550EM_A_10G_T 0x15c8 X553 10GBaseT
>  product INTEL X550EM_A_SFP 0x15ce X553 SFP+
>  product INTEL X550T1 0x15d1 X550T
> +product INTEL I219_LM3 0x15d8 I219-LM3
>  product INTEL CORE5G_H_PCIE_X16 0x1601 Core 5G PCIE
>  product INTEL CORE5G_M_GT1_1 0x1602 HD Graphics
>  product INTEL CORE5G_HB_1 0x1604 Core 5G Host
> Index: dev/pci/pcidevs.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
> retrieving revision 1.1806
> diff -u -p -r1.1806 pcidevs.h
> --- dev/pci/pcidevs.h 13 Jan 2017 14:21:48 -0000 1.1806
> +++ dev/pci/pcidevs.h 18 Mar 2017 13:55:46 -0000
> @@ -3397,6 +3397,7 @@
>  #define PCI_PRODUCT_INTEL_X550EM_A_10G_T 0x15c8 /* X553 10GBaseT */
>  #define PCI_PRODUCT_INTEL_X550EM_A_SFP 0x15ce /* X553 SFP+ */
>  #define PCI_PRODUCT_INTEL_X550T1 0x15d1 /* X550T */
> +#define PCI_PRODUCT_INTEL_I219_LM3 0x15d8 /* I219-LM3 */
>  #define PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16 0x1601 /* Core 5G PCIE */
>  #define PCI_PRODUCT_INTEL_CORE5G_M_GT1_1 0x1602 /* HD Graphics */
>  #define PCI_PRODUCT_INTEL_CORE5G_HB_1 0x1604 /* Core 5G Host */
> Index: dev/pci/pcidevs_data.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
> retrieving revision 1.1801
> diff -u -p -r1.1801 pcidevs_data.h
> --- dev/pci/pcidevs_data.h 13 Jan 2017 14:21:48 -0000 1.1801
> +++ dev/pci/pcidevs_data.h 18 Mar 2017 13:55:46 -0000
> @@ -11104,6 +11104,10 @@ static const struct pci_known_product pc
>      "X550T",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3,
> +    "I219-LM3",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16,
>      "Core 5G PCIE",
>   },
>

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: add new em(4) variant for X270

Jonathan Gray-11
On Sun, Mar 19, 2017 at 05:01:07PM +1100, Jonathan Gray wrote:

> On Sat, Mar 18, 2017 at 04:29:56PM +0100, Claudio Jeker wrote:
> > The X270 seems to have a new I219-LM variant that em(4) doesn't know.
> > Adding it to the driver seems to be enough.
> >
> > OK?
>
> Can you also add the other variants we don't match and keep the same
> name Intel uses?
>
> At the moment we match
>
> PCI_PRODUCT_INTEL_I219_LM
> PCI_PRODUCT_INTEL_I219_V
> PCI_PRODUCT_INTEL_I219_LM2
> PCI_PRODUCT_INTEL_I219_V2
>
> The board_pch_spt variants we lack are
>
> #define E1000_DEV_ID_PCH_LBG_I219_LM3 0x15B9 /* LBG PCH */
> #define E1000_DEV_ID_PCH_SPT_I219_LM4 0x15D7
> #define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8
> #define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3
> #define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6
>
> You've called the V4 variant V3 (Intel doesn't list a V3).

Here is a diff that adds all of them and some additional
kaby lake/x270 ids.

Index: azalia.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.232
diff -u -p -r1.232 azalia.c
--- azalia.c 10 Feb 2017 08:13:37 -0000 1.232
+++ azalia.c 19 Mar 2017 09:44:04 -0000
@@ -455,6 +455,7 @@ azalia_configure_pci(azalia_t *az)
  case PCI_PRODUCT_INTEL_BAYTRAIL_HDA:
  case PCI_PRODUCT_INTEL_100SERIES_HDA:
  case PCI_PRODUCT_INTEL_100SERIES_LP_HDA:
+ case PCI_PRODUCT_INTEL_200SERIES_U_HDA:
  case PCI_PRODUCT_INTEL_C600_HDA:
  case PCI_PRODUCT_INTEL_C610_HDA:
  case PCI_PRODUCT_INTEL_BSW_HDA:
Index: if_em.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em.c,v
retrieving revision 1.334
diff -u -p -r1.334 if_em.c
--- if_em.c 24 Jan 2017 03:57:35 -0000 1.334
+++ if_em.c 19 Mar 2017 09:44:05 -0000
@@ -146,9 +146,14 @@ const struct pci_matchid em_devices[] =
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_2 },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_3 },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM4 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5 },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER },
  { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES },
Index: if_em_hw.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em_hw.c,v
retrieving revision 1.92
diff -u -p -r1.92 if_em_hw.c
--- if_em_hw.c 23 Aug 2016 04:04:23 -0000 1.92
+++ if_em_hw.c 19 Mar 2017 09:44:08 -0000
@@ -615,6 +615,11 @@ em_set_mac_type(struct em_hw *hw)
  case E1000_DEV_ID_PCH_SPT_I219_V:
  case E1000_DEV_ID_PCH_SPT_I219_LM2:
  case E1000_DEV_ID_PCH_SPT_I219_V2:
+ case E1000_DEV_ID_PCH_LBG_I219_LM3:
+ case E1000_DEV_ID_PCH_SPT_I219_LM4:
+ case E1000_DEV_ID_PCH_SPT_I219_V4:
+ case E1000_DEV_ID_PCH_SPT_I219_LM5:
+ case E1000_DEV_ID_PCH_SPT_I219_V5:
  hw->mac_type = em_pch_spt;
  break;
  case E1000_DEV_ID_EP80579_LAN_1:
Index: if_em_hw.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_em_hw.h,v
retrieving revision 1.68
diff -u -p -r1.68 if_em_hw.h
--- if_em_hw.h 18 Feb 2016 14:24:39 -0000 1.68
+++ if_em_hw.h 19 Mar 2017 09:44:10 -0000
@@ -559,6 +559,11 @@ int32_t em_check_phy_reset_block(struct
 #define E1000_DEV_ID_PCH_SPT_I219_V      0x1570
 #define E1000_DEV_ID_PCH_SPT_I219_LM2    0x15B7
 #define E1000_DEV_ID_PCH_SPT_I219_V2     0x15B8
+#define E1000_DEV_ID_PCH_LBG_I219_LM3    0x15B9
+#define E1000_DEV_ID_PCH_SPT_I219_LM4    0x15D7
+#define E1000_DEV_ID_PCH_SPT_I219_V4     0x15D8
+#define E1000_DEV_ID_PCH_SPT_I219_LM5    0x15E3
+#define E1000_DEV_ID_PCH_SPT_I219_V5     0x15D6
 #define E1000_DEV_ID_82575EB_PT          0x10A7
 #define E1000_DEV_ID_82575EB_PF          0x10A9
 #define E1000_DEV_ID_82575GB_QP          0x10D6
Index: pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1813
diff -u -p -r1.1813 pcidevs
--- pcidevs 19 Mar 2017 07:27:15 -0000 1.1813
+++ pcidevs 19 Mar 2017 09:44:13 -0000
@@ -3385,8 +3385,9 @@ product INTEL X550EM_X_KR 0x15ab X552 Ba
 product INTEL X550EM_X_SFP 0x15ac X552 SFP+
 product INTEL X550EM_X_10G_T 0x15ad X552/X557-AT
 product INTEL X550EM_X_1G_T 0x15ae X552 1GbaseT
-product INTEL I219_LM2 0x15b7 I219-LM2
-product INTEL I219_V2 0x15b8 I219-V2
+product INTEL I219_LM2 0x15b7 I219-LM
+product INTEL I219_V2 0x15b8 I219-V
+product INTEL I219_LM3 0x15b9 I219-LM
 product INTEL X550EM_A_KR 0x15c2 X553 Backplane
 product INTEL X550EM_A_KR_L 0x15c3 X553 Backplane
 product INTEL X550EM_A_SFP_N 0x15c4 X553 SFP+
@@ -3395,6 +3396,10 @@ product INTEL X550EM_A_SGMII_L 0x15c7 X5
 product INTEL X550EM_A_10G_T 0x15c8 X553 10GBaseT
 product INTEL X550EM_A_SFP 0x15ce X553 SFP+
 product INTEL X550T1 0x15d1 X550T
+product INTEL I219_V5 0x15d6 I219-V
+product INTEL I219_LM4 0x15d7 I219-LM
+product INTEL I219_V4 0x15d8 I219-V
+product INTEL I219_LM5 0x15e3 I219-LM
 product INTEL CORE5G_H_PCIE_X16 0x1601 Core 5G PCIE
 product INTEL CORE5G_M_GT1_1 0x1602 HD Graphics
 product INTEL CORE5G_HB_1 0x1604 Core 5G Host
@@ -3425,7 +3430,7 @@ product INTEL CORE6G_U_HB 0x1904 Core 6G
 product INTEL CORE6G_H_PCIE_X8 0x1905 Core 6G PCIE
 product INTEL CORE6G_H_PCIE_X4 0x1909 Core 6G PCIE
 product INTEL CORE6G_H_HB_Q 0x1910 Core 6G Host
-product INTEL SKYLAKE_GMM 0x1911 Skylake GMM
+product INTEL CORE_GMM_1 0x1911 Core GMM
 product INTEL CORE6G_D_GT2_1 0x1912 HD Graphics 530
 product INTEL CORE6G_U_GT2 0x1916 HD Graphics 520
 product INTEL XEONE3_1200V5_HB 0x1918 Xeon E3-1200 v5 Host
@@ -3688,6 +3693,8 @@ product INTEL WL_8260_1 0x24f3 Dual Ban
 product INTEL WL_8260_2 0x24f4 Dual Band Wireless AC 8260
 product INTEL WL_4165_1 0x24f5 Dual Band Wireless AC 4165
 product INTEL WL_4165_2 0x24f6 Dual Band Wireless AC 4165
+product INTEL WL_3168_1 0x24fb Dual Band Wireless-AC 3168
+product INTEL WL_8265_1 0x24fd Dual Band Wireless-AC 8265
 product INTEL 82820_HB 0x2501 82820 Host
 product INTEL 82820_AGP 0x250f 82820 AGP
 product INTEL 82850_HB 0x2530 82850 Host
@@ -4505,6 +4512,21 @@ product INTEL EP80579_LAN_6 0x5049  EP80
 product INTEL 80960RD 0x5200 i960 RD
 product INTEL PRO_100_SERVER 0x5201 PRO 100 Server
 product INTEL QEMU_NVME 0x5845 QEMU NVM Express Controller
+product INTEL CORE7G_S_GT1 0x5902 HD Graphics 610
+product INTEL CORE7G_U_HB 0x5904 Core 7G Host
+product INTEL CORE7G_U_GT1 0x5906 HD Graphics 610
+product INTEL CORE7G_Y_HB 0x590c Core 7G Host
+product INTEL CORE7G_Y_GT1 0x590e HD Graphics
+product INTEL CORE_GMM_2 0x5911 Core GMM
+product INTEL CORE7G_S_GT2 0x5912 HD Graphics 630
+product INTEL CORE7G_U_GT2_1 0x5916 HD Graphics 620
+product INTEL CORE7G_IMGU 0x5915 Core 7G Imaging Unit
+product INTEL CORE7G_SRV_GT2 0x591a HD Graphics P630
+product INTEL CORE7G_H_GT2 0x591b HD Graphics 630
+product INTEL CORE7G_U_GT2_2 0x591d HD Graphics P630
+product INTEL CORE7G_Y_GT2 0x591e HD Graphics 615
+product INTEL CORE7G_U_GT3_15W 0x5926 Iris Plus Graphics 640
+product INTEL CORE7G_U_GT3_28W 0x5927 Iris Plus Graphics 650
 product INTEL 5100_HB 0x65c0 5100 Host
 product INTEL 5100_PCIE_2 0x65e2 5100 PCIE
 product INTEL 5100_PCIE_3 0x65e3 5100 PCIE
@@ -4875,7 +4897,14 @@ product INTEL 100SERIES_LP_MEI_3 0x9d3e
 product INTEL 100SERIES_LP_LPC_1 0x9d43 100 Series LPC
 product INTEL 100SERIES_LP_LPC_2 0x9d46 100 Series LPC
 product INTEL 100SERIES_LP_LPC_3 0x9d48 100 Series LPC
+product INTEL 200SERIES_Y_LPC_1 0x9d4b 200 Series LPC
+product INTEL 200SERIES_U_LPC_1 0x9d4e 200 Series LPC
+product INTEL 200SERIES_U_LPC_2 0x9d50 200 Series LPC
+product INTEL 200SERIES_U_LPC_3 0x9d53 200 Series LPC
+product INTEL 200SERIES_Y_LPC_2 0x9d56 200 Series LPC
+product INTEL 200SERIES_U_LPC_4 0x9d58 200 Series LPC
 product INTEL 100SERIES_LP_HDA 0x9d70 100 Series HD Audio
+product INTEL 200SERIES_U_HDA 0x9d71 200 Series HD Audio
 product INTEL PINEVIEW_DMI 0xa000  Pineview DMI
 product INTEL PINEVIEW_IGC_1 0xa001 Pineview Video
 product INTEL PINEVIEW_IGC_2 0xa002 Pineview Video
@@ -7007,6 +7036,7 @@ product TOSHIBA TC35856F 0x0020 TC35856F
 product TOSHIBA R4X00 0x102f R4x00 PCI
 
 /* Toshiba(2) products */
+product TOSHIBA2 NVME 0x0115 NVMe
 product TOSHIBA2 THB 0x0601 PCI
 product TOSHIBA2 ISA 0x0602 ISA
 product TOSHIBA2 ToPIC95 0x0603 ToPIC95 CardBus-PCI
Index: pcidevs.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
retrieving revision 1.1807
diff -u -p -r1.1807 pcidevs.h
--- pcidevs.h 19 Mar 2017 07:28:34 -0000 1.1807
+++ pcidevs.h 19 Mar 2017 09:44:17 -0000
@@ -3390,8 +3390,9 @@
 #define PCI_PRODUCT_INTEL_X550EM_X_SFP 0x15ac /* X552 SFP+ */
 #define PCI_PRODUCT_INTEL_X550EM_X_10G_T 0x15ad /* X552/X557-AT */
 #define PCI_PRODUCT_INTEL_X550EM_X_1G_T 0x15ae /* X552 1GbaseT */
-#define PCI_PRODUCT_INTEL_I219_LM2 0x15b7 /* I219-LM2 */
-#define PCI_PRODUCT_INTEL_I219_V2 0x15b8 /* I219-V2 */
+#define PCI_PRODUCT_INTEL_I219_LM2 0x15b7 /* I219-LM */
+#define PCI_PRODUCT_INTEL_I219_V2 0x15b8 /* I219-V */
+#define PCI_PRODUCT_INTEL_I219_LM3 0x15b9 /* I219-LM */
 #define PCI_PRODUCT_INTEL_X550EM_A_KR 0x15c2 /* X553 Backplane */
 #define PCI_PRODUCT_INTEL_X550EM_A_KR_L 0x15c3 /* X553 Backplane */
 #define PCI_PRODUCT_INTEL_X550EM_A_SFP_N 0x15c4 /* X553 SFP+ */
@@ -3400,6 +3401,10 @@
 #define PCI_PRODUCT_INTEL_X550EM_A_10G_T 0x15c8 /* X553 10GBaseT */
 #define PCI_PRODUCT_INTEL_X550EM_A_SFP 0x15ce /* X553 SFP+ */
 #define PCI_PRODUCT_INTEL_X550T1 0x15d1 /* X550T */
+#define PCI_PRODUCT_INTEL_I219_V5 0x15d6 /* I219-V */
+#define PCI_PRODUCT_INTEL_I219_LM4 0x15d7 /* I219-LM */
+#define PCI_PRODUCT_INTEL_I219_V4 0x15d8 /* I219-V */
+#define PCI_PRODUCT_INTEL_I219_LM5 0x15e3 /* I219-LM */
 #define PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16 0x1601 /* Core 5G PCIE */
 #define PCI_PRODUCT_INTEL_CORE5G_M_GT1_1 0x1602 /* HD Graphics */
 #define PCI_PRODUCT_INTEL_CORE5G_HB_1 0x1604 /* Core 5G Host */
@@ -3430,7 +3435,7 @@
 #define PCI_PRODUCT_INTEL_CORE6G_H_PCIE_X8 0x1905 /* Core 6G PCIE */
 #define PCI_PRODUCT_INTEL_CORE6G_H_PCIE_X4 0x1909 /* Core 6G PCIE */
 #define PCI_PRODUCT_INTEL_CORE6G_H_HB_Q 0x1910 /* Core 6G Host */
-#define PCI_PRODUCT_INTEL_SKYLAKE_GMM 0x1911 /* Skylake GMM */
+#define PCI_PRODUCT_INTEL_CORE_GMM_1 0x1911 /* Core GMM */
 #define PCI_PRODUCT_INTEL_CORE6G_D_GT2_1 0x1912 /* HD Graphics 530 */
 #define PCI_PRODUCT_INTEL_CORE6G_U_GT2 0x1916 /* HD Graphics 520 */
 #define PCI_PRODUCT_INTEL_XEONE3_1200V5_HB 0x1918 /* Xeon E3-1200 v5 Host */
@@ -3693,6 +3698,8 @@
 #define PCI_PRODUCT_INTEL_WL_8260_2 0x24f4 /* Dual Band Wireless AC 8260 */
 #define PCI_PRODUCT_INTEL_WL_4165_1 0x24f5 /* Dual Band Wireless AC 4165 */
 #define PCI_PRODUCT_INTEL_WL_4165_2 0x24f6 /* Dual Band Wireless AC 4165 */
+#define PCI_PRODUCT_INTEL_WL_3168_1 0x24fb /* Dual Band Wireless-AC 3168 */
+#define PCI_PRODUCT_INTEL_WL_8265_1 0x24fd /* Dual Band Wireless-AC 8265 */
 #define PCI_PRODUCT_INTEL_82820_HB 0x2501 /* 82820 Host */
 #define PCI_PRODUCT_INTEL_82820_AGP 0x250f /* 82820 AGP */
 #define PCI_PRODUCT_INTEL_82850_HB 0x2530 /* 82850 Host */
@@ -4510,6 +4517,21 @@
 #define PCI_PRODUCT_INTEL_80960RD 0x5200 /* i960 RD */
 #define PCI_PRODUCT_INTEL_PRO_100_SERVER 0x5201 /* PRO 100 Server */
 #define PCI_PRODUCT_INTEL_QEMU_NVME 0x5845 /* QEMU NVM Express Controller */
+#define PCI_PRODUCT_INTEL_CORE7G_S_GT1 0x5902 /* HD Graphics 610 */
+#define PCI_PRODUCT_INTEL_CORE7G_U_HB 0x5904 /* Core 7G Host */
+#define PCI_PRODUCT_INTEL_CORE7G_U_GT1 0x5906 /* HD Graphics 610 */
+#define PCI_PRODUCT_INTEL_CORE7G_Y_HB 0x590c /* Core 7G Host */
+#define PCI_PRODUCT_INTEL_CORE7G_Y_GT1 0x590e /* HD Graphics */
+#define PCI_PRODUCT_INTEL_CORE_GMM_2 0x5911 /* Core GMM */
+#define PCI_PRODUCT_INTEL_CORE7G_S_GT2 0x5912 /* HD Graphics 630 */
+#define PCI_PRODUCT_INTEL_CORE7G_U_GT2_1 0x5916 /* HD Graphics 620 */
+#define PCI_PRODUCT_INTEL_CORE7G_IMGU 0x5915 /* Core 7G Imaging Unit */
+#define PCI_PRODUCT_INTEL_CORE7G_SRV_GT2 0x591a /* HD Graphics P630 */
+#define PCI_PRODUCT_INTEL_CORE7G_H_GT2 0x591b /* HD Graphics 630 */
+#define PCI_PRODUCT_INTEL_CORE7G_U_GT2_2 0x591d /* HD Graphics P630 */
+#define PCI_PRODUCT_INTEL_CORE7G_Y_GT2 0x591e /* HD Graphics 615 */
+#define PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W 0x5926 /* Iris Plus Graphics 640 */
+#define PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W 0x5927 /* Iris Plus Graphics 650 */
 #define PCI_PRODUCT_INTEL_5100_HB 0x65c0 /* 5100 Host */
 #define PCI_PRODUCT_INTEL_5100_PCIE_2 0x65e2 /* 5100 PCIE */
 #define PCI_PRODUCT_INTEL_5100_PCIE_3 0x65e3 /* 5100 PCIE */
@@ -4880,7 +4902,14 @@
 #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_1 0x9d43 /* 100 Series LPC */
 #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_2 0x9d46 /* 100 Series LPC */
 #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_3 0x9d48 /* 100 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_Y_LPC_1 0x9d4b /* 200 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_1 0x9d4e /* 200 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_2 0x9d50 /* 200 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_3 0x9d53 /* 200 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_Y_LPC_2 0x9d56 /* 200 Series LPC */
+#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_4 0x9d58 /* 200 Series LPC */
 #define PCI_PRODUCT_INTEL_100SERIES_LP_HDA 0x9d70 /* 100 Series HD Audio */
+#define PCI_PRODUCT_INTEL_200SERIES_U_HDA 0x9d71 /* 200 Series HD Audio */
 #define PCI_PRODUCT_INTEL_PINEVIEW_DMI 0xa000 /* Pineview DMI */
 #define PCI_PRODUCT_INTEL_PINEVIEW_IGC_1 0xa001 /* Pineview Video */
 #define PCI_PRODUCT_INTEL_PINEVIEW_IGC_2 0xa002 /* Pineview Video */
@@ -7012,6 +7041,7 @@
 #define PCI_PRODUCT_TOSHIBA_R4X00 0x102f /* R4x00 PCI */
 
 /* Toshiba(2) products */
+#define PCI_PRODUCT_TOSHIBA2_NVME 0x0115 /* NVMe */
 #define PCI_PRODUCT_TOSHIBA2_THB 0x0601 /* PCI */
 #define PCI_PRODUCT_TOSHIBA2_ISA 0x0602 /* ISA */
 #define PCI_PRODUCT_TOSHIBA2_ToPIC95 0x0603 /* ToPIC95 CardBus-PCI */
Index: pcidevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
retrieving revision 1.1802
diff -u -p -r1.1802 pcidevs_data.h
--- pcidevs_data.h 19 Mar 2017 07:28:34 -0000 1.1802
+++ pcidevs_data.h 19 Mar 2017 09:44:22 -0000
@@ -11077,11 +11077,15 @@ static const struct pci_known_product pc
  },
  {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2,
-    "I219-LM2",
+    "I219-LM",
  },
  {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2,
-    "I219-V2",
+    "I219-V",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3,
+    "I219-LM",
  },
  {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_KR,
@@ -11116,6 +11120,22 @@ static const struct pci_known_product pc
     "X550T",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5,
+    "I219-V",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM4,
+    "I219-LM",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4,
+    "I219-V",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5,
+    "I219-LM",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16,
     "Core 5G PCIE",
  },
@@ -11236,8 +11256,8 @@ static const struct pci_known_product pc
     "Core 6G Host",
  },
  {
-    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SKYLAKE_GMM,
-    "Skylake GMM",
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_GMM_1,
+    "Core GMM",
  },
  {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE6G_D_GT2_1,
@@ -12288,6 +12308,14 @@ static const struct pci_known_product pc
     "Dual Band Wireless AC 4165",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3168_1,
+    "Dual Band Wireless-AC 3168",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8265_1,
+    "Dual Band Wireless-AC 8265",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_HB,
     "82820 Host",
  },
@@ -15556,6 +15584,66 @@ static const struct pci_known_product pc
     "QEMU NVM Express Controller",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_S_GT1,
+    "HD Graphics 610",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_HB,
+    "Core 7G Host",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT1,
+    "HD Graphics 610",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_HB,
+    "Core 7G Host",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT1,
+    "HD Graphics",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_GMM_2,
+    "Core GMM",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_S_GT2,
+    "HD Graphics 630",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_1,
+    "HD Graphics 620",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_IMGU,
+    "Core 7G Imaging Unit",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_SRV_GT2,
+    "HD Graphics P630",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_H_GT2,
+    "HD Graphics 630",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_2,
+    "HD Graphics P630",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT2,
+    "HD Graphics 615",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W,
+    "Iris Plus Graphics 640",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W,
+    "Iris Plus Graphics 650",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5100_HB,
     "5100 Host",
  },
@@ -17036,10 +17124,38 @@ static const struct pci_known_product pc
     "100 Series LPC",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_Y_LPC_1,
+    "200 Series LPC",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_1,
+    "200 Series LPC",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_2,
+    "200 Series LPC",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_3,
+    "200 Series LPC",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_Y_LPC_2,
+    "200 Series LPC",
+ },
+ {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_4,
+    "200 Series LPC",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_HDA,
     "100 Series HD Audio",
  },
  {
+    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_HDA,
+    "200 Series HD Audio",
+ },
+ {
     PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_DMI,
     "Pineview DMI",
  },
@@ -24434,6 +24550,10 @@ static const struct pci_known_product pc
  {
     PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_R4X00,
     "R4x00 PCI",
+ },
+ {
+    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_NVME,
+    "NVMe",
  },
  {
     PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_THB,

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: add new em(4) variant for X270

Mark Kettenis
> Date: Sun, 19 Mar 2017 20:47:14 +1100
> From: Jonathan Gray <[hidden email]>
>
> On Sun, Mar 19, 2017 at 05:01:07PM +1100, Jonathan Gray wrote:
> > On Sat, Mar 18, 2017 at 04:29:56PM +0100, Claudio Jeker wrote:
> > > The X270 seems to have a new I219-LM variant that em(4) doesn't know.
> > > Adding it to the driver seems to be enough.
> > >
> > > OK?
> >
> > Can you also add the other variants we don't match and keep the same
> > name Intel uses?
> >
> > At the moment we match
> >
> > PCI_PRODUCT_INTEL_I219_LM
> > PCI_PRODUCT_INTEL_I219_V
> > PCI_PRODUCT_INTEL_I219_LM2
> > PCI_PRODUCT_INTEL_I219_V2
> >
> > The board_pch_spt variants we lack are
> >
> > #define E1000_DEV_ID_PCH_LBG_I219_LM3 0x15B9 /* LBG PCH */
> > #define E1000_DEV_ID_PCH_SPT_I219_LM4 0x15D7
> > #define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8
> > #define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3
> > #define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6
> >
> > You've called the V4 variant V3 (Intel doesn't list a V3).
>
> Here is a diff that adds all of them and some additional
> kaby lake/x270 ids.

Go for it.

> Index: azalia.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/azalia.c,v
> retrieving revision 1.232
> diff -u -p -r1.232 azalia.c
> --- azalia.c 10 Feb 2017 08:13:37 -0000 1.232
> +++ azalia.c 19 Mar 2017 09:44:04 -0000
> @@ -455,6 +455,7 @@ azalia_configure_pci(azalia_t *az)
>   case PCI_PRODUCT_INTEL_BAYTRAIL_HDA:
>   case PCI_PRODUCT_INTEL_100SERIES_HDA:
>   case PCI_PRODUCT_INTEL_100SERIES_LP_HDA:
> + case PCI_PRODUCT_INTEL_200SERIES_U_HDA:
>   case PCI_PRODUCT_INTEL_C600_HDA:
>   case PCI_PRODUCT_INTEL_C610_HDA:
>   case PCI_PRODUCT_INTEL_BSW_HDA:
> Index: if_em.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em.c,v
> retrieving revision 1.334
> diff -u -p -r1.334 if_em.c
> --- if_em.c 24 Jan 2017 03:57:35 -0000 1.334
> +++ if_em.c 19 Mar 2017 09:44:05 -0000
> @@ -146,9 +146,14 @@ const struct pci_matchid em_devices[] =
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_2 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_3 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM },
> - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM4 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4 },
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES },
> Index: if_em_hw.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em_hw.c,v
> retrieving revision 1.92
> diff -u -p -r1.92 if_em_hw.c
> --- if_em_hw.c 23 Aug 2016 04:04:23 -0000 1.92
> +++ if_em_hw.c 19 Mar 2017 09:44:08 -0000
> @@ -615,6 +615,11 @@ em_set_mac_type(struct em_hw *hw)
>   case E1000_DEV_ID_PCH_SPT_I219_V:
>   case E1000_DEV_ID_PCH_SPT_I219_LM2:
>   case E1000_DEV_ID_PCH_SPT_I219_V2:
> + case E1000_DEV_ID_PCH_LBG_I219_LM3:
> + case E1000_DEV_ID_PCH_SPT_I219_LM4:
> + case E1000_DEV_ID_PCH_SPT_I219_V4:
> + case E1000_DEV_ID_PCH_SPT_I219_LM5:
> + case E1000_DEV_ID_PCH_SPT_I219_V5:
>   hw->mac_type = em_pch_spt;
>   break;
>   case E1000_DEV_ID_EP80579_LAN_1:
> Index: if_em_hw.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_em_hw.h,v
> retrieving revision 1.68
> diff -u -p -r1.68 if_em_hw.h
> --- if_em_hw.h 18 Feb 2016 14:24:39 -0000 1.68
> +++ if_em_hw.h 19 Mar 2017 09:44:10 -0000
> @@ -559,6 +559,11 @@ int32_t em_check_phy_reset_block(struct
>  #define E1000_DEV_ID_PCH_SPT_I219_V      0x1570
>  #define E1000_DEV_ID_PCH_SPT_I219_LM2    0x15B7
>  #define E1000_DEV_ID_PCH_SPT_I219_V2     0x15B8
> +#define E1000_DEV_ID_PCH_LBG_I219_LM3    0x15B9
> +#define E1000_DEV_ID_PCH_SPT_I219_LM4    0x15D7
> +#define E1000_DEV_ID_PCH_SPT_I219_V4     0x15D8
> +#define E1000_DEV_ID_PCH_SPT_I219_LM5    0x15E3
> +#define E1000_DEV_ID_PCH_SPT_I219_V5     0x15D6
>  #define E1000_DEV_ID_82575EB_PT          0x10A7
>  #define E1000_DEV_ID_82575EB_PF          0x10A9
>  #define E1000_DEV_ID_82575GB_QP          0x10D6
> Index: pcidevs
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs,v
> retrieving revision 1.1813
> diff -u -p -r1.1813 pcidevs
> --- pcidevs 19 Mar 2017 07:27:15 -0000 1.1813
> +++ pcidevs 19 Mar 2017 09:44:13 -0000
> @@ -3385,8 +3385,9 @@ product INTEL X550EM_X_KR 0x15ab X552 Ba
>  product INTEL X550EM_X_SFP 0x15ac X552 SFP+
>  product INTEL X550EM_X_10G_T 0x15ad X552/X557-AT
>  product INTEL X550EM_X_1G_T 0x15ae X552 1GbaseT
> -product INTEL I219_LM2 0x15b7 I219-LM2
> -product INTEL I219_V2 0x15b8 I219-V2
> +product INTEL I219_LM2 0x15b7 I219-LM
> +product INTEL I219_V2 0x15b8 I219-V
> +product INTEL I219_LM3 0x15b9 I219-LM
>  product INTEL X550EM_A_KR 0x15c2 X553 Backplane
>  product INTEL X550EM_A_KR_L 0x15c3 X553 Backplane
>  product INTEL X550EM_A_SFP_N 0x15c4 X553 SFP+
> @@ -3395,6 +3396,10 @@ product INTEL X550EM_A_SGMII_L 0x15c7 X5
>  product INTEL X550EM_A_10G_T 0x15c8 X553 10GBaseT
>  product INTEL X550EM_A_SFP 0x15ce X553 SFP+
>  product INTEL X550T1 0x15d1 X550T
> +product INTEL I219_V5 0x15d6 I219-V
> +product INTEL I219_LM4 0x15d7 I219-LM
> +product INTEL I219_V4 0x15d8 I219-V
> +product INTEL I219_LM5 0x15e3 I219-LM
>  product INTEL CORE5G_H_PCIE_X16 0x1601 Core 5G PCIE
>  product INTEL CORE5G_M_GT1_1 0x1602 HD Graphics
>  product INTEL CORE5G_HB_1 0x1604 Core 5G Host
> @@ -3425,7 +3430,7 @@ product INTEL CORE6G_U_HB 0x1904 Core 6G
>  product INTEL CORE6G_H_PCIE_X8 0x1905 Core 6G PCIE
>  product INTEL CORE6G_H_PCIE_X4 0x1909 Core 6G PCIE
>  product INTEL CORE6G_H_HB_Q 0x1910 Core 6G Host
> -product INTEL SKYLAKE_GMM 0x1911 Skylake GMM
> +product INTEL CORE_GMM_1 0x1911 Core GMM
>  product INTEL CORE6G_D_GT2_1 0x1912 HD Graphics 530
>  product INTEL CORE6G_U_GT2 0x1916 HD Graphics 520
>  product INTEL XEONE3_1200V5_HB 0x1918 Xeon E3-1200 v5 Host
> @@ -3688,6 +3693,8 @@ product INTEL WL_8260_1 0x24f3 Dual Ban
>  product INTEL WL_8260_2 0x24f4 Dual Band Wireless AC 8260
>  product INTEL WL_4165_1 0x24f5 Dual Band Wireless AC 4165
>  product INTEL WL_4165_2 0x24f6 Dual Band Wireless AC 4165
> +product INTEL WL_3168_1 0x24fb Dual Band Wireless-AC 3168
> +product INTEL WL_8265_1 0x24fd Dual Band Wireless-AC 8265
>  product INTEL 82820_HB 0x2501 82820 Host
>  product INTEL 82820_AGP 0x250f 82820 AGP
>  product INTEL 82850_HB 0x2530 82850 Host
> @@ -4505,6 +4512,21 @@ product INTEL EP80579_LAN_6 0x5049  EP80
>  product INTEL 80960RD 0x5200 i960 RD
>  product INTEL PRO_100_SERVER 0x5201 PRO 100 Server
>  product INTEL QEMU_NVME 0x5845 QEMU NVM Express Controller
> +product INTEL CORE7G_S_GT1 0x5902 HD Graphics 610
> +product INTEL CORE7G_U_HB 0x5904 Core 7G Host
> +product INTEL CORE7G_U_GT1 0x5906 HD Graphics 610
> +product INTEL CORE7G_Y_HB 0x590c Core 7G Host
> +product INTEL CORE7G_Y_GT1 0x590e HD Graphics
> +product INTEL CORE_GMM_2 0x5911 Core GMM
> +product INTEL CORE7G_S_GT2 0x5912 HD Graphics 630
> +product INTEL CORE7G_U_GT2_1 0x5916 HD Graphics 620
> +product INTEL CORE7G_IMGU 0x5915 Core 7G Imaging Unit
> +product INTEL CORE7G_SRV_GT2 0x591a HD Graphics P630
> +product INTEL CORE7G_H_GT2 0x591b HD Graphics 630
> +product INTEL CORE7G_U_GT2_2 0x591d HD Graphics P630
> +product INTEL CORE7G_Y_GT2 0x591e HD Graphics 615
> +product INTEL CORE7G_U_GT3_15W 0x5926 Iris Plus Graphics 640
> +product INTEL CORE7G_U_GT3_28W 0x5927 Iris Plus Graphics 650
>  product INTEL 5100_HB 0x65c0 5100 Host
>  product INTEL 5100_PCIE_2 0x65e2 5100 PCIE
>  product INTEL 5100_PCIE_3 0x65e3 5100 PCIE
> @@ -4875,7 +4897,14 @@ product INTEL 100SERIES_LP_MEI_3 0x9d3e
>  product INTEL 100SERIES_LP_LPC_1 0x9d43 100 Series LPC
>  product INTEL 100SERIES_LP_LPC_2 0x9d46 100 Series LPC
>  product INTEL 100SERIES_LP_LPC_3 0x9d48 100 Series LPC
> +product INTEL 200SERIES_Y_LPC_1 0x9d4b 200 Series LPC
> +product INTEL 200SERIES_U_LPC_1 0x9d4e 200 Series LPC
> +product INTEL 200SERIES_U_LPC_2 0x9d50 200 Series LPC
> +product INTEL 200SERIES_U_LPC_3 0x9d53 200 Series LPC
> +product INTEL 200SERIES_Y_LPC_2 0x9d56 200 Series LPC
> +product INTEL 200SERIES_U_LPC_4 0x9d58 200 Series LPC
>  product INTEL 100SERIES_LP_HDA 0x9d70 100 Series HD Audio
> +product INTEL 200SERIES_U_HDA 0x9d71 200 Series HD Audio
>  product INTEL PINEVIEW_DMI 0xa000  Pineview DMI
>  product INTEL PINEVIEW_IGC_1 0xa001 Pineview Video
>  product INTEL PINEVIEW_IGC_2 0xa002 Pineview Video
> @@ -7007,6 +7036,7 @@ product TOSHIBA TC35856F 0x0020 TC35856F
>  product TOSHIBA R4X00 0x102f R4x00 PCI
>  
>  /* Toshiba(2) products */
> +product TOSHIBA2 NVME 0x0115 NVMe
>  product TOSHIBA2 THB 0x0601 PCI
>  product TOSHIBA2 ISA 0x0602 ISA
>  product TOSHIBA2 ToPIC95 0x0603 ToPIC95 CardBus-PCI
> Index: pcidevs.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
> retrieving revision 1.1807
> diff -u -p -r1.1807 pcidevs.h
> --- pcidevs.h 19 Mar 2017 07:28:34 -0000 1.1807
> +++ pcidevs.h 19 Mar 2017 09:44:17 -0000
> @@ -3390,8 +3390,9 @@
>  #define PCI_PRODUCT_INTEL_X550EM_X_SFP 0x15ac /* X552 SFP+ */
>  #define PCI_PRODUCT_INTEL_X550EM_X_10G_T 0x15ad /* X552/X557-AT */
>  #define PCI_PRODUCT_INTEL_X550EM_X_1G_T 0x15ae /* X552 1GbaseT */
> -#define PCI_PRODUCT_INTEL_I219_LM2 0x15b7 /* I219-LM2 */
> -#define PCI_PRODUCT_INTEL_I219_V2 0x15b8 /* I219-V2 */
> +#define PCI_PRODUCT_INTEL_I219_LM2 0x15b7 /* I219-LM */
> +#define PCI_PRODUCT_INTEL_I219_V2 0x15b8 /* I219-V */
> +#define PCI_PRODUCT_INTEL_I219_LM3 0x15b9 /* I219-LM */
>  #define PCI_PRODUCT_INTEL_X550EM_A_KR 0x15c2 /* X553 Backplane */
>  #define PCI_PRODUCT_INTEL_X550EM_A_KR_L 0x15c3 /* X553 Backplane */
>  #define PCI_PRODUCT_INTEL_X550EM_A_SFP_N 0x15c4 /* X553 SFP+ */
> @@ -3400,6 +3401,10 @@
>  #define PCI_PRODUCT_INTEL_X550EM_A_10G_T 0x15c8 /* X553 10GBaseT */
>  #define PCI_PRODUCT_INTEL_X550EM_A_SFP 0x15ce /* X553 SFP+ */
>  #define PCI_PRODUCT_INTEL_X550T1 0x15d1 /* X550T */
> +#define PCI_PRODUCT_INTEL_I219_V5 0x15d6 /* I219-V */
> +#define PCI_PRODUCT_INTEL_I219_LM4 0x15d7 /* I219-LM */
> +#define PCI_PRODUCT_INTEL_I219_V4 0x15d8 /* I219-V */
> +#define PCI_PRODUCT_INTEL_I219_LM5 0x15e3 /* I219-LM */
>  #define PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16 0x1601 /* Core 5G PCIE */
>  #define PCI_PRODUCT_INTEL_CORE5G_M_GT1_1 0x1602 /* HD Graphics */
>  #define PCI_PRODUCT_INTEL_CORE5G_HB_1 0x1604 /* Core 5G Host */
> @@ -3430,7 +3435,7 @@
>  #define PCI_PRODUCT_INTEL_CORE6G_H_PCIE_X8 0x1905 /* Core 6G PCIE */
>  #define PCI_PRODUCT_INTEL_CORE6G_H_PCIE_X4 0x1909 /* Core 6G PCIE */
>  #define PCI_PRODUCT_INTEL_CORE6G_H_HB_Q 0x1910 /* Core 6G Host */
> -#define PCI_PRODUCT_INTEL_SKYLAKE_GMM 0x1911 /* Skylake GMM */
> +#define PCI_PRODUCT_INTEL_CORE_GMM_1 0x1911 /* Core GMM */
>  #define PCI_PRODUCT_INTEL_CORE6G_D_GT2_1 0x1912 /* HD Graphics 530 */
>  #define PCI_PRODUCT_INTEL_CORE6G_U_GT2 0x1916 /* HD Graphics 520 */
>  #define PCI_PRODUCT_INTEL_XEONE3_1200V5_HB 0x1918 /* Xeon E3-1200 v5 Host */
> @@ -3693,6 +3698,8 @@
>  #define PCI_PRODUCT_INTEL_WL_8260_2 0x24f4 /* Dual Band Wireless AC 8260 */
>  #define PCI_PRODUCT_INTEL_WL_4165_1 0x24f5 /* Dual Band Wireless AC 4165 */
>  #define PCI_PRODUCT_INTEL_WL_4165_2 0x24f6 /* Dual Band Wireless AC 4165 */
> +#define PCI_PRODUCT_INTEL_WL_3168_1 0x24fb /* Dual Band Wireless-AC 3168 */
> +#define PCI_PRODUCT_INTEL_WL_8265_1 0x24fd /* Dual Band Wireless-AC 8265 */
>  #define PCI_PRODUCT_INTEL_82820_HB 0x2501 /* 82820 Host */
>  #define PCI_PRODUCT_INTEL_82820_AGP 0x250f /* 82820 AGP */
>  #define PCI_PRODUCT_INTEL_82850_HB 0x2530 /* 82850 Host */
> @@ -4510,6 +4517,21 @@
>  #define PCI_PRODUCT_INTEL_80960RD 0x5200 /* i960 RD */
>  #define PCI_PRODUCT_INTEL_PRO_100_SERVER 0x5201 /* PRO 100 Server */
>  #define PCI_PRODUCT_INTEL_QEMU_NVME 0x5845 /* QEMU NVM Express Controller */
> +#define PCI_PRODUCT_INTEL_CORE7G_S_GT1 0x5902 /* HD Graphics 610 */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_HB 0x5904 /* Core 7G Host */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_GT1 0x5906 /* HD Graphics 610 */
> +#define PCI_PRODUCT_INTEL_CORE7G_Y_HB 0x590c /* Core 7G Host */
> +#define PCI_PRODUCT_INTEL_CORE7G_Y_GT1 0x590e /* HD Graphics */
> +#define PCI_PRODUCT_INTEL_CORE_GMM_2 0x5911 /* Core GMM */
> +#define PCI_PRODUCT_INTEL_CORE7G_S_GT2 0x5912 /* HD Graphics 630 */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_GT2_1 0x5916 /* HD Graphics 620 */
> +#define PCI_PRODUCT_INTEL_CORE7G_IMGU 0x5915 /* Core 7G Imaging Unit */
> +#define PCI_PRODUCT_INTEL_CORE7G_SRV_GT2 0x591a /* HD Graphics P630 */
> +#define PCI_PRODUCT_INTEL_CORE7G_H_GT2 0x591b /* HD Graphics 630 */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_GT2_2 0x591d /* HD Graphics P630 */
> +#define PCI_PRODUCT_INTEL_CORE7G_Y_GT2 0x591e /* HD Graphics 615 */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W 0x5926 /* Iris Plus Graphics 640 */
> +#define PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W 0x5927 /* Iris Plus Graphics 650 */
>  #define PCI_PRODUCT_INTEL_5100_HB 0x65c0 /* 5100 Host */
>  #define PCI_PRODUCT_INTEL_5100_PCIE_2 0x65e2 /* 5100 PCIE */
>  #define PCI_PRODUCT_INTEL_5100_PCIE_3 0x65e3 /* 5100 PCIE */
> @@ -4880,7 +4902,14 @@
>  #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_1 0x9d43 /* 100 Series LPC */
>  #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_2 0x9d46 /* 100 Series LPC */
>  #define PCI_PRODUCT_INTEL_100SERIES_LP_LPC_3 0x9d48 /* 100 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_Y_LPC_1 0x9d4b /* 200 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_1 0x9d4e /* 200 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_2 0x9d50 /* 200 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_3 0x9d53 /* 200 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_Y_LPC_2 0x9d56 /* 200 Series LPC */
> +#define PCI_PRODUCT_INTEL_200SERIES_U_LPC_4 0x9d58 /* 200 Series LPC */
>  #define PCI_PRODUCT_INTEL_100SERIES_LP_HDA 0x9d70 /* 100 Series HD Audio */
> +#define PCI_PRODUCT_INTEL_200SERIES_U_HDA 0x9d71 /* 200 Series HD Audio */
>  #define PCI_PRODUCT_INTEL_PINEVIEW_DMI 0xa000 /* Pineview DMI */
>  #define PCI_PRODUCT_INTEL_PINEVIEW_IGC_1 0xa001 /* Pineview Video */
>  #define PCI_PRODUCT_INTEL_PINEVIEW_IGC_2 0xa002 /* Pineview Video */
> @@ -7012,6 +7041,7 @@
>  #define PCI_PRODUCT_TOSHIBA_R4X00 0x102f /* R4x00 PCI */
>  
>  /* Toshiba(2) products */
> +#define PCI_PRODUCT_TOSHIBA2_NVME 0x0115 /* NVMe */
>  #define PCI_PRODUCT_TOSHIBA2_THB 0x0601 /* PCI */
>  #define PCI_PRODUCT_TOSHIBA2_ISA 0x0602 /* ISA */
>  #define PCI_PRODUCT_TOSHIBA2_ToPIC95 0x0603 /* ToPIC95 CardBus-PCI */
> Index: pcidevs_data.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
> retrieving revision 1.1802
> diff -u -p -r1.1802 pcidevs_data.h
> --- pcidevs_data.h 19 Mar 2017 07:28:34 -0000 1.1802
> +++ pcidevs_data.h 19 Mar 2017 09:44:22 -0000
> @@ -11077,11 +11077,15 @@ static const struct pci_known_product pc
>   },
>   {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2,
> -    "I219-LM2",
> +    "I219-LM",
>   },
>   {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2,
> -    "I219-V2",
> +    "I219-V",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3,
> +    "I219-LM",
>   },
>   {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_KR,
> @@ -11116,6 +11120,22 @@ static const struct pci_known_product pc
>      "X550T",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5,
> +    "I219-V",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM4,
> +    "I219-LM",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4,
> +    "I219-V",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5,
> +    "I219-LM",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_H_PCIE_X16,
>      "Core 5G PCIE",
>   },
> @@ -11236,8 +11256,8 @@ static const struct pci_known_product pc
>      "Core 6G Host",
>   },
>   {
> -    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SKYLAKE_GMM,
> -    "Skylake GMM",
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_GMM_1,
> +    "Core GMM",
>   },
>   {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE6G_D_GT2_1,
> @@ -12288,6 +12308,14 @@ static const struct pci_known_product pc
>      "Dual Band Wireless AC 4165",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3168_1,
> +    "Dual Band Wireless-AC 3168",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8265_1,
> +    "Dual Band Wireless-AC 8265",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_HB,
>      "82820 Host",
>   },
> @@ -15556,6 +15584,66 @@ static const struct pci_known_product pc
>      "QEMU NVM Express Controller",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_S_GT1,
> +    "HD Graphics 610",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_HB,
> +    "Core 7G Host",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT1,
> +    "HD Graphics 610",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_HB,
> +    "Core 7G Host",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT1,
> +    "HD Graphics",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_GMM_2,
> +    "Core GMM",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_S_GT2,
> +    "HD Graphics 630",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_1,
> +    "HD Graphics 620",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_IMGU,
> +    "Core 7G Imaging Unit",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_SRV_GT2,
> +    "HD Graphics P630",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_H_GT2,
> +    "HD Graphics 630",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_2,
> +    "HD Graphics P630",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT2,
> +    "HD Graphics 615",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W,
> +    "Iris Plus Graphics 640",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W,
> +    "Iris Plus Graphics 650",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5100_HB,
>      "5100 Host",
>   },
> @@ -17036,10 +17124,38 @@ static const struct pci_known_product pc
>      "100 Series LPC",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_Y_LPC_1,
> +    "200 Series LPC",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_1,
> +    "200 Series LPC",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_2,
> +    "200 Series LPC",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_3,
> +    "200 Series LPC",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_Y_LPC_2,
> +    "200 Series LPC",
> + },
> + {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_LPC_4,
> +    "200 Series LPC",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_HDA,
>      "100 Series HD Audio",
>   },
>   {
> +    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_HDA,
> +    "200 Series HD Audio",
> + },
> + {
>      PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_DMI,
>      "Pineview DMI",
>   },
> @@ -24434,6 +24550,10 @@ static const struct pci_known_product pc
>   {
>      PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_R4X00,
>      "R4x00 PCI",
> + },
> + {
> +    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_NVME,
> +    "NVMe",
>   },
>   {
>      PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_THB,
>
>

Loading...