mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 17:07:38 +00:00
35b65dd8ef
Historically, the reset_cpu() function had an `addr` parameter which was
meant to pass in an address of the reset vector location, where the CPU
should reset to. This feature is no longer used anywhere in U-Boot as
all reset_cpu() implementations now ignore the passed value. Generic
code has been added which always calls reset_cpu() with `0` which means
this feature can no longer be used easily anyway.
Over time, many implementations seem to have "misunderstood" the
existence of this parameter as a way to customize/parameterize the reset
(e.g. COLD vs WARM resets). As this is not properly supported, the
code will almost always not do what it is intended to (because all
call-sites just call reset_cpu() with 0).
To avoid confusion and to clean up the codebase from unused left-overs
of the past, remove the `addr` parameter entirely. Code which intends
to support different kinds of resets should be rewritten as a sysreset
driver instead.
This transformation was done with the following coccinelle patch:
@@
expression argvalue;
@@
- reset_cpu(argvalue)
+ reset_cpu()
@@
identifier argname;
type argtype;
@@
- reset_cpu(argtype argname)
+ reset_cpu(void)
{ ... }
Signed-off-by: Harald Seiler <hws@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
94 lines
2.3 KiB
C
94 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* (C) Copyright 2012 Stephen Warren
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <cpu_func.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/base.h>
|
|
#include <asm/arch/wdog.h>
|
|
#include <efi_loader.h>
|
|
|
|
#define RESET_TIMEOUT 10
|
|
|
|
/*
|
|
* The Raspberry Pi firmware uses the RSTS register to know which partiton
|
|
* to boot from. The partiton value is spread into bits 0, 2, 4, 6, 8, 10.
|
|
* Partiton 63 is a special partition used by the firmware to indicate halt.
|
|
*/
|
|
#define BCM2835_WDOG_RSTS_RASPBERRYPI_HALT 0x555
|
|
|
|
/* max ticks timeout */
|
|
#define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff
|
|
|
|
void hw_watchdog_disable(void) {}
|
|
|
|
__efi_runtime_data struct bcm2835_wdog_regs *wdog_regs;
|
|
|
|
static void __efi_runtime
|
|
__reset_cpu(struct bcm2835_wdog_regs *wdog_regs, ulong ticks)
|
|
{
|
|
uint32_t rstc, timeout;
|
|
|
|
if (ticks == 0) {
|
|
hw_watchdog_disable();
|
|
timeout = RESET_TIMEOUT;
|
|
} else
|
|
timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT;
|
|
|
|
rstc = readl(&wdog_regs->rstc);
|
|
rstc &= ~BCM2835_WDOG_RSTC_WRCFG_MASK;
|
|
rstc |= BCM2835_WDOG_RSTC_WRCFG_FULL_RESET;
|
|
|
|
writel(BCM2835_WDOG_PASSWORD | timeout, &wdog_regs->wdog);
|
|
writel(BCM2835_WDOG_PASSWORD | rstc, &wdog_regs->rstc);
|
|
}
|
|
|
|
void reset_cpu(void)
|
|
{
|
|
struct bcm2835_wdog_regs *regs =
|
|
(struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR;
|
|
|
|
__reset_cpu(regs, 0);
|
|
}
|
|
|
|
#ifdef CONFIG_EFI_LOADER
|
|
|
|
void __efi_runtime EFIAPI efi_reset_system(
|
|
enum efi_reset_type reset_type,
|
|
efi_status_t reset_status,
|
|
unsigned long data_size, void *reset_data)
|
|
{
|
|
u32 val;
|
|
|
|
if (reset_type == EFI_RESET_COLD ||
|
|
reset_type == EFI_RESET_WARM ||
|
|
reset_type == EFI_RESET_PLATFORM_SPECIFIC) {
|
|
__reset_cpu(wdog_regs, 0);
|
|
} else if (reset_type == EFI_RESET_SHUTDOWN) {
|
|
/*
|
|
* We set the watchdog hard reset bit here to distinguish this reset
|
|
* from the normal (full) reset. bootcode.bin will not reboot after a
|
|
* hard reset.
|
|
*/
|
|
val = readl(&wdog_regs->rsts);
|
|
val |= BCM2835_WDOG_PASSWORD;
|
|
val |= BCM2835_WDOG_RSTS_RASPBERRYPI_HALT;
|
|
writel(val, &wdog_regs->rsts);
|
|
__reset_cpu(wdog_regs, 0);
|
|
}
|
|
|
|
while (1) { }
|
|
}
|
|
|
|
efi_status_t efi_reset_system_init(void)
|
|
{
|
|
wdog_regs = (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR;
|
|
return efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs));
|
|
}
|
|
|
|
#endif
|