Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Add amdccp(4) driver for AMD Cryptographic Coprocessor, as f...



details:   https://anonhg.NetBSD.org/src/rev/1fd22c5571c7
branches:  trunk
changeset: 994104:1fd22c5571c7
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Oct 19 21:09:09 2018 +0000

description:
Add amdccp(4) driver for AMD Cryptographic Coprocessor, as found on the
A11xx Opterons.  Driver currently provides RNG service only.

diffstat:

 doc/CHANGES                    |    4 +-
 sys/arch/evbarm/conf/GENERIC64 |    4 +-
 sys/conf/files                 |    6 +-
 sys/dev/acpi/amdccp_acpi.c     |  123 +++++++++++++++++++++++++++++++++++++++++
 sys/dev/acpi/files.acpi        |    6 +-
 sys/dev/fdt/amdccp_fdt.c       |   92 ++++++++++++++++++++++++++++++
 sys/dev/fdt/files.fdt          |    6 +-
 sys/dev/ic/amdccp.c            |   94 +++++++++++++++++++++++++++++++
 sys/dev/ic/amdccpvar.h         |   45 +++++++++++++++
 9 files changed, 375 insertions(+), 5 deletions(-)

diffs (truncated from 459 to 300 lines):

diff -r ec27e7719edd -r 1fd22c5571c7 doc/CHANGES
--- a/doc/CHANGES       Fri Oct 19 20:33:23 2018 +0000
+++ b/doc/CHANGES       Fri Oct 19 21:09:09 2018 +0000
@@ -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 @@
        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]
diff -r ec27e7719edd -r 1fd22c5571c7 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Fri Oct 19 20:33:23 2018 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Fri Oct 19 21:09:09 2018 +0000
@@ -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 @@
 
 # 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
diff -r ec27e7719edd -r 1fd22c5571c7 sys/conf/files
--- a/sys/conf/files    Fri Oct 19 20:33:23 2018 +0000
+++ b/sys/conf/files    Fri Oct 19 21:09:09 2018 +0000
@@ -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 @@
 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
diff -r ec27e7719edd -r 1fd22c5571c7 sys/dev/acpi/amdccp_acpi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/amdccp_acpi.c        Fri Oct 19 21:09:09 2018 +0000
@@ -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 -r ec27e7719edd -r 1fd22c5571c7 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Fri Oct 19 20:33:23 2018 +0000
+++ b/sys/dev/acpi/files.acpi   Fri Oct 19 21:09:09 2018 +0000
@@ -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 @@
 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 -r ec27e7719edd -r 1fd22c5571c7 sys/dev/fdt/amdccp_fdt.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/amdccp_fdt.c  Fri Oct 19 21:09:09 2018 +0000
@@ -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 -r ec27e7719edd -r 1fd22c5571c7 sys/dev/fdt/files.fdt
--- a/sys/dev/fdt/files.fdt     Fri Oct 19 20:33:23 2018 +0000
+++ b/sys/dev/fdt/files.fdt     Fri Oct 19 21:09:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.40 2018/10/15 23:50:48 jmcneill Exp $



Home | Main Index | Thread Index | Old Index