diff options
| author | jakllsch <jakllsch@NetBSD.org> | 2018-10-19 21:09:09 +0000 |
|---|---|---|
| committer | jakllsch <jakllsch@NetBSD.org> | 2018-10-19 21:09:09 +0000 |
| commit | 2c0f1921d5eebb357496abe06ef4b46bfc799d91 (patch) | |
| tree | 663142ee90b031832be12c21263f544e87089c2b /sys/dev | |
| parent | 690000dab72d23ddaeb6abd1ba7b3d8c0042fe97 (diff) | |
Add amdccp(4) driver for AMD Cryptographic Coprocessor, as found on the
A11xx Opterons. Driver currently provides RNG service only.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/amdccp_acpi.c | 123 | ||||
| -rw-r--r-- | sys/dev/acpi/files.acpi | 6 | ||||
| -rw-r--r-- | sys/dev/fdt/amdccp_fdt.c | 92 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 6 | ||||
| -rw-r--r-- | sys/dev/ic/amdccp.c | 94 | ||||
| -rw-r--r-- | sys/dev/ic/amdccpvar.h | 45 |
6 files changed, 364 insertions, 2 deletions
diff --git a/sys/dev/acpi/amdccp_acpi.c b/sys/dev/acpi/amdccp_acpi.c new file mode 100644 index 00000000000..be2dde44ef0 --- /dev/null +++ b/sys/dev/acpi/amdccp_acpi.c @@ -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); +} diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi index d2709b8412d..c4e6be10bb8 100644 --- a/sys/dev/acpi/files.acpi +++ b/sys/dev/acpi/files.acpi @@ -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" diff --git a/sys/dev/fdt/amdccp_fdt.c b/sys/dev/fdt/amdccp_fdt.c new file mode 100644 index 00000000000..a459dd95703 --- /dev/null +++ b/sys/dev/fdt/amdccp_fdt.c @@ -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); +} diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index 897f9f9ba7d..c180880ffa7 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -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_fdt # 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 diff --git a/sys/dev/ic/amdccp.c b/sys/dev/ic/amdccp.c new file mode 100644 index 00000000000..d9bff6622fe --- /dev/null +++ b/sys/dev/ic/amdccp.c @@ -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); +} diff --git a/sys/dev/ic/amdccpvar.h b/sys/dev/ic/amdccpvar.h new file mode 100644 index 00000000000..92698f94a9a --- /dev/null +++ b/sys/dev/ic/amdccpvar.h @@ -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 *); |
