From owner-svn-src-all@freebsd.org Wed Jun 10 14:28:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 514F0335D7E; Wed, 10 Jun 2020 14:28:38 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hq9L1VmCz44MJ; Wed, 10 Jun 2020 14:28:38 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2ECCA82AC; Wed, 10 Jun 2020 14:28:38 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05AEScG1013440; Wed, 10 Jun 2020 14:28:38 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05AESbkw013436; Wed, 10 Jun 2020 14:28:37 GMT (envelope-from br@FreeBSD.org) Message-Id: <202006101428.05AESbkw013436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Wed, 10 Jun 2020 14:28:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362011 - in head/sys: arm64/coresight conf X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: in head/sys: arm64/coresight conf X-SVN-Commit-Revision: 362011 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 14:28:38 -0000 Author: br Date: Wed Jun 10 14:28:36 2020 New Revision: 362011 URL: https://svnweb.freebsd.org/changeset/base/362011 Log: ARM Coresight Funnel device: o Split-out FDT attachment to a separate file; o Add ACPI attachment; o Add support for the Static Funnel device. Sponsored by: DARPA, AFRL Added: head/sys/arm64/coresight/coresight_funnel_acpi.c (contents, props changed) head/sys/arm64/coresight/coresight_funnel_fdt.c (contents, props changed) Modified: head/sys/arm64/coresight/coresight_funnel.c head/sys/arm64/coresight/coresight_funnel.h head/sys/conf/files.arm64 Modified: head/sys/arm64/coresight/coresight_funnel.c ============================================================================== --- head/sys/arm64/coresight/coresight_funnel.c Wed Jun 10 14:10:48 2020 (r362010) +++ head/sys/arm64/coresight/coresight_funnel.c Wed Jun 10 14:28:36 2020 (r362011) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 Ruslan Bukin + * Copyright (c) 2018-2020 Ruslan Bukin * All rights reserved. * * This software was developed by BAE Systems, the University of Cambridge @@ -43,9 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include - #include "coresight_if.h" #define FUNNEL_DEBUG @@ -57,16 +54,6 @@ __FBSDID("$FreeBSD$"); #define dprintf(fmt, ...) #endif -static struct ofw_compat_data compat_data[] = { - { "arm,coresight-funnel", 1 }, - { NULL, 0 } -}; - -struct funnel_softc { - struct resource *res; - struct coresight_platform_data *pdata; -}; - static struct resource_spec funnel_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, { -1, 0 } @@ -78,10 +65,11 @@ funnel_init(device_t dev) struct funnel_softc *sc; sc = device_get_softc(dev); + if (sc->hwtype == HWTYPE_STATIC_FUNNEL) + return (0); /* Unlock Coresight */ bus_write_4(sc->res, CORESIGHT_LAR, CORESIGHT_UNLOCK); - dprintf("Device ID: %x\n", bus_read_4(sc->res, FUNNEL_DEVICEID)); return (0); @@ -95,6 +83,8 @@ funnel_enable(device_t dev, struct endpoint *endp, uint32_t reg; sc = device_get_softc(dev); + if (sc->hwtype == HWTYPE_STATIC_FUNNEL) + return (0); reg = bus_read_4(sc->res, FUNNEL_FUNCTL); reg &= ~(FUNCTL_HOLDTIME_MASK); @@ -113,6 +103,8 @@ funnel_disable(device_t dev, struct endpoint *endp, uint32_t reg; sc = device_get_softc(dev); + if (sc->hwtype == HWTYPE_STATIC_FUNNEL) + return; reg = bus_read_4(sc->res, FUNNEL_FUNCTL); reg &= ~(1 << endp->reg); @@ -120,29 +112,14 @@ funnel_disable(device_t dev, struct endpoint *endp, } static int -funnel_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 Funnel"); - - return (BUS_PROBE_DEFAULT); -} - -static int funnel_attach(device_t dev) { struct coresight_desc desc; struct funnel_softc *sc; sc = device_get_softc(dev); - - if (bus_alloc_resources(dev, funnel_spec, &sc->res) != 0) { + if (sc->hwtype == HWTYPE_FUNNEL && + bus_alloc_resources(dev, funnel_spec, &sc->res) != 0) { device_printf(dev, "cannot allocate resources for device\n"); return (ENXIO); } @@ -158,7 +135,6 @@ funnel_attach(device_t dev) static device_method_t funnel_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, funnel_probe), DEVMETHOD(device_attach, funnel_attach), /* Coresight interface */ @@ -168,13 +144,5 @@ static device_method_t funnel_methods[] = { DEVMETHOD_END }; -static driver_t funnel_driver = { - "funnel", - funnel_methods, - sizeof(struct funnel_softc), -}; - -static devclass_t funnel_devclass; - -DRIVER_MODULE(funnel, simplebus, funnel_driver, funnel_devclass, 0, 0); -MODULE_VERSION(funnel, 1); +DEFINE_CLASS_0(funnel, funnel_driver, funnel_methods, + sizeof(struct funnel_softc)); Modified: head/sys/arm64/coresight/coresight_funnel.h ============================================================================== --- head/sys/arm64/coresight/coresight_funnel.h Wed Jun 10 14:10:48 2020 (r362010) +++ head/sys/arm64/coresight/coresight_funnel.h Wed Jun 10 14:28:36 2020 (r362011) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 Ruslan Bukin + * Copyright (c) 2018-2020 Ruslan Bukin * All rights reserved. * * This software was developed by BAE Systems, the University of Cambridge @@ -62,5 +62,17 @@ #define FUNNEL_COMP1 0xFF4 /* Component ID1 */ #define FUNNEL_COMP2 0xFF8 /* Component ID2 */ #define FUNNEL_COMP3 0xFFC /* Component ID3 */ + +#define HWTYPE_NONE 0 +#define HWTYPE_FUNNEL 1 +#define HWTYPE_STATIC_FUNNEL 2 + +DECLARE_CLASS(funnel_driver); + +struct funnel_softc { + struct resource *res; + struct coresight_platform_data *pdata; + int hwtype; +}; #endif /* !_ARM64_CORESIGHT_CORESIGHT_FUNNEL_H_ */ Added: head/sys/arm64/coresight/coresight_funnel_acpi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm64/coresight/coresight_funnel_acpi.c Wed Jun 10 14:28:36 2020 (r362011) @@ -0,0 +1,95 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2020 Ruslan Bukin + * + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +static int +funnel_acpi_probe(device_t dev) +{ + struct funnel_softc *sc; + static char *static_funnel_ids[] = { "ARMHC9FE", NULL }; + static char *funnel_ids[] = { "ARMHC9FF", NULL }; + int error; + + sc = device_get_softc(dev); + + error = ACPI_ID_PROBE(device_get_parent(dev), dev, + static_funnel_ids, NULL); + if (error <= 0) { + sc->hwtype = HWTYPE_STATIC_FUNNEL; + device_set_desc(dev, "ARM Coresight Static Funnel"); + return (error); + } + + error = ACPI_ID_PROBE(device_get_parent(dev), dev, + funnel_ids, NULL); + if (error <= 0) { + sc->hwtype = HWTYPE_FUNNEL; + device_set_desc(dev, "ARM Coresight Funnel"); + return (error); + } + + return (ENXIO); +} + +static device_method_t funnel_acpi_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, funnel_acpi_probe), + + /* End */ + DEVMETHOD_END +}; + +DEFINE_CLASS_1(funnel, funnel_acpi_driver, funnel_acpi_methods, + sizeof(struct funnel_softc), funnel_driver); + +static devclass_t funnel_acpi_devclass; + +EARLY_DRIVER_MODULE(funnel, acpi, funnel_acpi_driver, funnel_acpi_devclass, + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); Added: head/sys/arm64/coresight/coresight_funnel_fdt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm64/coresight/coresight_funnel_fdt.c Wed Jun 10 14:28:36 2020 (r362011) @@ -0,0 +1,94 @@ +/*- + * Copyright (c) 2018-2020 Ruslan Bukin + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "coresight_if.h" + +static struct ofw_compat_data compat_data[] = { + { "arm,coresight-funnel", HWTYPE_FUNNEL }, + { "arm,coresight-static-funnel", HWTYPE_STATIC_FUNNEL }, + { NULL, HWTYPE_NONE } +}; + +static int +funnel_fdt_probe(device_t dev) +{ + struct funnel_softc *sc; + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + sc = device_get_softc(dev); + + sc->hwtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + switch (sc->hwtype) { + case HWTYPE_FUNNEL: + device_set_desc(dev, "Coresight Funnel"); + break; + case HWTYPE_STATIC_FUNNEL: + device_set_desc(dev, "Coresight Static Funnel"); + break; + default: + return (ENXIO); + }; + + return (BUS_PROBE_DEFAULT); +} + +static device_method_t funnel_fdt_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, funnel_fdt_probe), + DEVMETHOD_END +}; + +DEFINE_CLASS_1(funnel, funnel_fdt_driver, funnel_fdt_methods, + sizeof(struct funnel_softc), funnel_driver); + +static devclass_t funnel_fdt_devclass; + +EARLY_DRIVER_MODULE(funnel, simplebus, funnel_fdt_driver, funnel_fdt_devclass, + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Wed Jun 10 14:10:48 2020 (r362010) +++ head/sys/conf/files.arm64 Wed Jun 10 14:28:36 2020 (r362011) @@ -194,6 +194,8 @@ 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_tmc.c standard arm64/intel/firmware.c optional soc_intel_stratix10 arm64/intel/stratix10-soc-fpga-mgr.c optional soc_intel_stratix10