mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-06 05:04:26 +00:00
e4679489c3
We currently handle the UEFI runtime reset / power off case handling via a switch statement. Compilers (gcc in my case) may opt to handle these via jump tables which they may conveniently put into .rodata which is not part of the runtime section, so it will be unreachable when executed. Fix this by just converting the switch statement into an if/else statement. It produces smaller code that is faster and also correct because we no longer refer .rodata from efi runtime code. Reported-by: Andreas Färber <aferber@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de>
87 lines
2.1 KiB
C
87 lines
2.1 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 <asm/io.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
|
|
|
|
#ifdef CONFIG_BCM2835_WDT
|
|
extern void hw_watchdog_disable(void);
|
|
#else
|
|
void hw_watchdog_disable(void) {}
|
|
#endif
|
|
|
|
__efi_runtime_data struct bcm2835_wdog_regs *wdog_regs =
|
|
(struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR;
|
|
|
|
void __efi_runtime reset_cpu(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);
|
|
}
|
|
|
|
#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(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(0);
|
|
}
|
|
|
|
while (1) { }
|
|
}
|
|
|
|
efi_status_t efi_reset_system_init(void)
|
|
{
|
|
return efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs));
|
|
}
|
|
|
|
#endif
|