Index: share/man/man4/Makefile =================================================================== RCS file: /cvs/src/share/man/man4/Makefile,v retrieving revision 1.678 diff -u -p -r1.678 Makefile --- share/man/man4/Makefile 7 Apr 2018 18:30:53 -0000 1.678 +++ share/man/man4/Makefile 20 Apr 2018 03:01:47 -0000 @@ -17,7 +17,7 @@ MAN= aac.4 ac97.4 acphy.4 acrtc.4 \ bce.4 bcmaux.4 bcmdog.4 bcmrng.4 bcmtemp.4 berkwdt.4 bge.4 \ bgw.4 bio.4 bktr.4 bmtphy.4 bnx.4 \ boca.4 bpf.4 brgphy.4 bridge.4 brswphy.4 bwfm.4 bwi.4 bytgpio.4 \ - cac.4 cas.4 cardbus.4 carp.4 cd.4 cdce.4 cfxga.4 \ + cac.4 cas.4 cardbus.4 carp.4 ccp.4 cd.4 cdce.4 cfxga.4 \ ch.4 chvgpio.4 ciphy.4 ciss.4 clcs.4 clct.4 cmpci.4 \ com.4 cue.4 cy.4 cz.4 \ dc.4 dcphy.4 ddb.4 de.4 diskmap.4 divert.4 dpt.4 drm.4 dwctwo.4 \ Index: sys/arch/amd64/amd64/machdep.c =================================================================== RCS file: /cvs/src/sys/arch/amd64/amd64/machdep.c,v retrieving revision 1.241 diff -u -p -r1.241 machdep.c --- sys/arch/amd64/amd64/machdep.c 12 Apr 2018 17:13:43 -0000 1.241 +++ sys/arch/amd64/amd64/machdep.c 20 Apr 2018 03:01:47 -0000 @@ -1439,6 +1439,16 @@ init_x86_64(paddr_t first_avail) continue; } + /* + * The direct map is limited to 512GB of memory, so + * discard anything above that. + */ + if (e1 >= (uint64_t)512*1024*1024*1024) { + e1 = ((uint64_t)512*1024*1024*1024) - PAGE_SIZE; + if (s1 > e1) + continue; + } + /* Crop stuff into "640K hole" */ if (s1 < IOM_BEGIN && e1 > IOM_BEGIN) e1 = IOM_BEGIN; Index: sys/arch/amd64/conf/GENERIC =================================================================== RCS file: /cvs/src/sys/arch/amd64/conf/GENERIC,v retrieving revision 1.452 diff -u -p -r1.452 GENERIC --- sys/arch/amd64/conf/GENERIC 27 Mar 2018 21:11:16 -0000 1.452 +++ sys/arch/amd64/conf/GENERIC 20 Apr 2018 03:01:47 -0000 @@ -98,6 +98,7 @@ kate* at pci? # AMD K8 temperature sen km* at pci? # AMD K10 temperature sensor amas* at pci? disable # AMD memory configuration pchtemp* at pci? # Intel C610 termperature sensor +ccp* at pci? # AMD Cryptographic Co-processor # National Semiconductor LM7[89] and compatible hardware monitors lm0 at isa? port 0x290 Index: sys/arch/arm64/conf/GENERIC =================================================================== RCS file: /cvs/src/sys/arch/arm64/conf/GENERIC,v retrieving revision 1.66 diff -u -p -r1.66 GENERIC --- sys/arch/arm64/conf/GENERIC 7 Apr 2018 18:31:22 -0000 1.66 +++ sys/arch/arm64/conf/GENERIC 20 Apr 2018 03:01:47 -0000 @@ -60,6 +60,7 @@ pci* at pciecam? sdhc* at fdt? sdmmc* at sdhc? xhci* at fdt? +ccp* at fdt? # AMD Cryptographic Co-processor # NS16550 compatible serial ports com* at fdt? Index: sys/conf/files =================================================================== RCS file: /cvs/src/sys/conf/files,v retrieving revision 1.660 diff -u -p -r1.660 files --- sys/conf/files 14 Feb 2018 23:51:49 -0000 1.660 +++ sys/conf/files 20 Apr 2018 03:01:47 -0000 @@ -464,6 +464,10 @@ file dev/usb/ehci.c ehci needs-flag device xhci: usbus file dev/usb/xhci.c xhci needs-flag +# AMD Cryptographic Co-processor +device ccp +file dev/ic/ccp.c ccp + # SDHC SD/MMC controller device sdhc: sdmmcbus file dev/sdmmc/sdhc.c sdhc Index: sys/dev/fdt/files.fdt =================================================================== RCS file: /cvs/src/sys/dev/fdt/files.fdt,v retrieving revision 1.57 diff -u -p -r1.57 files.fdt --- sys/dev/fdt/files.fdt 2 Apr 2018 21:40:59 -0000 1.57 +++ sys/dev/fdt/files.fdt 20 Apr 2018 03:01:47 -0000 @@ -229,3 +229,6 @@ file dev/fdt/imxuart.c imxuart device fec: ether, ifnet, mii, ifmedia attach fec at fdt file dev/fdt/if_fec.c fec + +attach ccp at fdt with ccp_fdt +file dev/fdt/ccp_fdt.c ccp_fdt Index: sys/dev/pci/files.pci =================================================================== RCS file: /cvs/src/sys/dev/pci/files.pci,v retrieving revision 1.333 diff -u -p -r1.333 files.pci --- sys/dev/pci/files.pci 24 Dec 2017 19:50:56 -0000 1.333 +++ sys/dev/pci/files.pci 20 Apr 2018 03:01:47 -0000 @@ -819,5 +819,9 @@ file dev/pci/dwiic_pci.c dwiic_pci attach bwfm at pci with bwfm_pci: firmload file dev/pci/if_bwfm_pci.c bwfm_pci +# AMD Cryptographic Co-processor +attach ccp at pci with ccp_pci +file dev/pci/ccp_pci.c ccp_pci + include "dev/pci/files.agp" include "dev/pci/drm/files.drm" Index: sys/dev/pci/pcidevs =================================================================== RCS file: /cvs/src/sys/dev/pci/pcidevs,v retrieving revision 1.1843 diff -u -p -r1.1843 pcidevs --- sys/dev/pci/pcidevs 14 Apr 2018 20:27:17 -0000 1.1843 +++ sys/dev/pci/pcidevs 20 Apr 2018 03:01:47 -0000 @@ -719,6 +719,8 @@ product AMD AMD64_15_1x_PCIE_6 0x1417 AM product AMD AMD64_15_1x_PCIE_7 0x1418 AMD64 15/1xh PCIE product AMD AMD64_15_1x_IOMMU 0x1419 AMD64 15/1xh IOMMU product AMD AMD64_16_PCIE 0x1439 AMD64 16h PCIE +product AMD CCPV5A 0x1456 Cryptographic Co-processor v5a +product AMD CCPV5B 0x1468 Cryptographic Co-processor v5b 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 @@ -731,7 +733,7 @@ product AMD AMD64_16_DRAM 0x1532 AMD64 1 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 CCP 0x1537 CCP +product AMD CCPV3 0x1537 Cryptographic Co-processor v3 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 Index: sys/dev/pci/pcidevs.h =================================================================== RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v retrieving revision 1.1836 diff -u -p -r1.1836 pcidevs.h --- sys/dev/pci/pcidevs.h 14 Apr 2018 20:27:38 -0000 1.1836 +++ sys/dev/pci/pcidevs.h 20 Apr 2018 03:01:47 -0000 @@ -724,6 +724,8 @@ #define PCI_PRODUCT_AMD_AMD64_15_1x_PCIE_7 0x1418 /* AMD64 15/1xh PCIE */ #define PCI_PRODUCT_AMD_AMD64_15_1x_IOMMU 0x1419 /* AMD64 15/1xh IOMMU */ #define PCI_PRODUCT_AMD_AMD64_16_PCIE 0x1439 /* AMD64 16h PCIE */ +#define PCI_PRODUCT_AMD_CCPV5A 0x1456 /* Cryptographic Co-processor v5a */ +#define PCI_PRODUCT_AMD_CCPV5B 0x1468 /* Cryptographic Co-processor v5b */ #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 */ @@ -736,7 +738,7 @@ #define PCI_PRODUCT_AMD_AMD64_16_MISC 0x1533 /* AMD64 16h Misc Cfg */ #define PCI_PRODUCT_AMD_AMD64_16_CPU_PM 0x1534 /* AMD64 16h CPU Power */ #define PCI_PRODUCT_AMD_AMD64_16_HB 0x1536 /* AMD64 16h Host */ -#define PCI_PRODUCT_AMD_CCP 0x1537 /* CCP */ +#define PCI_PRODUCT_AMD_CCPV3 0x1537 /* Cryptographic Co-processor v3 */ #define PCI_PRODUCT_AMD_AMD64_16_3X_RC 0x1566 /* AMD64 16h Root Complex */ #define PCI_PRODUCT_AMD_AMD64_16_3X_HB 0x156b /* AMD64 16h Host */ #define PCI_PRODUCT_AMD_AMD64_15_6X_LINK 0x1570 /* AMD64 15h Link Cfg */ Index: sys/dev/pci/pcidevs_data.h =================================================================== RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v retrieving revision 1.1831 diff -u -p -r1.1831 pcidevs_data.h --- sys/dev/pci/pcidevs_data.h 14 Apr 2018 20:27:38 -0000 1.1831 +++ sys/dev/pci/pcidevs_data.h 20 Apr 2018 03:01:47 -0000 @@ -1232,6 +1232,14 @@ static const struct pci_known_product pc "AMD64 16h PCIE", }, { + PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV5A, + "Cryptographic Co-processor v5a", + }, + { + PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV5B, + "Cryptographic Co-processor v5b", + }, + { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_HB, "AMD64 14h Host", }, @@ -1280,8 +1288,8 @@ static const struct pci_known_product pc "AMD64 16h Host", }, { - PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCP, - "CCP", + PCI_VENDOR_AMD, PCI_PRODUCT_AMD_CCPV3, + "Cryptographic Co-processor v3", }, { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_16_3X_RC,