From 087ea21ebad72c0b5563f04370abc3c6cc9ce8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85strand?= Date: Wed, 6 Apr 2022 09:40:11 +0200 Subject: reset controller driver for corstone1000 ES Add reset controller driver for external system. The driver is instantiated for each subsystem reset needed to control. Change-Id: I481e56124de30b807858ca3f5fe8f78fc18502ce --- remoteproc/CMakeLists.txt | 7 +- remoteproc/Kbuild | 3 +- remoteproc/Kconfig | 9 ++- remoteproc/corstone1000_es_reset.c | 159 +++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 remoteproc/corstone1000_es_reset.c diff --git a/remoteproc/CMakeLists.txt b/remoteproc/CMakeLists.txt index 58c9796..af5f1d1 100644 --- a/remoteproc/CMakeLists.txt +++ b/remoteproc/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2021 Arm Limited. All rights reserved. +# Copyright (c) 2020-2022 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 @@ -36,7 +36,7 @@ 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) +set(MODULES CONFIG_ARM_ETHOSU_RPROC=m CONFIG_ARM_SGM775_ETHOSU_RESET=m CONFIG_ARM_JUNO_FPGA_RESET=m CONFIG_ARM_CORSTONE1000_ES_RESET=m) # Build the kernel module add_custom_target(ethosu-remoteproc-module ALL @@ -54,4 +54,5 @@ add_custom_target(ethosu-remoteproc-module ALL COMMENT "Building remoteproc modules" VERBATIM) -install(FILES ethosu_remoteproc.ko DESTINATION "modules") \ No newline at end of file +install(FILES ethosu_remoteproc.ko DESTINATION "modules") +install(FILES corstone1000_es_reset.ko DESTINATION "modules") diff --git a/remoteproc/Kbuild b/remoteproc/Kbuild index bc96bdf..23b9c8e 100644 --- a/remoteproc/Kbuild +++ b/remoteproc/Kbuild @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2021 Arm Limited. All rights reserved. +# Copyright (c) 2020-2022 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 @@ -21,3 +21,4 @@ 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 +obj-$(CONFIG_ARM_CORSTONE1000_ES_RESET) += corstone1000_es_reset.o diff --git a/remoteproc/Kconfig b/remoteproc/Kconfig index 5e0d558..8c7b6c7 100644 --- a/remoteproc/Kconfig +++ b/remoteproc/Kconfig @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2021 Arm Limited. All rights reserved. +# Copyright (c) 2020-2022 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 @@ -41,3 +41,10 @@ config ARM_ETHOSU_RPROC reference module for controlling the Cortex-M CPU on the Ethos-U subsystem. +config ARM_CORSTONE1000_ES_RESET + tristate "Arm Corstone1000 External System reset" + depends on REMOTEPROC + help + Say Y here if you want to build the reset driver for the external + systems on Corstone1000. + diff --git a/remoteproc/corstone1000_es_reset.c b/remoteproc/corstone1000_es_reset.c new file mode 100644 index 0000000..e62ebdb --- /dev/null +++ b/remoteproc/corstone1000_es_reset.c @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2022 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 + +/* External system reset control bits */ +#define EXTSYS_CPU_WAIT (0x0) +#define EXTSYS_RST_REQ (0x1) + +/* External system reset status bits */ +#define EXTSYS_STATUS_NO_RST_REQ (0x0) +#define EXTSYS_STATUS_RST_REQ_NOT_COMPLETED (0x1) +#define EXTSYS_STATUS_RST_REQ_COMPLETED (0x2) +#define EXTSYS_STATUS_MASK(a) (0x3 & ((a) >> 1)) + +struct cs1k_es_reset_data { + struct reset_controller_dev rcdev; + struct device *dev; + void __iomem *ctrl; + void __iomem *status; +}; + +int cs1k_es_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + u32 status; + struct cs1k_es_reset_data *reset = + container_of(rcdev, struct cs1k_es_reset_data, rcdev); + + if (id) + return -ENODEV; + + dev_dbg(reset->dev, "Asserting reset"); + + /* set cpu wait and reset request of external system */ + writel((1 << EXTSYS_CPU_WAIT) | (1 << EXTSYS_RST_REQ), reset->ctrl); + + status = EXTSYS_STATUS_MASK(readl(reset->status)); + dev_dbg(reset->dev, "status deasserting reset: %u", status); + + return status == EXTSYS_STATUS_RST_REQ_COMPLETED ? 0 : 1; +} + +int cs1k_es_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + u32 status; + struct cs1k_es_reset_data *reset = + container_of(rcdev, struct cs1k_es_reset_data, rcdev); + + if (id) + return -ENODEV; + + /* release cpu wait */ + dev_dbg(reset->dev, "Deasserting reset"); + + writel(0, reset->ctrl); + + status = EXTSYS_STATUS_MASK(readl(reset->status)); + dev_dbg(reset->dev, "status deasserting reset: %u", status); + + return status == EXTSYS_STATUS_NO_RST_REQ ? 0 : 1; +} + +static struct reset_control_ops cs1k_es_reset_ops = { + .assert = cs1k_es_assert, + .deassert = cs1k_es_deassert, +}; + +static int of_reset_noop(struct reset_controller_dev *rcdev, + const struct of_phandle_args *reset_spec) +{ + return 0; +} + +static int cs1k_es_reset_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct cs1k_es_reset_data *data; + struct resource *res; + + if (!dev->of_node) + return -ENODEV; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rstreg"); + data->ctrl = devm_ioremap_resource(dev, res); + if (IS_ERR(data->ctrl)) + return PTR_ERR(data->ctrl); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "streg"); + data->status = devm_ioremap_resource(dev, res); + if (IS_ERR(data->status)) + return PTR_ERR(data->status); + + data->dev = dev; + platform_set_drvdata(pdev, data); + + data->rcdev.owner = THIS_MODULE; + data->rcdev.nr_resets = 1; + data->rcdev.ops = &cs1k_es_reset_ops; + data->rcdev.of_node = pdev->dev.of_node; + /* only one reset line for this reset controller */ + data->rcdev.of_xlate = of_reset_noop; + + dev_info(dev, "registering reset to core"); + + return devm_reset_controller_register(dev, &data->rcdev); +} + +static int cs1k_es_reset_remove(struct platform_device *pdev) +{ + return 0; +} + +static const struct of_device_id cs1k_es_reset_match[] = { + { .compatible = "arm,cs1k_es_rst", .data = 0 }, + { /* sentinel */ }, +}; + +static struct platform_driver cs1k_es_reset_driver = { + .probe = cs1k_es_reset_probe, + .remove = cs1k_es_reset_remove, + .driver = { + .name = "cs1k_es-reset", + .of_match_table = of_match_ptr(cs1k_es_reset_match), + }, +}; +module_platform_driver(cs1k_es_reset_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Arm Corstone1000 External System Reset Driver"); +MODULE_AUTHOR("Arm Ltd"); -- cgit v1.2.1