diff options
| author | Stefan Roese <sr@denx.de> | 2019-04-03 10:12:48 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-08 16:21:39 +0300 |
| commit | ccd063e9812a2bdcbeafbbcd8dcb062bfc290f24 (patch) | |
| tree | 3aa26119f289517fddfc0387279e400938b384d1 /board/xilinx | |
| parent | afbc31948a007e03d6a1282677aafc2208f45819 (diff) | |
| download | u-boot-ccd063e9812a2bdcbeafbbcd8dcb062bfc290f24.tar.xz | |
watchdog: Move watchdog_dev to data section (BSS may not be cleared)
This patch moves all instances of static "watchdog_dev" declarations to
the "data" section. This may be needed, as the BSS may not be cleared
in the early U-Boot phase, where watchdog_reset() is already beeing
called. This may result in incorrect pointer access, as the check to
"!watchdog_dev" in watchdog_reset() may not be true and the function
may continue to run.
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>
Tested-by: Michal Simek <michal.simek@xilinx.com> (on zcu100)
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board/xilinx')
| -rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynq/board.c | 7 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 7 |
3 files changed, 3 insertions, 13 deletions
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index c946ec3208..28c9efa3a2 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT) -static struct udevice *watchdog_dev; +static struct udevice *watchdog_dev __attribute__((section(".data"))) = NULL; #endif /* !CONFIG_SPL_BUILD && CONFIG_WDT */ ulong ram_base; diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index b4b84df576..ea26aad16f 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -19,17 +19,12 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT) -static struct udevice *watchdog_dev; +static struct udevice *watchdog_dev __attribute__((section(".data"))) = NULL; #endif #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_BOARD_EARLY_INIT_F) int board_early_init_f(void) { -# if defined(CONFIG_WDT) - /* bss is not cleared at time when watchdog_reset() is called */ - watchdog_dev = NULL; -# endif - return 0; } #endif diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 5e1d2116bc..db27247850 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT) -static struct udevice *watchdog_dev; +static struct udevice *watchdog_dev __attribute__((section(".data"))) = NULL; #endif #if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ @@ -322,11 +322,6 @@ int board_early_init_f(void) ret = psu_init(); #endif -#if defined(CONFIG_WDT) && !defined(CONFIG_SPL_BUILD) - /* bss is not cleared at time when watchdog_reset() is called */ - watchdog_dev = NULL; -#endif - return ret; } |