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 8054DC432BE for ; Wed, 1 Sep 2021 09:14:10 +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 E537E61057 for ; Wed, 1 Sep 2021 09:14:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E537E61057 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 AF80B8349F; Wed, 1 Sep 2021 11:14:07 +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=1630487648; bh=adKc+sE2cMcdi2W3jpNS7yzojCkXTiWBRrhg0MzwJ1k=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KSWXGIcFM10U1ZYbl8/jol/1VBPgcu1964lAqzLft6zztPwan9aFQINH6p70ugHLq ypazgBYpB1gHUs3Bmdq7Gn1pL9ULn5B19Cw/3GKvVa51okTATwrrTCG8lpojyKzv0D Y0jbK0NZrMIDP1wwEp+SUt1a0rG+fQLquy2QjU9XYQEIIQfBzsaHdBAL3ir4166mf5 KJ+JgP7KKhFv7V3kWQ+FtfMonsqogfjeMK+g6jXCyIWaX4dq+tu8PLeAK1OHG9xD6U z+/bV3AOPuI3DS508zAPKhxmI/WSa9El7Jk/6izCfMOoa9F2D8wMLeZ+WKdPoxF7hq Gqs+ycRuo5Afw== Received: by phobos.denx.de (Postfix, from userid 109) id 29A898349F; Wed, 1 Sep 2021 11:14:04 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (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 C781F834A6 for ; Wed, 1 Sep 2021 11:13:54 +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 smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (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-107.mailbox.org (Postfix) with ESMTPS id 4GzyzQ47CbzQkJ7; Wed, 1 Sep 2021 11:13:54 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu v2 3/4] 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: <20210816131940.24206-1-marek.behun@nic.cz> <20210816131940.24206-4-marek.behun@nic.cz> From: Stefan Roese Message-ID: Date: Wed, 1 Sep 2021 11:13:50 +0200 MIME-Version: 1.0 In-Reply-To: <20210816131940.24206-4-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D467118BC 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 On 16.08.21 15:19, 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 Applied to u-boot-marvell/master Thanks, Stefan > --- > 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(); > > 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