All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Marek Behún" <marek.behun@nic.cz>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, pali@kernel.org,
	"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH u-boot-mvebu v2 4/4] arm: mvebu: turris_omnia: disable MCU watchdog in board_late_init()
Date: Mon, 16 Aug 2021 15:19:40 +0200	[thread overview]
Message-ID: <20210816131940.24206-5-marek.behun@nic.cz> (raw)
In-Reply-To: <20210816131940.24206-1-marek.behun@nic.cz>

Disable MCU watchdog in board_late_init() instead of board_init(), so
that it is disabled after U-Boot enables SOC watchdog instead of before.
This way there is no window when the board is vulnerable.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 board/CZ.NIC/turris_omnia/turris_omnia.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b0391c973d..bac78af04e 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -434,6 +434,11 @@ int board_init(void)
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
 
+	return 0;
+}
+
+int board_late_init(void)
+{
 	/*
 	 * If not booting from UART, MCU watchdog was not disabled in SPL,
 	 * disable it now.
@@ -441,11 +446,6 @@ int board_init(void)
 	if (get_boot_device() != BOOT_DEVICE_UART)
 		disable_mcu_watchdog();
 
-	return 0;
-}
-
-int board_late_init(void)
-{
 	set_regdomain();
 	handle_reset_button();
 	pci_init();
-- 
2.31.1


  parent reply	other threads:[~2021-08-16 13:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 13:19 [PATCH u-boot-mvebu v2 0/4] turris_omnia: Disable MCU watchdog in SPL when booting over UART Marek Behún
2021-08-16 13:19 ` [PATCH u-boot-mvebu v2 1/4] arm: mvebu: Move get_boot_device() to cpu.c and make visible Marek Behún
2021-08-16 17:51   ` Pali Rohár
2021-08-17  7:46   ` Stefan Roese
2021-09-01  9:13   ` Stefan Roese
2021-08-16 13:19 ` [PATCH u-boot-mvebu v2 2/4] arm: mvebu: turris_omnia: don't guard by CONFIG_SPL_BUILD macro Marek Behún
2021-08-16 17:55   ` Pali Rohár
2021-08-17  7:46   ` Stefan Roese
2021-09-01  9:13   ` Stefan Roese
2021-08-16 13:19 ` [PATCH u-boot-mvebu v2 3/4] arm: mvebu: turris_omnia: disable MCU watchdog in SPL when booting over UART Marek Behún
2021-08-16 17:56   ` Pali Rohár
2021-08-17  7:46   ` Stefan Roese
2021-09-01  9:13   ` Stefan Roese
2021-08-16 13:19 ` Marek Behún [this message]
2021-08-16 17:56   ` [PATCH u-boot-mvebu v2 4/4] arm: mvebu: turris_omnia: disable MCU watchdog in board_late_init() Pali Rohár
2021-08-17  7:46   ` Stefan Roese
2021-09-01  9:14   ` Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210816131940.24206-5-marek.behun@nic.cz \
    --to=marek.behun@nic.cz \
    --cc=pali@kernel.org \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.