Author: br
Date: Fri Jun 12 17:31:38 2020
New Revision: 362109
URL: https://svnweb.freebsd.org/changeset/base/362109
Log:
Coresight replicator:
o Add a header file;
o Split-out FDT attachment to a separate file;
o Add ACPI attachment.
Sponsored by: DARPA, AFRL
Added:
head/sys/arm64/coresight/coresight_replicator.h (contents, props changed)
head/sys/arm64/coresight/coresight_replicator_acpi.c (contents, props
changed)
head/sys/arm64/coresight/coresight_replicator_fdt.c (contents, props
changed)
Modified:
head/sys/arm64/coresight/coresight_replicator.c
head/sys/conf/files.arm64
Modified: head/sys/arm64/coresight/coresight_replicator.c
==============================================================================
--- head/sys/arm64/coresight/coresight_replicator.c Fri Jun 12 16:51:55
2020 (r362108)
+++ head/sys/arm64/coresight/coresight_replicator.c Fri Jun 12 17:31:38
2020 (r362109)
@@ -41,25 +41,10 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <arm64/coresight/coresight.h>
+#include <arm64/coresight/coresight_replicator.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-
#include "coresight_if.h"
-#define REPLICATOR_IDFILTER0 0x00
-#define REPLICATOR_IDFILTER1 0x04
-
-static struct ofw_compat_data compat_data[] = {
- { "arm,coresight-dynamic-replicator", 1 },
- { NULL, 0 }
-};
-
-struct replicator_softc {
- struct resource *res;
- struct coresight_platform_data *pdata;
-};
-
static struct resource_spec replicator_spec[] = {
{ SYS_RES_MEMORY, 0, RF_ACTIVE },
{ -1, 0 }
@@ -111,21 +96,6 @@ replicator_disable(device_t dev, struct endpoint *endp
}
static int
-replicator_probe(device_t dev)
-{
-
- if (!ofw_bus_status_okay(dev))
- return (ENXIO);
-
- if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
- return (ENXIO);
-
- device_set_desc(dev, "Coresight Dynamic Replicator");
-
- return (BUS_PROBE_DEFAULT);
-}
-
-static int
replicator_attach(device_t dev)
{
struct replicator_softc *sc;
@@ -149,7 +119,6 @@ replicator_attach(device_t dev)
static device_method_t replicator_methods[] = {
/* Device interface */
- DEVMETHOD(device_probe, replicator_probe),
DEVMETHOD(device_attach, replicator_attach),
/* Coresight interface */
@@ -159,14 +128,5 @@ static device_method_t replicator_methods[] = {
DEVMETHOD_END
};
-static driver_t replicator_driver = {
- "replicator",
- replicator_methods,
- sizeof(struct replicator_softc),
-};
-
-static devclass_t replicator_devclass;
-
-DRIVER_MODULE(replicator, simplebus, replicator_driver, replicator_devclass,
- 0, 0);
-MODULE_VERSION(replicator, 1);
+DEFINE_CLASS_0(replicator, replicator_driver, replicator_methods,
+ sizeof(struct replicator_softc));
Added: head/sys/arm64/coresight/coresight_replicator.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/coresight/coresight_replicator.h Fri Jun 12 17:31:38
2020 (r362109)
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2020 Ruslan Bukin <b...@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ARM64_CORESIGHT_CORESIGHT_REPLICATOR_H_
+#define _ARM64_CORESIGHT_CORESIGHT_REPLICATOR_H_
+
+#define REPLICATOR_IDFILTER0 0x00
+#define REPLICATOR_IDFILTER1 0x04
+
+DECLARE_CLASS(replicator_driver);
+
+struct replicator_softc {
+ struct resource *res;
+ struct coresight_platform_data *pdata;
+};
+
+#endif /* !_ARM64_CORESIGHT_CORESIGHT_REPLICATOR_H_ */
Added: head/sys/arm64/coresight/coresight_replicator_acpi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/coresight/coresight_replicator_acpi.c Fri Jun 12
17:31:38 2020 (r362109)
@@ -0,0 +1,81 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2020 Ruslan Bukin <b...@bsdpad.com>
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory (Department of Computer Science and
+ * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+ * DARPA SSITH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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 "opt_acpi.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/memdesc.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <dev/acpica/acpivar.h>
+
+#include <arm64/coresight/coresight_replicator.h>
+
+static int
+replicator_acpi_probe(device_t dev)
+{
+ static char *replicator_ids[] = { "ARMHC98D", NULL };
+ int error;
+
+ error = ACPI_ID_PROBE(device_get_parent(dev), dev,
+ replicator_ids, NULL);
+ if (error <= 0)
+ device_set_desc(dev, "ARM Coresight Replicator");
+
+ return (error);
+}
+
+static device_method_t replicator_acpi_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, replicator_acpi_probe),
+
+ /* End */
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(replicator, replicator_acpi_driver, replicator_acpi_methods,
+ sizeof(struct replicator_softc), replicator_driver);
+
+static devclass_t replicator_acpi_devclass;
+
+EARLY_DRIVER_MODULE(replicator, acpi, replicator_acpi_driver,
+ replicator_acpi_devclass, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
Added: head/sys/arm64/coresight/coresight_replicator_fdt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/coresight/coresight_replicator_fdt.c Fri Jun 12 17:31:38
2020 (r362109)
@@ -0,0 +1,83 @@
+/*-
+ * Copyright (c) 2018-2020 Ruslan Bukin <b...@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by BAE Systems, the University of Cambridge
+ * Computer Laboratory, and Memorial University under DARPA/AFRL contract
+ * FA8650-15-C-7558 ("CADETS"), as part of the DARPA Transparent Computing
+ * (TC) research program.
+ *
+ * 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 AUTHOR 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 AUTHOR 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <machine/bus.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <arm64/coresight/coresight.h>
+#include <arm64/coresight/coresight_replicator.h>
+
+#include "coresight_if.h"
+
+static struct ofw_compat_data compat_data[] = {
+ { "arm,coresight-dynamic-replicator", 1 },
+ { NULL, 0 }
+};
+
+static int
+replicator_fdt_probe(device_t dev)
+{
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
+ return (ENXIO);
+
+ device_set_desc(dev, "ARM Coresight Replicator");
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static device_method_t replicator_fdt_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, replicator_fdt_probe),
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(replicator, replicator_fdt_driver, replicator_fdt_methods,
+ sizeof(struct replicator_softc), replicator_driver);
+
+static devclass_t replicator_fdt_devclass;
+
+EARLY_DRIVER_MODULE(replicator, simplebus, replicator_fdt_driver,
+ replicator_fdt_devclass, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Fri Jun 12 16:51:55 2020 (r362108)
+++ head/sys/conf/files.arm64 Fri Jun 12 17:31:38 2020 (r362109)
@@ -189,13 +189,15 @@ arm64/coresight/coresight.c standard
arm64/coresight/coresight_if.m standard
arm64/coresight/coresight_cmd.c standard
arm64/coresight/coresight_cpu_debug.c standard
-arm64/coresight/coresight_replicator.c standard
arm64/coresight/coresight_etm4x.c standard
arm64/coresight/coresight_etm4x_acpi.c optional acpi
arm64/coresight/coresight_etm4x_fdt.c optional fdt
arm64/coresight/coresight_funnel.c standard
arm64/coresight/coresight_funnel_acpi.c optional acpi
arm64/coresight/coresight_funnel_fdt.c optional fdt
+arm64/coresight/coresight_replicator.c standard
+arm64/coresight/coresight_replicator_acpi.c optional acpi
+arm64/coresight/coresight_replicator_fdt.c optional fdt
arm64/coresight/coresight_tmc.c standard
arm64/coresight/coresight_tmc_acpi.c optional acpi
arm64/coresight/coresight_tmc_fdt.c optional fdt
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
