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
> cje...@kimiko.zyd.ch:/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",
> },
>
