Module Name: src
Committed By: jakllsch
Date: Fri Oct 19 21:09:10 UTC 2018
Modified Files:
src/doc: CHANGES
src/sys/arch/evbarm/conf: GENERIC64
src/sys/conf: files
src/sys/dev/acpi: files.acpi
src/sys/dev/fdt: files.fdt
Added Files:
src/sys/dev/acpi: amdccp_acpi.c
src/sys/dev/fdt: amdccp_fdt.c
src/sys/dev/ic: amdccp.c amdccpvar.h
Log Message:
Add amdccp(4) driver for AMD Cryptographic Coprocessor, as found on the
A11xx Opterons. Driver currently provides RNG service only.
To generate a diff of this commit:
cvs rdiff -u -r1.2452 -r1.2453 src/doc/CHANGES
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.1214 -r1.1215 src/sys/conf/files
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/amdccp_acpi.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/amdccp_fdt.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/amdccp.c src/sys/dev/ic/amdccpvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2452 src/doc/CHANGES:1.2453
--- src/doc/CHANGES:1.2452 Fri Oct 19 06:27:02 2018
+++ src/doc/CHANGES Fri Oct 19 21:09:10 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2452 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2453 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -237,3 +237,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
arm: Provide generic start code that allows a GENERIC kernel to be used
on FDTised boards. [skrll 20181018]
tzdata: updated to 2018f [kre 20181019]
+ amdccp(4): Add driver for AMD Cryptographic Coprocessor RNG.
+ [jakllsch 20181019]
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.51 src/sys/arch/evbarm/conf/GENERIC64:1.52
--- src/sys/arch/evbarm/conf/GENERIC64:1.51 Wed Oct 17 00:04:06 2018
+++ src/sys/arch/evbarm/conf/GENERIC64 Fri Oct 19 21:09:09 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.51 2018/10/17 00:04:06 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.52 2018/10/19 21:09:09 jakllsch Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -279,6 +279,8 @@ tcagpio* at iic?
# Random number generators
bcmrng* at fdt? # Broadcom BCM283x RNG
+amdccp* at fdt? # AMD Cryptograhic Coprocessor RNG
+amdccp* at acpi?
# RTC
plrtc* at fdt? # ARM PrimeCell RTC
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1214 src/sys/conf/files:1.1215
--- src/sys/conf/files:1.1214 Mon Oct 15 23:50:48 2018
+++ src/sys/conf/files Fri Oct 19 21:09:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1214 2018/10/15 23:50:48 jmcneill Exp $
+# $NetBSD: files,v 1.1215 2018/10/19 21:09:10 jakllsch Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1386,6 +1386,10 @@ file dev/ic/bwfm.c bwfm
device qemufwcfg
file dev/ic/qemufwcfg.c qemufwcfg
+# AMD Cryptographic Coprocessor
+device amdccp
+file dev/ic/amdccp.c amdccp
+
# legitimate pseudo-devices
#
defpseudodev vnd: disk
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.107 src/sys/dev/acpi/files.acpi:1.108
--- src/sys/dev/acpi/files.acpi:1.107 Wed Oct 17 00:03:47 2018
+++ src/sys/dev/acpi/files.acpi Fri Oct 19 21:09:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.107 2018/10/17 00:03:47 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.108 2018/10/19 21:09:10 jakllsch Exp $
include "dev/acpi/acpica/files.acpica"
@@ -241,4 +241,8 @@ file dev/acpi/plgpio_acpi.c plgpio_acpi
attach dwiic at acpinodebus with dwiic_acpi
file dev/acpi/dwiic_acpi.c dwiic_acpi
+# AMD Cryptographic Coprocessor
+attach amdccp at acpinodebus with amdccp_acpi
+file dev/acpi/amdccp_acpi.c amdccp_acpi
+
include "dev/acpi/wmi/files.wmi"
Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.40 src/sys/dev/fdt/files.fdt:1.41
--- src/sys/dev/fdt/files.fdt:1.40 Mon Oct 15 23:50:48 2018
+++ src/sys/dev/fdt/files.fdt Fri Oct 19 21:09:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.40 2018/10/15 23:50:48 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.41 2018/10/19 21:09:10 jakllsch Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -134,3 +134,7 @@ file dev/fdt/ahcisata_fdt.c ahcisata_f
# Designware I2C
attach dwiic at fdt with dwiic_fdt
file dev/fdt/dwiic_fdt.c dwiic_fdt
+
+# AMD Cryptographic Coprocessor
+attach amdccp at fdt with amdccp_fdt
+file dev/fdt/amdccp_fdt.c amdccp_fdt
Added files:
Index: src/sys/dev/acpi/amdccp_acpi.c
diff -u /dev/null src/sys/dev/acpi/amdccp_acpi.c:1.1
--- /dev/null Fri Oct 19 21:09:10 2018
+++ src/sys/dev/acpi/amdccp_acpi.c Fri Oct 19 21:09:10 2018
@@ -0,0 +1,123 @@
+/* $NetBSD: amdccp_acpi.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2018 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#include <dev/ic/amdccpvar.h>
+
+static int amdccp_acpi_match(device_t, cfdata_t, void *);
+static void amdccp_acpi_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(amdccp_acpi, sizeof(struct amdccp_softc),
+ amdccp_acpi_match, amdccp_acpi_attach, NULL, NULL);
+
+static const char * const compatible[] = {
+ "AMDI0C00",
+ NULL
+};
+
+static int
+amdccp_acpi_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct acpi_attach_args *aa = aux;
+
+ if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+ return 0;
+
+ return acpi_match_hid(aa->aa_node->ad_devinfo, compatible);
+}
+
+static void
+amdccp_acpi_attach(device_t parent, device_t self, void *aux)
+{
+ struct amdccp_softc * const sc = device_private(self);
+ struct acpi_attach_args *aa = aux;
+ struct acpi_resources res;
+ struct acpi_mem *mem;
+#if notyet
+ struct acpi_irq *irq;
+#endif
+ ACPI_STATUS rv;
+#if notyet
+ void *ih;
+#endif
+
+ sc->sc_dev = self;
+
+ rv = acpi_resource_parse(sc->sc_dev, aa->aa_node->ad_handle, "_CRS",
+ &res, &acpi_resource_parse_ops_default);
+ if (ACPI_FAILURE(rv))
+ return;
+
+ mem = acpi_res_mem(&res, 0);
+ if (mem == NULL) {
+ aprint_error(": couldn't find mem resource\n");
+ goto done;
+ }
+
+#if notyet
+ irq = acpi_res_irq(&res, 0);
+ if (irq == NULL) {
+ aprint_error(": couldn't find irq resource\n");
+ goto done;
+ }
+
+#endif
+ sc->sc_bst = aa->aa_memt;
+ if (bus_space_map(aa->aa_memt, mem->ar_base, mem->ar_length, 0, &sc->sc_bsh) != 0) {
+ aprint_error(": couldn't map registers\n");
+ goto done;
+ }
+
+#if notyet
+ const int type = (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL;
+ ih = intr_establish(irq->ar_irq, IPL_VM, type | IST_MPSAFE, amdccp_intr, sc);
+ if (ih == NULL) {
+ aprint_error_dev(self, "couldn't install interrupt handler\n");
+ return;
+ }
+
+#endif
+
+ aprint_naive("\n");
+ aprint_normal(": AMD CCP\n");
+
+ amdccp_common_attach(sc);
+
+done:
+ acpi_resource_cleanup(&res);
+}
Index: src/sys/dev/fdt/amdccp_fdt.c
diff -u /dev/null src/sys/dev/fdt/amdccp_fdt.c:1.1
--- /dev/null Fri Oct 19 21:09:10 2018
+++ src/sys/dev/fdt/amdccp_fdt.c Fri Oct 19 21:09:10 2018
@@ -0,0 +1,92 @@
+/* $NetBSD: amdccp_fdt.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2018 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+__KERNEL_RCSID(0, "$NetBSD: amdccp_fdt.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/bus.h>
+
+#include <dev/fdt/fdtvar.h>
+
+#include <dev/ic/amdccpvar.h>
+
+struct amdccp_fdt_softc {
+ struct amdccp_softc sc_sc;
+};
+
+static int amdccp_fdt_match(device_t, cfdata_t, void *);
+static void amdccp_fdt_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(amdccp_fdt, sizeof(struct amdccp_fdt_softc),
+ amdccp_fdt_match, amdccp_fdt_attach, NULL, NULL);
+
+static const struct of_compat_data compat_data[] = {
+ { "amd,ccp-seattle-v1a", },
+ { NULL }
+};
+
+static int
+amdccp_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+ const struct fdt_attach_args * const faa = aux;
+
+ return of_match_compat_data(faa->faa_phandle, compat_data);
+}
+
+static void
+amdccp_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct amdccp_fdt_softc * const fsc = device_private(self);
+ struct amdccp_softc * const sc = &fsc->sc_sc;
+ const struct fdt_attach_args * const faa = aux;
+ const int phandle = faa->faa_phandle;
+ bus_addr_t addr;
+ bus_size_t size;
+
+ fsc->sc_sc.sc_dev = self;
+
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error(": couldn't get registers\n");
+ return;
+ }
+
+ sc->sc_bst = faa->faa_bst;
+ if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
+ aprint_error(": couldn't map registers\n");
+ return;
+ }
+
+ aprint_naive("\n");
+ aprint_normal(": AMD CCP\n");
+
+ amdccp_common_attach(sc);
+}
Index: src/sys/dev/ic/amdccp.c
diff -u /dev/null src/sys/dev/ic/amdccp.c:1.1
--- /dev/null Fri Oct 19 21:09:10 2018
+++ src/sys/dev/ic/amdccp.c Fri Oct 19 21:09:10 2018
@@ -0,0 +1,94 @@
+/* $NetBSD: amdccp.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2018 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+__KERNEL_RCSID(0, "$NetBSD: amdccp.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/rndpool.h>
+#include <sys/rndsource.h>
+
+#include <dev/ic/amdccpvar.h>
+
+static uint32_t amdccp_rnd_read(struct amdccp_softc *);
+static void amdccp_rnd_callback(size_t, void *);
+
+void
+amdccp_common_attach(struct amdccp_softc *sc)
+{
+ mutex_init(&sc->sc_rndlock, MUTEX_DEFAULT, IPL_VM);
+ rndsource_setcb(&sc->sc_rndsource, amdccp_rnd_callback, sc);
+ rnd_attach_source(&sc->sc_rndsource, device_xname(sc->sc_dev),
+ RND_TYPE_RNG, RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
+ amdccp_rnd_callback(RND_POOLBITS / NBBY, sc);
+}
+
+static uint32_t
+amdccp_rnd_read(struct amdccp_softc *sc)
+{
+ size_t retries = 5;
+ uint32_t bits;
+
+ /* TRNG register reads 0x0 when bits aren't valid */
+ while (retries--) {
+ bits = bus_space_read_4(sc->sc_bst, sc->sc_bsh, CCP_TRNG_REG);
+ if (bits != 0x0)
+ break;
+ }
+
+ return bits;
+}
+
+static void
+amdccp_rnd_callback(size_t bytes_wanted, void *priv)
+{
+ struct amdccp_softc * const sc = priv;
+ uint32_t buf[128];
+ size_t cnt;
+
+ mutex_enter(&sc->sc_rndlock);
+ while (bytes_wanted) {
+ const size_t nbytes = MIN(bytes_wanted, sizeof(buf));
+ const size_t nwords = howmany(nbytes, sizeof(buf[0]));
+ for (cnt = 0; cnt < nwords; cnt++) {
+ buf[cnt] = amdccp_rnd_read(sc);
+ if (buf[cnt] == 0) {
+ break;
+ }
+ }
+ const size_t cntby = cnt * sizeof(buf[0]);
+ rnd_add_data_sync(&sc->sc_rndsource, buf, cntby, cntby * NBBY);
+ bytes_wanted -= MIN(bytes_wanted, cntby);
+ }
+ explicit_memset(buf, 0, sizeof(buf));
+ mutex_exit(&sc->sc_rndlock);
+}
Index: src/sys/dev/ic/amdccpvar.h
diff -u /dev/null src/sys/dev/ic/amdccpvar.h:1.1
--- /dev/null Fri Oct 19 21:09:10 2018
+++ src/sys/dev/ic/amdccpvar.h Fri Oct 19 21:09:10 2018
@@ -0,0 +1,45 @@
+/* $NetBSD: amdccpvar.h,v 1.1 2018/10/19 21:09:10 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2018 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/rndsource.h>
+#include <sys/mutex.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+
+#define CCP_TRNG_REG 0x000c
+
+struct amdccp_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+
+ kmutex_t sc_rndlock;
+ krndsource_t sc_rndsource;
+};
+
+void amdccp_common_attach(struct amdccp_softc *);
