Date: Tue, 8 Aug 2023 13:14:02 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 4b5f5fe78f90 - main - arm64: intel: Remove firmware driver Message-ID: <202308081314.378DE2jY008036@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5f5fe78f901007b19027be31b32666ba52a8b4 commit 4b5f5fe78f901007b19027be31b32666ba52a8b4 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2022-12-06 11:07:58 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> 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 <br@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 <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/module.h> - -#include <dev/fdt/simplebus.h> -#include <dev/fdt/fdt_common.h> -#include <dev/ofw/ofw_bus_subr.h> - -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308081314.378DE2jY008036>