From nobody Tue Aug 8 13:14:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKttf66cJz4mKt1; Tue, 8 Aug 2023 13:14:02 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKttf5dB1z3HnZ; Tue, 8 Aug 2023 13:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezfuc+vOksusC5rNv4cmNZ2K8/ExN5tiwFrF6xc8Lnw=; b=AWdLt9wdLHNG+NGwzUVQxydln3MZ2W408nQWqFGCWvxfRypohcy4K/Szpu4jubI272HDfJ +5wpN1RdxsUH8qezYFIEnBXmoFoAZ0Kubl/bJKHV+tS3FTq4xzhBKVrj5PUpPr1ZPQGWdQ RTCxphEbX5XRP3r5KCjXZcFXHtt1R/xsj3BZECbv6PTUS657YSG4PiMbpiJm1cs9KmqEei FFSHouxoC/minWORHxw279XkrjD8smPxeV5HoYxPDuk5A4E9jfj6jupT+1tJj0lie3pKX4 3ze6g0fJHXGfJQ+FtHz0iMlbqDXR9ruuxDIoPrBmTs2xEjdrEIwyZtb5CUYT2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezfuc+vOksusC5rNv4cmNZ2K8/ExN5tiwFrF6xc8Lnw=; b=P4DbFptWVHHz03Fs8isGlmDNFavmgJt3YfhAn5tw+C8oT2PvdLPYZE8kZ88Cto9KiCOaKu 3WACBnseHaF1qpTTAuqYl635ksRBwvr0P6167/DBEaMZyA/PS/fnK13P3eW/heFdgshvIW U8STQyLRn0D9WE7jRBNnVNjarqHah319k3kwTFho8G9VUuMXL2f+X5rZQHdNe0JrRHa2V0 3anYYP509tJu/IwnvO29noOyFpjUbB1hRsRZFHfNWjypMeBRcRDvIgGCXHOKUQ59KeSXqM sT+OJ3Oz9BtQXxwrLO84sfVzgYOh9yNJXfFNz17oSyd/v6TXmVNh2oYYVuvq0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691500442; a=rsa-sha256; cv=none; b=I+RF/JEpj3/aBYFMgUPOfdMFg0omeLDitwv7wrP9mXvS8uObj0DXVvKGGcwesskXF1wC76 /FvjmrbIl4ykzaHvWw9XbMKCStosUOn24Kf/U6LayY1GN7M1h8W6+i29MASv1oruI+iusd vvC37K5hXJL/Fge2pk2VYOJdExcRhSntIC/5eL4H//hZ8nr3Go3X0AWjVw2CkyPcMB/3Re +vtGsM9igOsswKPC//EtnqcfkwCBoa2QBfVJPSeJOlot0ke/WFzuYFJaJNFSKijKEKrKKB pXQgLEaHuSuRSJzJuXQ3bivzsEYmlVtYc85S7jmv9S0aMeosnF1B85257ZlSxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKttf41qmzbGR; Tue, 8 Aug 2023 13:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378DE2lV008037; Tue, 8 Aug 2023 13:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378DE2jY008036; Tue, 8 Aug 2023 13:14:02 GMT (envelope-from git) Date: Tue, 8 Aug 2023 13:14:02 GMT Message-Id: <202308081314.378DE2jY008036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4b5f5fe78f90 - main - arm64: intel: Remove firmware driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b5f5fe78f901007b19027be31b32666ba52a8b4 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5f5fe78f901007b19027be31b32666ba52a8b4 commit 4b5f5fe78f901007b19027be31b32666ba52a8b4 Author: Emmanuel Vadot AuthorDate: 2022-12-06 11:07:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-08 13:13:33 +0000 arm64: intel: Remove firmware driver This is now covered by ofw_firmware. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37613 --- sys/arm64/intel/firmware.c | 120 ---------------------------------------- sys/arm64/intel/stratix10-svc.c | 2 +- sys/conf/files.arm64 | 1 - 3 files changed, 1 insertion(+), 122 deletions(-) diff --git a/sys/arm64/intel/firmware.c b/sys/arm64/intel/firmware.c deleted file mode 100644 index 5c4470fa4a98..000000000000 --- a/sys/arm64/intel/firmware.c +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 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 -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include - -#include -#include -#include - -struct firmware_softc { - struct simplebus_softc simplebus_sc; - device_t dev; -}; - -static int -firmware_probe(device_t dev) -{ - phandle_t node; - - node = ofw_bus_get_node(dev); - - /* - * The firmware node has no property compatible. - * Look for a known child. - */ - if (!fdt_depth_search_compatible(node, "intel,stratix10-svc", 0)) - return (ENXIO); - - if (!ofw_bus_status_okay(dev)) - return (ENXIO); - - device_set_desc(dev, "Firmware node"); - - return (BUS_PROBE_DEFAULT); -} - -static int -firmware_attach(device_t dev) -{ - struct firmware_softc *sc; - phandle_t node; - - sc = device_get_softc(dev); - sc->dev = dev; - - node = ofw_bus_get_node(dev); - if (node == -1) - return (ENXIO); - - simplebus_init(dev, node); - - /* - * Allow devices to identify. - */ - bus_generic_probe(dev); - - /* - * Now walk the OFW tree and attach top-level devices. - */ - for (node = OF_child(node); node > 0; node = OF_peer(node)) - simplebus_add_device(dev, node, 0, NULL, -1, NULL); - - return (bus_generic_attach(dev)); -} - -static int -firmware_detach(device_t dev) -{ - - return (0); -} - -static device_method_t firmware_methods[] = { - DEVMETHOD(device_probe, firmware_probe), - DEVMETHOD(device_attach, firmware_attach), - DEVMETHOD(device_detach, firmware_detach), - DEVMETHOD_END -}; - -DEFINE_CLASS_1(firmware, firmware_driver, firmware_methods, - sizeof(struct firmware_softc), simplebus_driver); - -EARLY_DRIVER_MODULE(firmware, simplebus, firmware_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); -MODULE_VERSION(firmware, 1); diff --git a/sys/arm64/intel/stratix10-svc.c b/sys/arm64/intel/stratix10-svc.c index 900cc00567f2..5e3cb3cf1dc4 100644 --- a/sys/arm64/intel/stratix10-svc.c +++ b/sys/arm64/intel/stratix10-svc.c @@ -265,5 +265,5 @@ static driver_t s10_svc_driver = { sizeof(struct s10_svc_softc), }; -EARLY_DRIVER_MODULE(s10_svc, firmware, s10_svc_driver, 0, 0, +EARLY_DRIVER_MODULE(s10_svc, simplebus, s10_svc_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index f3cfab68538a..7eb0c0d04367 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -468,7 +468,6 @@ arm/allwinner/h6/h6_r_padconf.c optional soc_allwinner_h6 fdt # Altera/Intel dev/altera/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga -arm64/intel/firmware.c optional soc_intel_stratix10 fdt arm64/intel/stratix10-soc-fpga-mgr.c optional soc_intel_stratix10 fdt arm64/intel/stratix10-svc.c optional soc_intel_stratix10 fdt