mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 17:07:38 +00:00
06985289d4
This patch tries to implement a generic watchdog_reset() function that can be used by all boards that want to service the watchdog device in U-Boot. This watchdog servicing is enabled via CONFIG_WATCHDOG. Without this approach, new boards or platforms needed to implement a board specific version of this functionality, mostly copy'ing the same code over and over again into their board or platforms code base. With this new generic function, the scattered other functions are now removed to be replaced by the generic one. The new version also enables the configuration of the watchdog timeout via the DT "timeout-sec" property (if enabled via CONFIG_OF_CONTROL). This patch also adds a new flag to the GD flags, to flag that the watchdog is ready to use and adds the pointer to the watchdog device to the GD. This enables us to remove the global "watchdog_dev" variable, which was prone to cause problems because of its potentially very early use in watchdog_reset(), even before the BSS is cleared. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "Marek Behún" <marek.behun@nic.cz> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Maxim Sloyko <maxims@google.com> Cc: Erik van Luijk <evanluijk@interact.nl> Cc: Ryder Lee <ryder.lee@mediatek.com> Cc: Weijie Gao <weijie.gao@mediatek.com> Cc: Simon Glass <sjg@chromium.org> Cc: "Álvaro Fernández Rojas" <noltari@gmail.com> Cc: Philippe Reynes <philippe.reynes@softathome.com> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Michal Simek <michal.simek@xilinx.com> (on zcu100)
173 lines
6.3 KiB
C
173 lines
6.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright (c) 2012 The Chromium OS Authors.
|
|
* (C) Copyright 2002-2010
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*/
|
|
|
|
#ifndef __ASM_GENERIC_GBL_DATA_H
|
|
#define __ASM_GENERIC_GBL_DATA_H
|
|
/*
|
|
* The following data structure is placed in some memory which is
|
|
* available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
|
|
* some locked parts of the data cache) to allow for a minimum set of
|
|
* global variables during system initialization (until we have set
|
|
* up the memory controller so that we can use RAM).
|
|
*
|
|
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
|
|
*
|
|
* Each architecture has its own private fields. For now all are private
|
|
*/
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#include <fdtdec.h>
|
|
#include <membuff.h>
|
|
#include <linux/list.h>
|
|
|
|
typedef struct global_data {
|
|
bd_t *bd;
|
|
unsigned long flags;
|
|
unsigned int baudrate;
|
|
unsigned long cpu_clk; /* CPU clock in Hz! */
|
|
unsigned long bus_clk;
|
|
/* We cannot bracket this with CONFIG_PCI due to mpc5xxx */
|
|
unsigned long pci_clk;
|
|
unsigned long mem_clk;
|
|
#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
|
|
unsigned long fb_base; /* Base address of framebuffer mem */
|
|
#endif
|
|
#if defined(CONFIG_POST)
|
|
unsigned long post_log_word; /* Record POST activities */
|
|
unsigned long post_log_res; /* success of POST test */
|
|
unsigned long post_init_f_time; /* When post_init_f started */
|
|
#endif
|
|
#ifdef CONFIG_BOARD_TYPES
|
|
unsigned long board_type;
|
|
#endif
|
|
unsigned long have_console; /* serial_init() was called */
|
|
#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
|
|
unsigned long precon_buf_idx; /* Pre-Console buffer index */
|
|
#endif
|
|
unsigned long env_addr; /* Address of Environment struct */
|
|
unsigned long env_valid; /* Environment valid? enum env_valid */
|
|
unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */
|
|
int env_load_prio; /* Priority of the loaded environment */
|
|
|
|
unsigned long ram_base; /* Base address of RAM used by U-Boot */
|
|
unsigned long ram_top; /* Top address of RAM used by U-Boot */
|
|
unsigned long relocaddr; /* Start address of U-Boot in RAM */
|
|
phys_size_t ram_size; /* RAM size */
|
|
unsigned long mon_len; /* monitor len */
|
|
unsigned long irq_sp; /* irq stack pointer */
|
|
unsigned long start_addr_sp; /* start_addr_stackpointer */
|
|
unsigned long reloc_off;
|
|
struct global_data *new_gd; /* relocated global data */
|
|
|
|
#ifdef CONFIG_DM
|
|
struct udevice *dm_root; /* Root instance for Driver Model */
|
|
struct udevice *dm_root_f; /* Pre-relocation root instance */
|
|
struct list_head uclass_root; /* Head of core tree */
|
|
#endif
|
|
#ifdef CONFIG_TIMER
|
|
struct udevice *timer; /* Timer instance for Driver Model */
|
|
#endif
|
|
|
|
const void *fdt_blob; /* Our device tree, NULL if none */
|
|
void *new_fdt; /* Relocated FDT */
|
|
unsigned long fdt_size; /* Space reserved for relocated FDT */
|
|
#ifdef CONFIG_OF_LIVE
|
|
struct device_node *of_root;
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
|
|
const void *multi_dtb_fit; /* uncompressed multi-dtb FIT image */
|
|
#endif
|
|
struct jt_funcs *jt; /* jump table */
|
|
char env_buf[32]; /* buffer for env_get() before reloc. */
|
|
#ifdef CONFIG_TRACE
|
|
void *trace_buff; /* The trace buffer */
|
|
#endif
|
|
#if defined(CONFIG_SYS_I2C)
|
|
int cur_i2c_bus; /* current used i2c bus */
|
|
#endif
|
|
#ifdef CONFIG_SYS_I2C_MXC
|
|
void *srdata[10];
|
|
#endif
|
|
unsigned int timebase_h;
|
|
unsigned int timebase_l;
|
|
#if CONFIG_VAL(SYS_MALLOC_F_LEN)
|
|
unsigned long malloc_base; /* base address of early malloc() */
|
|
unsigned long malloc_limit; /* limit address */
|
|
unsigned long malloc_ptr; /* current address */
|
|
#endif
|
|
#ifdef CONFIG_PCI
|
|
struct pci_controller *hose; /* PCI hose for early use */
|
|
phys_addr_t pci_ram_top; /* top of region accessible to PCI */
|
|
#endif
|
|
#ifdef CONFIG_PCI_BOOTDELAY
|
|
int pcidelay_done;
|
|
#endif
|
|
struct udevice *cur_serial_dev; /* current serial device */
|
|
struct arch_global_data arch; /* architecture-specific data */
|
|
#ifdef CONFIG_CONSOLE_RECORD
|
|
struct membuff console_out; /* console output */
|
|
struct membuff console_in; /* console input */
|
|
#endif
|
|
#ifdef CONFIG_DM_VIDEO
|
|
ulong video_top; /* Top of video frame buffer area */
|
|
ulong video_bottom; /* Bottom of video frame buffer area */
|
|
#endif
|
|
#ifdef CONFIG_BOOTSTAGE
|
|
struct bootstage_data *bootstage; /* Bootstage information */
|
|
struct bootstage_data *new_bootstage; /* Relocated bootstage info */
|
|
#endif
|
|
#ifdef CONFIG_LOG
|
|
int log_drop_count; /* Number of dropped log messages */
|
|
int default_log_level; /* For devices with no filters */
|
|
struct list_head log_head; /* List of struct log_device */
|
|
int log_fmt; /* Mask containing log format info */
|
|
#endif
|
|
#if CONFIG_IS_ENABLED(BLOBLIST)
|
|
struct bloblist_hdr *bloblist; /* Bloblist information */
|
|
struct bloblist_hdr *new_bloblist; /* Relocated blolist info */
|
|
# ifdef CONFIG_SPL
|
|
struct spl_handoff *spl_handoff;
|
|
# endif
|
|
#endif
|
|
#if defined(CONFIG_TRANSLATION_OFFSET)
|
|
fdt_addr_t translation_offset; /* optional translation offset */
|
|
#endif
|
|
#if defined(CONFIG_WDT)
|
|
struct udevice *watchdog_dev;
|
|
#endif
|
|
} gd_t;
|
|
#endif
|
|
|
|
#ifdef CONFIG_BOARD_TYPES
|
|
#define gd_board_type() gd->board_type
|
|
#else
|
|
#define gd_board_type() 0
|
|
#endif
|
|
|
|
/*
|
|
* Global Data Flags - the top 16 bits are reserved for arch-specific flags
|
|
*/
|
|
#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */
|
|
#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */
|
|
#define GD_FLG_SILENT 0x00004 /* Silent mode */
|
|
#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */
|
|
#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */
|
|
#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */
|
|
#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */
|
|
#define GD_FLG_ENV_READY 0x00080 /* Env. imported into hash table */
|
|
#define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */
|
|
#define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */
|
|
#define GD_FLG_SPL_INIT 0x00400 /* spl_init() has been called */
|
|
#define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */
|
|
#define GD_FLG_RECORD 0x01000 /* Record console */
|
|
#define GD_FLG_ENV_DEFAULT 0x02000 /* Default variable flag */
|
|
#define GD_FLG_SPL_EARLY_INIT 0x04000 /* Early SPL init is done */
|
|
#define GD_FLG_LOG_READY 0x08000 /* Log system is ready for use */
|
|
#define GD_FLG_WDT_READY 0x10000 /* Watchdog is ready for use */
|
|
|
|
#endif /* __ASM_GENERIC_GBL_DATA_H */
|