From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F853C4338F for ; Mon, 16 Aug 2021 12:50:28 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD9FE63275 for ; Mon, 16 Aug 2021 12:50:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CD9FE63275 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0AEE282BCE; Mon, 16 Aug 2021 14:50:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1629118226; bh=iL6jrC0mqteI3pj7hjts/n3XaMnnbZU8CTBLlLB7liY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=l9vZWpiW/Iz0aJmflxauZ9hoOuuLkEui5XUR3/mO8XNqn6UEZSbG4lz9TeC7sZGeV O2CRSOGTJJsIbtPasQKAvQ0ZZwy3zd08MITkFKQ4fHgwLQv95OaERXsMk4HO+vETVC G04YUydSjDP8KonUPCDYZE9DSJ0KVypP5xPBHemaKnxF7XyobO6zBNXK5qKI/99m8t sUZr9A+bxVBr+Vh8d+CienJGphU7TW/KDzUpZXnDrlNVXqJB+RD51uFwSz/rG8w2Hx sLjCVypVQf73fL3ct6qknqGhCqUqEn+3geTlPGp6TDXThIB8fd3gMkkMrUFmDqxXu6 exBQtL1E2udfA== Received: by phobos.denx.de (Postfix, from userid 109) id AB6CC82BEC; Mon, 16 Aug 2021 14:50:23 +0200 (CEST) Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [91.198.250.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3903E8200B for ; Mon, 16 Aug 2021 14:50:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4GpDXW0L3mzQkGw; Mon, 16 Aug 2021 14:50:19 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id kZ-rym2-Bq8O; Mon, 16 Aug 2021 14:50:16 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu 3/3] arm: mvebu: turris_omnia: disable MCU watchdog in SPL when booting over UART To: =?UTF-8?Q?Marek_Beh=c3=ban?= Cc: u-boot@lists.denx.de, pali@kernel.org References: <20210816122726.14506-1-marek.behun@nic.cz> <20210816122726.14506-4-marek.behun@nic.cz> From: Stefan Roese Message-ID: <446b9f6d-70d0-04fc-ea4c-edbd876a194e@denx.de> Date: Mon, 16 Aug 2021 14:50:15 +0200 MIME-Version: 1.0 In-Reply-To: <20210816122726.14506-4-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 23EAE1840 X-Rspamd-UID: 661bda X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Hi Marek, On 16.08.21 14:27, Marek Behún wrote: > When booting over UART, sending U-Boot proper may take too much time and > MCU watchdog will reset the board before U-Boot proper is loaded. > > Better disable MCU watchdog in SPL when booting over UART. > > Signed-off-by: Marek Behún > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 17 ++++++++++++++++- > configs/turris_omnia_defconfig | 1 + > 2 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c > index a84a409f43..b0391c973d 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -419,12 +419,27 @@ int board_early_init_f(void) > return 0; > } > > +void spl_board_init(void) > +{ > + /* > + * If booting from UART, disable MCU watchdog in SPL, since uploading > + * U-Boot proper can take too much time and trigger it. > + */ > + if (get_boot_device() == BOOT_DEVICE_UART) > + disable_mcu_watchdog(); > +} > + > int board_init(void) > { > /* address of boot parameters */ > gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; > > - disable_mcu_watchdog(); > + /* > + * If not booting from UART, MCU watchdog was not disabled in SPL, > + * disable it now. > + */ > + if (get_boot_device() != BOOT_DEVICE_UART) > + disable_mcu_watchdog(); Why do you disable the MCU watchdog here in U-Boot proper? Thanks, Stefan > > return 0; > } > diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig > index cd443ceb30..67f8bdadaf 100644 > --- a/configs/turris_omnia_defconfig > +++ b/configs/turris_omnia_defconfig > @@ -33,6 +33,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_MISC_INIT_R=y > +CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_I2C=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de