From 9f36f2e1ec19e59b1d390b570fe56f6debdb6525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85strand?= Date: Thu, 30 Sep 2021 09:57:34 +0200 Subject: Add Juno FPGA reset kernel module Change-Id: I93708d609d77484770bd4cea9c4a7cf86361c5ea --- remoteproc/CMakeLists.txt | 6 +- remoteproc/Kbuild | 5 +- remoteproc/Kconfig | 11 ++- remoteproc/ethosu_remoteproc.c | 2 +- remoteproc/juno_fpga_reset.c | 159 +++++++++++++++++++++++++++++++++++++++++ remoteproc/remoteproc.dtsi | 2 +- 6 files changed, 177 insertions(+), 8 deletions(-) create mode 100644 remoteproc/juno_fpga_reset.c diff --git a/remoteproc/CMakeLists.txt b/remoteproc/CMakeLists.txt index 1532f6c..fa3491a 100644 --- a/remoteproc/CMakeLists.txt +++ b/remoteproc/CMakeLists.txt @@ -36,11 +36,13 @@ file(GLOB_RECURSE OBJ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") list(TRANSFORM OBJ REPLACE "^(.*)[.]c" "\\1.o") list(TRANSFORM OBJ PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/) +set(MODULES CONFIG_ARM_ETHOSU_RPROC=m CONFIG_ARM_SGM775_ETHOSU_RESET=m CONFIG_ARM_JUNO_FPGA_RESET=m) + # Build the kernel module add_custom_target(ethosu-remoteproc-module ALL COMMAND ${CMAKE_MAKE_PROGRAM} -C ${KDIR} EXTRA_CFLAGS=-I${KDIR}/../../../drivers/remoteproc M=${CMAKE_CURRENT_SOURCE_DIR} - CONFIG_ETHOSU_RESET=m CONFIG_ETHOSU_REMOTEPROC=m + ${MODULES} CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 modules BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/ethosu_remoteproc.ko @@ -49,6 +51,6 @@ add_custom_target(ethosu-remoteproc-module ALL ${CMAKE_CURRENT_SOURCE_DIR}/Module.symvers ${OBJ} DEPENDS ${SOURCES} Kbuild Kconfig - COMMENT "Building ethosu_remoteproc.ko" + COMMENT "Building remoteproc modules" VERBATIM) diff --git a/remoteproc/Kbuild b/remoteproc/Kbuild index 8a88c43..bc96bdf 100644 --- a/remoteproc/Kbuild +++ b/remoteproc/Kbuild @@ -18,5 +18,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -obj-$(CONFIG_ETHOSU_RESET) += ethosu_bridge_reset.o -obj-$(CONFIG_ETHOSU_REMOTEPROC) += ethosu_remoteproc.o +obj-$(CONFIG_ARM_SGM775_ETHOSU_RESET) += ethosu_bridge_reset.o +obj-$(CONFIG_ARM_JUNO_FPGA_RESET) += juno_fpga_reset.o +obj-$(CONFIG_ARM_ETHOSU_RPROC) += ethosu_remoteproc.o diff --git a/remoteproc/Kconfig b/remoteproc/Kconfig index deca3e6..5e0d558 100644 --- a/remoteproc/Kconfig +++ b/remoteproc/Kconfig @@ -18,7 +18,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -config ARM_ETHOSU_SGM775_RESET +config ARM_SGM775_ETHOSU_RESET tristate "Arm Ethos-U SGM775 Reset" depends on RESET_CONTROLLER help @@ -26,8 +26,15 @@ config ARM_ETHOSU_SGM775_RESET reference module for controlling the reset of Cortex-M CPU on the Ethos-U subsystem. +config ARM_JUNO_FPGA_RESET + tristate "Arm Juno FPGA Reset" + depends on RESET_CONTROLLER + help + Say Y here if you want to build the Arm Juno FPGA reset controller + reference module for controlling the reset of Juno FPGA. + config ARM_ETHOSU_RPROC - tristate "Arm MHUv2 Mailbox" + tristate "Arm Ethos-U remoteproc" depends on REMOTEPROC help Say Y here if you want to build the Arm Ethos-U remoteproc diff --git a/remoteproc/ethosu_remoteproc.c b/remoteproc/ethosu_remoteproc.c index 9fb561a..ad476af 100644 --- a/remoteproc/ethosu_remoteproc.c +++ b/remoteproc/ethosu_remoteproc.c @@ -247,7 +247,7 @@ static int ethosu_rproc_of_memory_translations(struct platform_device *pdev, } static const struct of_device_id ethosu_rproc_match[] = { - { .compatible = "arm,ethosu-sgm775-rproc" }, + { .compatible = "arm,ethosu-rproc" }, }; static int ethosu_rproc_probe(struct platform_device *pdev) diff --git a/remoteproc/juno_fpga_reset.c b/remoteproc/juno_fpga_reset.c new file mode 100644 index 0000000..5cc6bae --- /dev/null +++ b/remoteproc/juno_fpga_reset.c @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2021 Arm Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you can access it online at + * http://www.gnu.org/licenses/gpl-2.0.html. + * + * SPDX-License-Identifier: GPL-2.0-only + */ + +#include +#include +#include +#include +#include +#include +#include + +#define JUNO_FPGA_RESET_DRIVER_VERSION "0.0.1" + +struct juno_fpga_reset { + struct reset_controller_dev rst; + struct device *dev; + void __iomem *base; +}; + +#define JUNO_FPGA_RESET_ID(base) (base) +#define JUNO_FPGA_RESET_SOFT_RESET(base) ((base) + 0x140) +#define JUNO_FPGA_RESET_CPU_WAIT(base) ((base) + 0x144) + +#define JUNO_FPGA_RESET_SET_RESET (0x1) +#define JUNO_FPGA_RESET_UNSET_RESET (0x0) +#define JUNO_FPGA_RESET_SET_CPUWAIT (0x1) +#define JUNO_FPGA_RESET_UNSET_CPUWAIT (0x0) + +static void __iomem *verify_and_remap(struct device *dev, + struct resource *res) +{ + void __iomem *base = devm_ioremap_resource(dev, res); + u32 id; + + if (IS_ERR(base)) + return base; + + id = readl(JUNO_FPGA_RESET_ID(base)); + + if (id != 0x2010f && + id != 0x20110 && + id != 0x20111) { + return IOMEM_ERR_PTR(-EINVAL); + } + + return base; +} + +int juno_fpga_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct juno_fpga_reset *reset = container_of(rcdev, struct juno_fpga_reset, + rst); + + /* pull reset */ + dev_dbg(reset->dev, "Asserting reset"); + + /* set wait and reset */ + writel(JUNO_FPGA_RESET_SET_RESET, + JUNO_FPGA_RESET_SOFT_RESET(reset->base)); + writel(JUNO_FPGA_RESET_SET_CPUWAIT, + JUNO_FPGA_RESET_CPU_WAIT(reset->base)); + + writel(JUNO_FPGA_RESET_UNSET_RESET, + JUNO_FPGA_RESET_SOFT_RESET(reset->base)); + return 0; +} + +int juno_fpga_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct juno_fpga_reset *reset = container_of(rcdev, struct juno_fpga_reset, + rst); + + /* release wait */ + dev_dbg(reset->dev, "Deasserting reset"); + + writel(JUNO_FPGA_RESET_UNSET_CPUWAIT, + JUNO_FPGA_RESET_CPU_WAIT(reset->base)); + return 0; +} + +static struct reset_control_ops juno_fpga_reset_ops = { + .assert = juno_fpga_reset_assert, + .deassert = juno_fpga_reset_deassert, +}; + +static const struct of_device_id juno_fpga_reset_match[] = { + { .compatible = "arm,mali_fpga_sysctl", .data = 0 }, + { /* sentinel */ }, +}; + +static int juno_fpga_reset_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct juno_fpga_reset *reset; + struct resource *res; + + reset = devm_kzalloc(&pdev->dev, sizeof(*reset), GFP_KERNEL); + if (!reset) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + reset->base = verify_and_remap(dev, res); + reset->dev = dev; + + if (IS_ERR(reset->base)) + return PTR_ERR(reset->base); + + platform_set_drvdata(pdev, reset); + + reset->rst.owner = THIS_MODULE; + reset->rst.nr_resets = 1; + reset->rst.ops = &juno_fpga_reset_ops; + reset->rst.of_node = pdev->dev.of_node; + + dev_dbg(dev, "registering to reset controller core"); + + return devm_reset_controller_register(dev, &reset->rst); +} + +static int juno_fpga_reset_remove(struct platform_device *pdev) +{ + return 0; +} + +static struct platform_driver juno_fpga_reset_driver = { + .probe = juno_fpga_reset_probe, + .remove = juno_fpga_reset_remove, + .driver = { + .name = "juno-fpga-reset", + .of_match_table = of_match_ptr(juno_fpga_reset_match), + }, +}; + +module_platform_driver(juno_fpga_reset_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Arm Ltd"); +MODULE_DESCRIPTION("Arm Juno FPGA Reset Driver"); +MODULE_VERSION(JUNO_FPGA_RESET_DRIVER_VERSION); diff --git a/remoteproc/remoteproc.dtsi b/remoteproc/remoteproc.dtsi index 2e38e17..a267912 100644 --- a/remoteproc/remoteproc.dtsi +++ b/remoteproc/remoteproc.dtsi @@ -32,7 +32,7 @@ #address-cells = <2>; #size-cells = <2>; range; - compatible ="arm,ethosu-sgm775-rproc"; + compatible ="arm,ethosu-rproc"; reg = <0x0 0x50100000 0x0 0x00100000>, <0x0 0x84000000 0x0 0x00100000>; reg-names = "rom", "shared"; -- cgit v1.2.1