Module Name: src Committed By: snj Date: Thu Apr 30 19:27:20 UTC 2015
Modified Files: src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c src/sys/dev/pci [netbsd-7]: ichsmb.c pucdata.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #725): sys/arch/x86/pci/ichlpcib.c: revisions 1.47, 1.48 sys/dev/pci/ichsmb.c: revisions 1.39, 1.40, 1.41 sys/dev/pci/pucdata.c: revision 1.94 Add 9 Series support. -- Add Intel C61x and X99 devices. -- attach Mobile 5th Gen. Core SMBus To generate a diff of this commit: cvs rdiff -u -r1.43.4.3 -r1.43.4.4 src/sys/arch/x86/pci/ichlpcib.c cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/dev/pci/ichsmb.c cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/pci/pucdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/pci/ichlpcib.c diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.3 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.4 --- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.3 Tue Feb 17 15:06:07 2015 +++ src/sys/arch/x86/pci/ichlpcib.c Thu Apr 30 19:27:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $ */ +/* $NetBSD: ichlpcib.c,v 1.43.4.4 2015/04/30 19:27:20 snj Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.4 2015/04/30 19:27:20 snj Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -257,6 +257,10 @@ static struct lpcib_device { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q87_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_QM87_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_B85_LPC, 1, 0 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H97_LPC, 1, 0 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z97_LPC, 1, 0 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC, 1, 0 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC_2, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C222_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C224_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 }, Index: src/sys/dev/pci/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.37.2.1 src/sys/dev/pci/ichsmb.c:1.37.2.2 --- src/sys/dev/pci/ichsmb.c:1.37.2.1 Tue Feb 17 15:06:07 2015 +++ src/sys/dev/pci/ichsmb.c Thu Apr 30 19:27:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $ */ +/* $NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -110,12 +110,15 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_6SERIES_SMB: case PCI_PRODUCT_INTEL_7SERIES_SMB: case PCI_PRODUCT_INTEL_8SERIES_SMB: + case PCI_PRODUCT_INTEL_9SERIES_SMB: case PCI_PRODUCT_INTEL_CORE4G_M_SMB: + case PCI_PRODUCT_INTEL_CORE5G_M_SMB: case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB: case PCI_PRODUCT_INTEL_C600_SMBUS: case PCI_PRODUCT_INTEL_C600_SMB_0: case PCI_PRODUCT_INTEL_C600_SMB_1: case PCI_PRODUCT_INTEL_C600_SMB_2: + case PCI_PRODUCT_INTEL_C610_SMB: case PCI_PRODUCT_INTEL_EP80579_SMB: case PCI_PRODUCT_INTEL_DH89XXCC_SMB: case PCI_PRODUCT_INTEL_DH89XXCL_SMB: Index: src/sys/dev/pci/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.93 src/sys/dev/pci/pucdata.c:1.93.4.1 --- src/sys/dev/pci/pucdata.c:1.93 Thu Feb 6 15:51:02 2014 +++ src/sys/dev/pci/pucdata.c Thu Apr 30 19:27:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.93 2014/02/06 15:51:02 msaitoh Exp $ */ +/* $NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93 2014/02/06 15:51:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1893,6 +1893,15 @@ const struct puc_device_description puc_ }, }, + /* Intel 9 Series KT */ + { "Intel 9 Series KT", + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_KT, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ }, + }, + }, + /* Intel C600/X79 Series KT */ { "Intel C600/X79 Series KT", { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },