diff options
author | Tom Rini <trini@konsulko.com> | 2025-08-08 11:13:41 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-08-08 11:13:41 -0600 |
commit | 83ce0b483c1680cb39565a9d91c6ef113a309c38 (patch) | |
tree | 45a8e2266c17af616c08100f1307d428f69047a5 /drivers/sysreset | |
parent | e51e139cdf81b2f4c373294a2186fefcf5573388 (diff) | |
parent | 8eecbaf957191b159176e92175121db907c480b2 (diff) |
Merge tag 'u-boot-socfpga-next-20250808' of https://source.denx.de/u-boot/custodians/u-boot-socfpgaHEADmaster
This pull request introduces initial U-Boot support for Agilex7 M-series, along
with several enhancements and cleanups across existing Agilex platforms. Key
changes include new board support, DDR driver additions, updated device trees,
and broader SoCFPGA SPL improvements.
Highlights:
- Agilex7 M-series bring-up:
- Basic DT support and board initialization for Agilex7 M-series SoC and
SoCDK.
- New sdram_agilex7m DDR driver with UIBSSM mailbox support and HBM support.
- Clock driver support for Agilex7 M-series.
- New defconfig: socfpga_agilex7m_defconfig.
- Agilex and Agilex5 enhancements:
- Improved SPL support: ASYNC interrupt enabling, system manager init
refactor, and cold scratch register usage.
- Updated firewall probing and watchdog support in SPL.
- Cleaned up DDR code, added secure region support for ATF, and improved warm
reset handling.
- Device Tree and config updates:
- Migration to upstream Linux DT layout for Agilex platforms.
- Consolidated socfpga_agilex_defconfig and removed deprecated configs.
- Platform-specific environment variables for Distro Boot added.
- Driver fixes and cleanups:
- dwc_eth_xgmac and clk-agilex cleanup and improvements.
- Several coverity and style fixes.
Contributions in this PR are from Alif Zakuan Yuslaimi, Tingting Meng, and
Andrew Goodbody. This patch set has been tested on Agilex 5 devkit, Agilex
devkit and Agilex7m devkit.
Passing all pipeline tests at SoCFPGA U-boot custodian
https://source.denx.de/u-boot/custodians/u-boot-socfpga/-/pipelines/27318
Diffstat (limited to 'drivers/sysreset')
-rw-r--r-- | drivers/sysreset/sysreset_socfpga_soc64.c | 63 |
1 files changed, 61 insertions, 2 deletions
diff --git a/drivers/sysreset/sysreset_socfpga_soc64.c b/drivers/sysreset/sysreset_socfpga_soc64.c index 6f44792abb0..6ce30d9eaf0 100644 --- a/drivers/sysreset/sysreset_socfpga_soc64.c +++ b/drivers/sysreset/sysreset_socfpga_soc64.c @@ -1,19 +1,78 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2019 Pepperl+Fuchs + * Copyright (C) 2025 Altera Corporation <www.altera.com> * Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> */ +#include <command.h> +#include <cpu_func.h> #include <dm.h> #include <errno.h> #include <sysreset.h> #include <asm/arch/mailbox_s10.h> +#include <asm/arch/reset_manager.h> +#include <asm/secure.h> + +#define GICD_CTRL_ADDRESS 0xfffc1000 + +static __always_inline void __l2_reset_cpu(void) +{ + asm volatile(/* Disable GIC distributor (IRQs). */ + "str wzr, [%3]\n" + /* Set Magic Number */ + "str %0, [%1]\n" + /* Increase timeout in rstmgr.hdsktimeout */ + "ldr x2, =0xFFFFFF\n" + "str w2, [%2, #0x64]\n" + "ldr w2, [%2, #0x10]\n" + /* + * Set l2flushen = 1, etrstallen = 1, + * fpgahsen = 1 and sdrselfrefen = 1 + * in rstmgr.hdsken to perform handshake + * in certain peripherals before trigger + * L2 reset. + */ + "ldr x3, =0x10D\n" + "orr x2, x2, x3\n" + "str w2, [%2, #0x10]\n" + /* Trigger L2 reset in rstmgr.coldmodrst */ + "ldr w2, [%2, #0x34]\n" + "orr x2, x2, #0x100\n" + "isb\n" + "dsb sy\n" + "str w2, [%2, #0x34]\n" + /* Put all cores into WFI mode */ + "1:\n" + " wfi\n" + " b 1b\n" + : : "r" (L2_RESET_DONE_STATUS), + "r" (L2_RESET_DONE_REG), + "r" (SOCFPGA_RSTMGR_ADDRESS), + "r" (GICD_CTRL_ADDRESS) + : "x1", "x2", "x3"); +} + +static void l2_reset_cpu(void) +{ + __l2_reset_cpu(); +} static int socfpga_sysreset_request(struct udevice *dev, enum sysreset_t type) { - puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n"); - mbox_reset_cold(); + if (type == SYSRESET_WARM) { + /* flush dcache */ + flush_dcache_all(); + + /* request a warm reset */ + puts("Do warm reset now...\n"); + l2_reset_cpu(); + } else { + puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n"); + mbox_reset_cold(); + } + return -EINPROGRESS; } |