On Mon, Aug 11, 2014 at 02:30:22PM -0600, Todd C. Miller wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: mill...@cvs.openbsd.org 2014/08/11 14:30:22
>
> Modified files:
> sys/dev/pci : pcidevs
>
> Log message:
> Add some Intel Z97 chipset devices; ok deraadt@
You're wrongly calling some of the 9 Series devices
there LP, while a datasheet is only available for the
seperate chip at the moment, 9 series LP/Wildcat Point LP
will likely be called something like
'Mobile 5th Generation Intel Core Processor Family I/O'.
The following diff fixes that, adds some more 9 series &
9 series lp ids and adds them to various drivers.
Index: pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1736
diff -u -p -r1.1736 pcidevs
--- pcidevs 11 Aug 2014 20:30:22 -0000 1.1736
+++ pcidevs 12 Aug 2014 02:25:04 -0000
@@ -4269,16 +4269,31 @@ product INTEL C222_LPC 0x8c52 C222 LPC
product INTEL C224_LPC 0x8c54 C224 LPC
product INTEL C226_LPC 0x8c56 C226 LPC
product INTEL H81_LPC 0x8c5c H81 LPC
-product INTEL 9SERIES_LP_AHCI 0x8c82 9 Series AHCI
-product INTEL 9SERIES_LP_PCIE_1 0x8c90 9 Series PCIE
-product INTEL 9SERIES_LP_PCIE_2 0x8c9a 9 Series PCIE
-product INTEL 9SERIES_LP_HDA 0x8ca0 9 Series HD Audio
-product INTEL 9SERIES_LP_SMB 0x8ca2 9 Series SMBus
+product INTEL 9SERIES_SATA_1 0x8c80 9 Series SATA
+product INTEL 9SERIES_AHCI 0x8c82 9 Series AHCI
+product INTEL 9SERIES_RAID_1 0x8c84 9 Series RAID
+product INTEL 9SERIES_RAID_2 0x8c86 9 Series RAID
+product INTEL 9SERIES_SATA_2 0x8c88 9 Series SATA
+product INTEL 9SERIES_RAID_3 0x8c8e 9 Series RAID
+product INTEL 9SERIES_PCIE_1 0x8c90 9 Series PCIE
+product INTEL 9SERIES_PCIE_2 0x8c92 9 Series PCIE
+product INTEL 9SERIES_PCIE_3 0x8c94 9 Series PCIE
+product INTEL 9SERIES_PCIE_4 0x8c96 9 Series PCIE
+product INTEL 9SERIES_PCIE_5 0x8c98 9 Series PCIE
+product INTEL 9SERIES_PCIE_6 0x8c9a 9 Series PCIE
+product INTEL 9SERIES_PCIE_7 0x8c9c 9 Series PCIE
+product INTEL 9SERIES_PCIE_8 0x8c9e 9 Series PCIE
+product INTEL 9SERIES_HDA 0x8ca0 9 Series HD Audio
+product INTEL 9SERIES_SMB 0x8ca2 9 Series SMBus
product INTEL 9SERIES_EHCI_1 0x8ca6 9 Series EHCI
product INTEL 9SERIES_EHCI_2 0x8cad 9 Series EHCI
product INTEL 9SERIES_XHCI 0x8cb1 9 Series xHCI
product INTEL 9SERIES_MEI_1 0x8cba 9 Series MEI
+product INTEL 9SERIES_MEI_2 0x8cbb 9 Series MEI
+product INTEL 9SERIES_IDER 0x8cbc 9 Series IDER
+product INTEL 9SERIES_KT 0x8cbd 9 Series KT
product INTEL Z97_LPC 0x8cc4 Z97 LPC
+product INTEL H97_LPC 0x8cc6 H97 LPC
product INTEL I2OPCIB 0x9620 I2O RAID
product INTEL RCU21 0x9621 RCU21 I2O RAID
product INTEL RCUxx 0x9622 RCUxx I2O RAID
@@ -4303,9 +4318,29 @@ product INTEL 8SERIES_LP_EHCI 0x9c26 8 S
product INTEL 8SERIES_LP_XHCI 0x9c31 8 Series xHCI
product INTEL 8SERIES_LP_MEI_1 0x9c3a 8 Series MEI
product INTEL 8SERIES_LP_MEI_2 0x9c3b 8 Series MEI
+product INTEL 8SERIES_LP_IDER 0x9c3c 8 Series IDER
+product INTEL 8SERIES_LP_KT 0x9c3d 8 Series KT
product INTEL 8SERIES_LP_LPC_1 0x9c41 8 Series LPC
product INTEL 8SERIES_LP_LPC_2 0x9c43 8 Series LPC
product INTEL 8SERIES_LP_LPC_3 0x9c45 8 Series LPC
+product INTEL 9SERIES_LP_AHCI 0x9c83 9 Series AHCI
+product INTEL 9SERIES_LP_RAID_1 0x9c85 9 Series RAID
+product INTEL 9SERIES_LP_RAID_2 0x9c87 9 Series RAID
+product INTEL 9SERIES_LP_RAID_3 0x9c8f 9 Series RAID
+product INTEL 9SERIES_LP_PCIE_1 0x9c90 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_2 0x9c92 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_3 0x9c94 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_4 0x9c96 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_5 0x9c98 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_6 0x9c9a 9 Series PCIE
+product INTEL 9SERIES_LP_MEI_1 0x9cba 9 Series MEI
+product INTEL 9SERIES_LP_MEI_2 0x9cbb 9 Series MEI
+product INTEL 9SERIES_LP_IDER 0x9cbc 9 Series IDER
+product INTEL 9SERIES_LP_KT 0x9cbd 9 Series KT
+product INTEL 9SERIES_LP_HDA 0x9ca0 9 Series HD Audio
+product INTEL 9SERIES_LP_SMB 0x9ca2 9 Series SMBus
+product INTEL 9SERIES_LP_EHCI 0x9ca6 9 Series USB
+product INTEL 9SERIES_LP_XHCI 0x9cb1 9 Series xHCI
product INTEL PINEVIEW_DMI 0xa000 Pineview DMI
product INTEL PINEVIEW_IGC_1 0xa001 Pineview Video
product INTEL PINEVIEW_IGC_2 0xa002 Pineview Video
Index: ichiic.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/ichiic.c,v
retrieving revision 1.33
diff -u -p -r1.33 ichiic.c
--- ichiic.c 10 Mar 2014 02:31:12 -0000 1.33
+++ ichiic.c 12 Aug 2014 02:15:29 -0000
@@ -92,6 +92,8 @@ const struct pci_matchid ichiic_ids[] =
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_LP_SMB },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_SMB },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_LP_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_SMB },
Index: azalia.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.215
diff -u -p -r1.215 azalia.c
--- azalia.c 13 Jul 2014 23:10:23 -0000 1.215
+++ azalia.c 12 Aug 2014 02:16:00 -0000
@@ -463,6 +463,8 @@ azalia_configure_pci(azalia_t *az)
case PCI_PRODUCT_INTEL_7SERIES_HDA:
case PCI_PRODUCT_INTEL_8SERIES_HDA:
case PCI_PRODUCT_INTEL_8SERIES_LP_HDA:
+ case PCI_PRODUCT_INTEL_9SERIES_HDA:
+ case PCI_PRODUCT_INTEL_9SERIES_LP_HDA:
reg = azalia_pci_read(az->pc, az->tag,
INTEL_PCIE_NOSNOOP_REG);
reg &= INTEL_PCIE_NOSNOOP_MASK;
Index: pucdata.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pucdata.c,v
retrieving revision 1.92
diff -u -p -r1.92 pucdata.c
--- pucdata.c 2 Feb 2014 19:25:41 -0000 1.92
+++ pucdata.c 12 Aug 2014 02:20:03 -0000
@@ -55,13 +55,41 @@ const struct puc_device_description puc_
{ PUC_COM_POW2(0), 0x10, 0x0000 },
},
},
- { /* Series KT */
+ { /* 7 Series KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_KT, 0x0000, 0x0000
},
{ 0xffff, 0xffff, 0x0000, 0x0000
},
{
{ PUC_COM_POW2(0), 0x10, 0x0000 },
},
},
+ { /* 8 Series KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_KT, 0x0000, 0x0000
},
+ { 0xffff, 0xffff, 0x0000, 0x0000
},
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 8 Series LP KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_LP_KT, 0x0000,
0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000
},
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 9 Series KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_KT, 0x0000, 0x0000
},
+ { 0xffff, 0xffff, 0x0000, 0x0000
},
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 9 Series LP KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_LP_KT, 0x0000,
0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000
},
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
{ /* 82946GZ KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_KT, 0x0000, 0x0000
},
{ 0xffff, 0xffff, 0x0000, 0x0000
},
@@ -141,13 +169,6 @@ const struct puc_device_description puc_
},
{ /* 3400 KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0x0000, 0x0000 },
- { 0xffff, 0xffff, 0x0000, 0x0000
},
- {
- { PUC_COM_POW2(0), 0x10, 0x0000 },
- },
- },
- { /* 8 Series KT */
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_KT, 0x0000, 0x0000
},
{ 0xffff, 0xffff, 0x0000, 0x0000
},
{
{ PUC_COM_POW2(0), 0x10, 0x0000 },
Index: pciide.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pciide.c,v
retrieving revision 1.347
diff -u -p -r1.347 pciide.c
--- pciide.c 13 Jul 2014 23:19:51 -0000 1.347
+++ pciide.c 12 Aug 2014 02:21:09 -0000
@@ -625,6 +625,14 @@ const struct pciide_product_desc pciide_
0,
piixsata_chip_map
},
+ { PCI_PRODUCT_INTEL_9SERIES_SATA_1, /* Intel 9 Series SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_9SERIES_SATA_2, /* Intel 9 Series SATA */
+ 0,
+ piixsata_chip_map
+ },
{ PCI_PRODUCT_INTEL_ATOMC2000_SATA_1, /* Intel Atom C2000 SATA */
0,
piixsata_chip_map
