Author: br
Date: Tue Jun 9 16:43:16 2020
New Revision: 361974
URL: https://svnweb.freebsd.org/changeset/base/361974
Log:
ARM Embedded Trace Macrocell v4.x driver:
o Split-out FDT attachment to a separate file;
o Add ACPI attachment.
Sponsored by: DARPA, AFRL
Added:
head/sys/arm64/coresight/coresight_etm4x_acpi.c (contents, props changed)
head/sys/arm64/coresight/coresight_etm4x_fdt.c (contents, props changed)
Modified:
head/sys/arm64/coresight/coresight_etm4x.c
head/sys/arm64/coresight/coresight_etm4x.h
head/sys/conf/files.arm64
Modified: head/sys/arm64/coresight/coresight_etm4x.c
==============================================================================
--- head/sys/arm64/coresight/coresight_etm4x.c Tue Jun 9 16:15:07 2020 (r361973)
+++ head/sys/arm64/coresight/coresight_etm4x.c Tue Jun 9 16:43:16 2020 (r361974)
@@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$");
#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_etm4x.h>
@@ -66,16 +63,6 @@ __FBSDID("$FreeBSD$");
* CPU3 -> ETM3 -> funnel1 -^
*/
-static struct ofw_compat_data compat_data[] = {
- { "arm,coresight-etm4x", 1 },
- { NULL, 0 }
-};
-
-struct etm_softc {
- struct resource *res;
- struct coresight_platform_data *pdata;
-};
-
static struct resource_spec etm_spec[] = {
{ SYS_RES_MEMORY, 0, RF_ACTIVE },
{ -1, 0 }
@@ -248,20 +235,6 @@ etm_disable(device_t dev, struct endpoint *endp,
}
static int
-etm_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, "AArch64 Embedded Trace Macrocell");
-
- return (BUS_PROBE_DEFAULT);
-}
-
-static int
etm_attach(device_t dev)
{
struct coresight_desc desc;
@@ -285,7 +258,6 @@ etm_attach(device_t dev)
static device_method_t etm_methods[] = {
/* Device interface */
- DEVMETHOD(device_probe, etm_probe),
DEVMETHOD(device_attach, etm_attach),
/* Coresight interface */
@@ -295,13 +267,4 @@ static device_method_t etm_methods[] = {
DEVMETHOD_END
};
-static driver_t etm_driver = {
- "etm",
- etm_methods,
- sizeof(struct etm_softc),
-};
-
-static devclass_t etm_devclass;
-
-DRIVER_MODULE(etm, simplebus, etm_driver, etm_devclass, 0, 0);
-MODULE_VERSION(etm, 1);
+DEFINE_CLASS_0(etm, etm_driver, etm_methods, sizeof(struct etm_softc));
Modified: head/sys/arm64/coresight/coresight_etm4x.h
==============================================================================
--- head/sys/arm64/coresight/coresight_etm4x.h Tue Jun 9 16:15:07 2020 (r361973)
+++ head/sys/arm64/coresight/coresight_etm4x.h Tue Jun 9 16:43:16 2020 (r361974)
@@ -34,6 +34,13 @@
#ifndef _ARM64_CORESIGHT_ETM4X_H_
#define _ARM64_CORESIGHT_ETM4X_H_
+DECLARE_CLASS(etm_driver);
+
+struct etm_softc {
+ struct resource *res;
+ struct coresight_platform_data *pdata;
+};
+
#define TRCPRGCTLR 0x004 /* Trace Programming Control Register */
#define TRCPRGCTLR_EN (1 << 0) /* Trace unit enable bit */
#define TRCPROCSELR 0x008 /* Trace PE Select Control Register */
Added: head/sys/arm64/coresight/coresight_etm4x_acpi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/coresight/coresight_etm4x_acpi.c Tue Jun 9 16:43:16 2020 (r361974)
@@ -0,0 +1,79 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2020 Ruslan Bukin <br at 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_etm4x.h>
+
+static int
+etm_acpi_probe(device_t dev)
+{
+ static char *etm_ids[] = { "ARMHC500", NULL };
+ int error;
+
+ error = ACPI_ID_PROBE(device_get_parent(dev), dev, etm_ids, NULL);
+ if (error <= 0)
+ device_set_desc(dev, "ARM Embedded Trace Macrocell");
+
+ return (error);
+}
+
+static device_method_t etm_acpi_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, etm_acpi_probe),
+
+ /* End */
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(etm, etm_acpi_driver, etm_acpi_methods,
+ sizeof(struct etm_softc), etm_driver);
+
+static devclass_t etm_acpi_devclass;
+
+EARLY_DRIVER_MODULE(etm, acpi, etm_acpi_driver, etm_acpi_devclass,
+ 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
Added: head/sys/arm64/coresight/coresight_etm4x_fdt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/coresight/coresight_etm4x_fdt.c Tue Jun 9 16:43:16 2020 (r361974)
@@ -0,0 +1,82 @@
+/*-
+ * Copyright (c) 2018-2020 Ruslan Bukin <br at 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_etm4x.h>
+
+#include "coresight_if.h"
+
+static struct ofw_compat_data compat_data[] = {
+ { "arm,coresight-etm4x", 1 },
+ { NULL, 0 }
+};
+
+static int
+etm_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, "AArch64 Embedded Trace Macrocell");
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static device_method_t etm_fdt_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, etm_fdt_probe),
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(etm, etm_fdt_driver, etm_fdt_methods,
+ sizeof(struct etm_softc), etm_driver);
+
+static devclass_t etm_fdt_devclass;
+
+EARLY_DRIVER_MODULE(etm, simplebus, etm_fdt_driver, etm_fdt_devclass,
+ 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Tue Jun 9 16:15:07 2020 (r361973)
+++ head/sys/conf/files.arm64 Tue Jun 9 16:43:16 2020 (r361974)
@@ -191,6 +191,8 @@ arm64/coresight/coresight_cmd.c standard
arm64/coresight/coresight_cpu_debug.c standard
arm64/coresight/coresight_dynamic_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_tmc.c standard
arm64/intel/firmware.c optional soc_intel_stratix10