summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2013-09-17 13:36:32 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2013-09-17 13:36:32 +0000
commit767147120c4802ee323f29d22d8e038d356e0f8b (patch)
treeadaaa8a1ae016ae358dd9d25d79c340e85df7571
parentd003e91419ce243928bcdb54855eff8037df793f (diff)
Rename existing AMD Family 15h Models 00h-0Fh Processor entries and add
a bunch of AMD Family 15h Models 10h-1Fh Processor entries.
-rw-r--r--sys/dev/pci/km.c4
-rw-r--r--sys/dev/pci/pcidevs28
2 files changed, 23 insertions, 9 deletions
diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c
index f4369fb548a..3b6464b5b5d 100644
--- a/sys/dev/pci/km.c
+++ b/sys/dev/pci/km.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: km.c,v 1.6 2013/03/14 14:50:25 brynet Exp $ */
+/* $OpenBSD: km.c,v 1.7 2013/09/17 13:36:31 kettenis Exp $ */
/*
* Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -71,7 +71,7 @@ static const struct pci_matchid km_devices[] = {
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_10_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_MISC },
- { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_MISC }
+ { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_15_0x_MISC }
};
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index d3af2673283..df30bf2e38a 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$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 $ */
/*
@@ -687,18 +687,32 @@ product AMD AMD64_11_ADDR 0x1301 AMD64 11h Address Map
product AMD AMD64_11_DRAM 0x1302 AMD64 11h DRAM Cfg
product AMD AMD64_11_MISC 0x1303 AMD64 11h Misc Cfg
product AMD AMD64_11_LINK 0x1304 AMD64 11h Link Cfg
+product AMD AMD64_15_1x_LINK 0x1400 AMD64 15/1xh Link Cfg
+product AMD AMD64_15_1x_ADDR 0x1401 AMD64 15/1xh Address Map
+product AMD AMD64_15_1x_DRAM 0x1402 AMD64 15/1xh DRAM Cfg
+product AMD AMD64_15_1x_MISC 0x1403 AMD64 15/1xh Misc Cfg
+product AMD AMD64_15_1x_CPU_PM 0x1404 AMD64 15/1xh CPU Power
+product AMD AMD64_15_1x_NB_PM 0x1405 AMD64 15/1xh NB Power
+product AMD AMD64_15_1x_HB 0x1410 AMD64 15/1xh Host
+product AMD AMD64_15_1x_PCIE_1 0x1412 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_2 0x1413 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_3 0x1414 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_4 0x1415 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_5 0x1416 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_6 0x1417 AMD64 15/1xh PCIE
+product AMD AMD64_15_1x_PCIE_7 0x1418 AMD64 15/1xh PCIE
product AMD AMD64_14_HB 0x1510 AMD64 14h Host
product AMD AMD64_14_PCIE_1 0x1512 AMD64 14h PCIE
product AMD AMD64_14_PCIE_2 0x1513 AMD64 14h PCIE
product AMD AMD64_14_PCIE_3 0x1514 AMD64 14h PCIE
product AMD AMD64_14_PCIE_4 0x1515 AMD64 14h PCIE
product AMD AMD64_14_PCIE_5 0x1516 AMD64 14h PCIE
-product AMD AMD64_15_LINK 0x1600 AMD64 15h Link Cfg
-product AMD AMD64_15_ADDR 0x1601 AMD64 15h Address Map
-product AMD AMD64_15_DRAM 0x1602 AMD64 15h DRAM Cfg
-product AMD AMD64_15_MISC 0x1603 AMD64 15h Misc Cfg
-product AMD AMD64_15_CPU_PM 0x1604 AMD64 15h CPU Power
-product AMD AMD64_15_HB 0x1605 AMD64 15h Host
+product AMD AMD64_15_0x_LINK 0x1600 AMD64 15/0xh Link Cfg
+product AMD AMD64_15_0x_ADDR 0x1601 AMD64 15/0xh Address Map
+product AMD AMD64_15_0x_DRAM 0x1602 AMD64 15/0xh DRAM Cfg
+product AMD AMD64_15_0x_MISC 0x1603 AMD64 15/0xh Misc Cfg
+product AMD AMD64_15_0x_CPU_PM 0x1604 AMD64 15/0xh CPU Power
+product AMD AMD64_15_0x_HB 0x1605 AMD64 15/0xh Host
product AMD AMD64_14_LINK 0x1700 AMD64 14h Link Cfg
product AMD AMD64_14_ADDR 0x1701 AMD64 14h Address Map
product AMD AMD64_14_DRAM 0x1702 AMD64 14h DRAM Cfg