regen

2 files changed, 90 insertions, 20 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index ebd5f547dd1..5f812c696a0 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1685 2013/09/11 09:29:20 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1686 2013/09/17 13:36:30 kettenis Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -692,18 +692,32 @@
 #define	PCI_PRODUCT_AMD_AMD64_11_DRAM	0x1302		/* AMD64 11h DRAM Cfg */
 #define	PCI_PRODUCT_AMD_AMD64_11_MISC	0x1303		/* AMD64 11h Misc Cfg */
 #define	PCI_PRODUCT_AMD_AMD64_11_LINK	0x1304		/* AMD64 11h Link Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_LINK	0x1400		/* AMD64 15/1xh Link Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_ADDR	0x1401		/* AMD64 15/1xh Address Map */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_DRAM	0x1402		/* AMD64 15/1xh DRAM Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_MISC	0x1403		/* AMD64 15/1xh Misc Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_CPU_PM	0x1404		/* AMD64 15/1xh CPU Power */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_NB_PM	0x1405		/* AMD64 15/1xh NB Power */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_HB	0x1410		/* AMD64 15/1xh Host */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_1	0x1412		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_2	0x1413		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_3	0x1414		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_4	0x1415		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_5	0x1416		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_6	0x1417		/* AMD64 15/1xh PCIE */
+#define	PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_7	0x1418		/* AMD64 15/1xh PCIE */
 #define	PCI_PRODUCT_AMD_AMD64_14_HB	0x1510		/* AMD64 14h Host */
 #define	PCI_PRODUCT_AMD_AMD64_14_PCIE_1	0x1512		/* AMD64 14h PCIE */
 #define	PCI_PRODUCT_AMD_AMD64_14_PCIE_2	0x1513		/* AMD64 14h PCIE */
 #define	PCI_PRODUCT_AMD_AMD64_14_PCIE_3	0x1514		/* AMD64 14h PCIE */
 #define	PCI_PRODUCT_AMD_AMD64_14_PCIE_4	0x1515		/* AMD64 14h PCIE */
 #define	PCI_PRODUCT_AMD_AMD64_14_PCIE_5	0x1516		/* AMD64 14h PCIE */
-#define	PCI_PRODUCT_AMD_AMD64_15_LINK	0x1600		/* AMD64 15h Link Cfg */
-#define	PCI_PRODUCT_AMD_AMD64_15_ADDR	0x1601		/* AMD64 15h Address Map */
-#define	PCI_PRODUCT_AMD_AMD64_15_DRAM	0x1602		/* AMD64 15h DRAM Cfg */
-#define	PCI_PRODUCT_AMD_AMD64_15_MISC	0x1603		/* AMD64 15h Misc Cfg */
-#define	PCI_PRODUCT_AMD_AMD64_15_CPU_PM	0x1604		/* AMD64 15h CPU Power */
-#define	PCI_PRODUCT_AMD_AMD64_15_HB	0x1605		/* AMD64 15h Host */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_LINK	0x1600		/* AMD64 15/0xh Link Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_ADDR	0x1601		/* AMD64 15/0xh Address Map */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_DRAM	0x1602		/* AMD64 15/0xh DRAM Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_MISC	0x1603		/* AMD64 15/0xh Misc Cfg */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_CPU_PM	0x1604		/* AMD64 15/0xh CPU Power */
+#define	PCI_PRODUCT_AMD_AMD64_15_0x_HB	0x1605		/* AMD64 15/0xh Host */
 #define	PCI_PRODUCT_AMD_AMD64_14_LINK	0x1700		/* AMD64 14h Link Cfg */
 #define	PCI_PRODUCT_AMD_AMD64_14_ADDR	0x1701		/* AMD64 14h Address Map */
 #define	PCI_PRODUCT_AMD_AMD64_14_DRAM	0x1702		/* AMD64 14h DRAM Cfg */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index cf81e8b0a71..590038e5e29 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1685 2013/09/11 09:29:20 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1686 2013/09/17 13:36:30 kettenis Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -1164,6 +1164,62 @@ static const struct pci_known_product pci_known_products[] = {
 	    "AMD64 11h Link Cfg",
 	},
 	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_LINK,
+	    "AMD64 15/1xh Link Cfg",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_ADDR,
+	    "AMD64 15/1xh Address Map",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_DRAM,
+	    "AMD64 15/1xh DRAM Cfg",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_MISC,
+	    "AMD64 15/1xh Misc Cfg",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_CPU_PM,
+	    "AMD64 15/1xh CPU Power",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_NB_PM,
+	    "AMD64 15/1xh NB Power",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_HB,
+	    "AMD64 15/1xh Host",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_1,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_2,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_3,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_4,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_5,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_6,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_7,
+	    "AMD64 15/1xh PCIE",
+	},
+	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_HB,
 	    "AMD64 14h Host",
 	},
@@ -1188,28 +1244,28 @@ static const struct pci_known_product pci_known_products[] = {
 	    "AMD64 14h PCIE",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_LINK,
-	    "AMD64 15h Link Cfg",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_LINK,
+	    "AMD64 15/0xh Link Cfg",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_ADDR,
-	    "AMD64 15h Address Map",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_ADDR,
+	    "AMD64 15/0xh Address Map",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_DRAM,
-	    "AMD64 15h DRAM Cfg",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_DRAM,
+	    "AMD64 15/0xh DRAM Cfg",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_MISC,
-	    "AMD64 15h Misc Cfg",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_MISC,
+	    "AMD64 15/0xh Misc Cfg",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_CPU_PM,
-	    "AMD64 15h CPU Power",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_CPU_PM,
+	    "AMD64 15/0xh CPU Power",
 	},
 	{
-	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_HB,
-	    "AMD64 15h Host",
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_HB,
+	    "AMD64 15/0xh Host",
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_LINK,