arm: socfpga: rst: add register definition for cold reset
Subsystems (4)
PATCH v2 1/2 arm: socfpga: rst: add register definition for cold reset
This adds a define for the bit in rstmgr's ctrl regiser that issues a cold reset (we had a define for the warm reset bit only) in preparation for a proper sysrese driver.
Series changes: 2
- separate this patch to the register descriptions from the actual sysreset driver patch
---
Changes in v2: None
arch/arm/mach-socfpga/include/mach/reset_manager.h | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-socfpga/include/mach/reset_manager.h +1 -0
@@ -11,6 +11,7 @@ void reset_cpu(ulong addr);void socfpga_per_reset (u32 reset,int set);void socfpga_per_reset_all (void ); +#define RSTMGR_CTRL_SWCOLDRSTREQ_LSB 0#define RSTMGR_CTRL_SWWARMRSTREQ_LSB 1/*
Signature · 1 line
2.20.1
PATCH v2 2/2 sysreset: add support for socfpga sysreset
This moves sysreset support for socfgpa from ad-hoc code in mach-socfpga to a UCLASS_SYSRESET based dm driver.
A side effect is that gen5 and a10 can now select between cold and warm reset.
---
Changes in v2:
- adapt to patch that separates drivers/sysreset from drivers/misc for SPL: select SPL_SYSRESET_SUPPORT, not SPL_DRIVERS_MISC_SUPPORT
- separate gen5/a10 driver from s10 driver
- as sysreset is a function of rstmgr, bind the sysreset drivers from rstmgr to get the base address instead of hardcoding it
arch/arm/Kconfig | 4 ++ arch/arm/mach-socfpga/Makefile | 1 - arch/arm/mach-socfpga/reset_manager.c | 41 ------------------ drivers/reset/reset-socfpga.c | 19 +++++++++ drivers/sysreset/Kconfig | 14 +++++++ drivers/sysreset/Makefile | 2 + drivers/sysreset/sysreset_socfpga.c | 56 +++++++++++++++++++++++++ drivers/sysreset/sysreset_socfpga_s10.c | 29 +++++++++++++ 8 files changed, 124 insertions(+), 42 deletions(-) delete mode 100644 arch/arm/mach-socfpga/reset_manager.c create mode 100644 drivers/sysreset/sysreset_socfpga.c create mode 100644 drivers/sysreset/sysreset_socfpga_s10.c
arch/arm/Kconfig +4 -0
@@ -829,10 +829,14 @@ config ARCH_SOCFPGA select SPL_OF_CONTROL select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10 select SPL_SERIAL_SUPPORT + select SPL_SYSRESET_SUPPORT select SPL_WATCHDOG_SUPPORT select SUPPORT_SPL select SYS_NS16550 select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 + select SYSRESET + select SYSRESET_SOCFPGA if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 + select SYSRESET_SOCFPGA_STRATIX10 if TARGET_SOCFPGA_STRATIX10 imply CMD_DM imply CMD_MTDPARTS imply CRC32_VERIFY
arch/arm/mach-socfpga/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-y += board.o obj-y += clock_manager.o obj-y += misc.o -obj-y += reset_manager.o ifdef CONFIG_TARGET_SOCFPGA_GEN5 obj-y += clock_manager_gen5.o
arch/arm/mach-socfpga/reset_manager.c deleted +0 -41
41 lines not on this page · raw message
drivers/reset/reset-socfpga.c +19 -0
@@ -14,6 +14,7 @@#include <common.h> #include <dm.h> +#include <dm/lists.h> #include <dm/of_access.h> #include <reset-uclass.h> #include <linux/bitops.h>
@@ -132,6 +133,23 @@ static int socfpga_reset_remove(struct udevice *dev)return 0 ; } +static int socfpga_reset_bind (struct udevice *dev) +{ +int ret; +struct udevice *sys_child; + +/* +* The sysreset driver does not have a device node, so bind it here. +* Bind it to the node, too, so that it can get its base address. +*/ + ret =device_bind_driver_to_node (dev,"socfpga_sysreset" ,"sysreset" , + dev->node, &sys_child); +if (ret) +debug ("Warning: No sysreset driver: ret=%d\n" , ret); + +return 0 ; +} +static const struct udevice_id socfpga_reset_match[] = { { .compatible ="altr,rst-mgr" }, {/* sentinel */ },
@@ -141,6 +159,7 @@ U_BOOT_DRIVER(socfpga_reset) = { .name = "socfpga-reset", .id = UCLASS_RESET, .of_match = socfpga_reset_match, + .bind = socfpga_reset_bind, .probe = socfpga_reset_probe, .priv_auto_alloc_size = sizeof(struct socfpga_reset_data), .ops = &socfpga_reset_ops,
drivers/sysreset/Kconfig +14 -0
@@ -36,6 +36,20 @@ config SYSRESET_PSCI Enable PSCI SYSTEM_RESET function call. To use this, PSCI firmware must be running on your system. +config SYSRESET_SOCFPGA + bool "Enable support for Intel SOCFPGA family" + depends on ARCH_SOCFPGA && (TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10) + help + This enables the system reset driver support for Intel SOCFPGA SoCs + (Cyclone 5, Arria 5 and Arria 10). + +config SYSRESET_SOCFPGA_S10 + bool "Enable support for Intel SOCFPGA Stratix 10" + depends on ARCH_SOCFPGA && TARGET_SOCFPGA_STRATIX10 + help + This enables the system reset driver support for Intel SOCFPGA + Stratix SoCs. + config SYSRESET_TI_SCI bool "TI System Control Interface (TI SCI) system reset driver" depends on TI_SCI_PROTOCOL
drivers/sysreset/Makefile +2 -0
@@ -11,6 +11,8 @@ obj-$(CONFIG_SYSRESET_GPIO) += sysreset_gpio.o obj-$(CONFIG_SYSRESET_MCP83XX) += sysreset_mpc83xx.o obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o +obj-$(CONFIG_SYSRESET_SOCFPGA) += sysreset_socfpga.o +obj-$(SYSRESET_SOCFPGA_S10) += sysreset_socfpga_s10.o obj-$(CONFIG_SYSRESET_TI_SCI) += sysreset-ti-sci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
drivers/sysreset/sysreset_socfpga.c new file +56 -0
56 lines not on this page · raw message
drivers/sysreset/sysreset_socfpga_s10.c new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 Pepperl+Fuchs +* Simon Goldschmidt <[email protected]> +*/ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <sysreset.h> +#include <asm/arch/mailbox_s10.h> + +static int socfpga_sysreset_request (struct udevice *dev, +enum sysreset_t type) +{ +puts ("Mailbox: Issuing mailbox cmd REBOOT_HPS\n" ); +mbox_reset_cold (); +return -EINPROGRESS ; +} + +static struct sysreset_ops socfpga_sysreset = { + .request = socfpga_sysreset_request, +}; + +U_BOOT_DRIVER (sysreset_socfpga) = { + .id =UCLASS_SYSRESET , + .name ="socfpga_sysreset" , + .ops = &socfpga_sysreset, +};
Signature · 1 line
2.20.1
PATCH v2 2/2 sysreset: add support for socfpga sysreset
On 5/6/19 10:13 PM, Simon Goldschmidt wrote:
[...]
drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct udevice *dev) · line 148
Quoted 13 lines
drivers/reset/reset-socfpga.c +13
-0+static int socfpga_reset_bind (struct udevice *dev) +{ +int ret; +struct udevice *sys_child; + +/* +* The sysreset driver does not have a device node, so bind it here. +* Bind it to the node, too, so that it can get its base address. +*/ + ret =device_bind_driver_to_node (dev,"socfpga_sysreset" ,"sysreset" , + dev->node, &sys_child); +if (ret) +debug ("Warning: No sysreset driver: ret=%d\n" , ret);
Can't we just fail here ? (return ret;) ?
Quoted 27 lines
drivers/reset/reset-socfpga.c +5
-0+ +return 0 ; +} +static const struct udevice_id socfpga_reset_match[] = { { .compatible ="altr,rst-mgr" }, {/* sentinel */ },@@ -141,6 +159,7 @@ U_BOOT_DRIVER(socfpga_reset) = { .name = "socfpga-reset", .id = UCLASS_RESET, .of_match = socfpga_reset_match, + .bind = socfpga_reset_bind, .probe = socfpga_reset_probe, .priv_auto_alloc_size = sizeof(struct socfpga_reset_data), .ops = &socfpga_reset_ops,drivers/sysreset/Kconfig +4
-0@@ -36,6 +36,20 @@ config SYSRESET_PSCI Enable PSCI SYSTEM_RESET function call. To use this, PSCI firmware must be running on your system. +config SYSRESET_SOCFPGA + bool "Enable support for Intel SOCFPGA family" + depends on ARCH_SOCFPGA && (TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10) + help
drivers/sysreset/Kconfig config SYSRESET_PSCI · line 52
Quoted 10 lines
drivers/sysreset/Kconfig +10
-0+ This enables the system reset driver support for Intel SOCFPGA SoCs + (Cyclone 5, Arria 5 and Arria 10). + +config SYSRESET_SOCFPGA_S10 + bool "Enable support for Intel SOCFPGA Stratix 10" + depends on ARCH_SOCFPGA && TARGET_SOCFPGA_STRATIX10 + help + This enables the system reset driver support for Intel SOCFPGA + Stratix SoCs. +
That sounds like two drivers => separate patch please.
[...]
drivers/sysreset/Kconfig config SYSRESET_PSCI
Quoted 13 lines
drivers/sysreset/Kconfig +13
-0+static int socfpga_sysreset_request(struct udevice *dev, + enum sysreset_t type) +{ + struct socfpga_sysreset_data *data = dev_get_priv(dev); + + switch (type) { + case SYSRESET_WARM: + writel(1 << RSTMGR_CTRL_SWWARMRSTREQ_LSB, + &data->rstmgr_base->ctrl); + break; + case SYSRESET_COLD: + writel(1 << RSTMGR_CTRL_SWCOLDRSTREQ_LSB, + &data->rstmgr_base->ctrl);
Use BIT() macro.
Signature · 2 lines
Best regards, Marek Vasut