diff options
| author |   kettenis <kettenis@openbsd.org> | 2019-05-05 09:09:59 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2019-05-05 09:09:59 +0000 |
| commit | 1d6a3b1f83ce6aa103613603073fcb94838f1f43 (patch) | |
| tree | a05f031816d904ad753ecd5b38bc52add4681cf8 | |
| parent | sentences start with capitals; (diff) | |
| download | wireguard-openbsd-1d6a3b1f83ce6aa103613603073fcb94838f1f43.tar.xz wireguard-openbsd-1d6a3b1f83ce6aa103613603073fcb94838f1f43.zip | |
Harmonize AMD CPU/APU devices.
ok jsg@
| -rw-r--r-- | sys/dev/pci/azalia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/ccp_pci.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 15 |
3 files changed, 15 insertions, 14 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 0ff330430d6..aac04b29c07 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.247 2019/04/08 10:16:10 stsp Exp $ */ +/* $OpenBSD: azalia.c,v 1.248 2019/05/05 09:09:59 kettenis Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -521,7 +521,7 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux) if (PCI_VENDOR(sc->pciid) == PCI_VENDOR_AMD) { switch (PCI_PRODUCT(sc->pciid)) { case PCI_PRODUCT_AMD_AMD64_17_HDA: - case PCI_PRODUCT_AMD_RAVENRIDGE_HDA: + case PCI_PRODUCT_AMD_AMD64_17_1X_HDA: pa->pa_flags &= ~PCI_FLAGS_MSI_ENABLED; } } diff --git a/sys/dev/pci/ccp_pci.c b/sys/dev/pci/ccp_pci.c index d466442e961..2259594644b 100644 --- a/sys/dev/pci/ccp_pci.c +++ b/sys/dev/pci/ccp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccp_pci.c,v 1.2 2019/05/02 09:52:36 kettenis Exp $ */ +/* $OpenBSD: ccp_pci.c,v 1.3 2019/05/05 09:09:59 kettenis Exp $ */ /* * Copyright (c) 2018 David Gwynne <dlg@openbsd.org> @@ -43,10 +43,10 @@ struct cfattach ccp_pci_ca = { }; static const struct pci_matchid ccp_pci_devices[] = { - { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV3 }, - { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV5A }, - { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV5B }, - { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV5C }, + { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_16_CCP }, + { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_CCP_1 }, + { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_CCP_2 }, + { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_17_1X_CCP }, }; int diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 0d27e76b91c..b94b2e0c7ca 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1886 2019/05/02 09:49:36 kettenis Exp $ +$OpenBSD: pcidevs,v 1.1887 2019/05/05 09:09:59 kettenis Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -736,9 +736,9 @@ product AMD AMD64_17_IOMMU 0x1451 AMD64 17h IOMMU product AMD AMD64_17_PCIE_1 0x1452 AMD64 17h PCIE product AMD AMD64_17_PCIE_2 0x1453 AMD64 17h PCIE product AMD AMD64_17_PCIE_3 0x1454 AMD64 17h PCIE -product AMD CCPV5A 0x1456 Cryptographic Co-processor v5a +product AMD AMD64_17_CCP_1 0x1456 AMD64 17h Crypto product AMD AMD64_17_HDA 0x1457 AMD64 17h HD Audio -product AMD AMD64_17_XHCI 0x145c AMD64 17h xHCI +product AMD AMD64_17_XHCI_1 0x145c AMD64 17h xHCI product AMD AMD64_17_XHCI_2 0x145f AMD64 17h xHCI product AMD AMD64_17_DF_1 0x1460 AMD64 17h Data Fabric product AMD AMD64_17_DF_2 0x1461 AMD64 17h Data Fabric @@ -748,7 +748,7 @@ product AMD AMD64_17_DF_5 0x1464 AMD64 17h Data Fabric product AMD AMD64_17_DF_6 0x1465 AMD64 17h Data Fabric product AMD AMD64_17_DF_7 0x1466 AMD64 17h Data Fabric product AMD AMD64_17_DF_8 0x1467 AMD64 17h Data Fabric -product AMD CCPV5B 0x1468 Cryptographic Co-processor v5b +product AMD AMD64_17_CCP_2 0x1468 AMD64 17h Crypto product AMD AMD64_17_PCIE_4 0x1470 AMD64 17h PCIE product AMD AMD64_17_PCIE_5 0x1471 AMD64 17h PCIE product AMD AMD64_14_HB 0x1510 AMD64 14h Host @@ -763,7 +763,7 @@ product AMD AMD64_16_DRAM 0x1532 AMD64 16h DRAM Cfg product AMD AMD64_16_MISC 0x1533 AMD64 16h Misc Cfg product AMD AMD64_16_CPU_PM 0x1534 AMD64 16h CPU Power product AMD AMD64_16_HB 0x1536 AMD64 16h Host -product AMD CCPV3 0x1537 Cryptographic Co-processor v3 +product AMD AMD64_16_CCP 0x1537 AMD64 16h Crypto product AMD AMD64_16_3X_RC 0x1566 AMD64 16h Root Complex product AMD AMD64_16_3X_HB 0x156b AMD64 16h Host product AMD AMD64_15_6X_LINK 0x1570 AMD64 15h Link Cfg @@ -790,10 +790,11 @@ product AMD AMD64_17_1X_IOMMU 0x15d1 AMD64 17h/1xh IOMMU product AMD AMD64_17_1X_PCIE_1 0x15d3 AMD64 17h/1xh PCIE product AMD AMD64_17_1X_PCIE_2 0x15db AMD64 17h/1xh PCIE product AMD AMD64_17_1X_PCIE_3 0x15dc AMD64 17h/1xh PCIE -product AMD CCPV5C 0x15df Cryptographic Co-processor v5c +product AMD AMD64_17_1X_CCP 0x15df AMD64 17h/1xh Crypto product AMD AMD64_17_1X_XHCI_1 0x15e0 AMD64 17h/1xh xHCI product AMD AMD64_17_1X_XHCI_2 0x15e1 AMD64 17h/1xh xHCI -product AMD RAVENRIDGE_HDA 0x15e3 Raven Ridge HD Audio +product AMD AMD64_17_1X_ACP 0x15e2 AMD64 17h/1xh I2S Audio +product AMD AMD64_17_1X_HDA 0x15e3 AMD64 17h/1xh HD Audio product AMD AMD64_17_1X_DF_0 0x15e8 AMD64 17h/1xh Data Fabric product AMD AMD64_17_1X_DF_1 0x15e9 AMD64 17h/1xh Data Fabric product AMD AMD64_17_1X_DF_2 0x15ea AMD64 17h/1xh Data Fabric |