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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 40F39C433F5 for ; Mon, 16 May 2022 22:22:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5301B83AE7; Tue, 17 May 2022 00:22:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0C0CC84191; Tue, 17 May 2022 00:22:10 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (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 0DFF880563 for ; Tue, 17 May 2022 00:22:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from localhost.localdomain ([81.221.85.15]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LvUd3-1nhTkm3L2h-010cDR; Tue, 17 May 2022 00:21:56 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Marek Vasut , Peng Fan , Marcel Ziswiler , Fabio Estevam , Stefano Babic , Tom Rini Subject: [PATCH v1] ARM: imx8mm: verdin-imx8mm: fix board hang in spl Date: Tue, 17 May 2022 00:21:45 +0200 Message-Id: <20220516222145.959359-1-marcel@ziswiler.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:TT0VtULeY2InlW8lFqvt/IcIumjrtey4XTssYxtGKDZjbPC5pFj fBq0DCL2CIoeDCzfi91MrABaaaSKRcv6ezyjz96xJbxMQvr/eP5WabPSNr1yzrlvmcOMPat Ge66UKFEkuKr5mKzIintykndQRh/n4G4U1xh9pN1Fwgm4Y88BKkfXOMOvP0T8F+5uJIvMd9 70PAobcfRAnw/aCDTstFw== X-UI-Out-Filterresults: notjunk:1;V03:K0:RJYtvoTenaE=:tpT2MmoOTSIUW4JhyO3OcQ HXB4eh6ZwCWyhT1sYfM4/W1c7OGRZ6Pa363eKG/HFdvulSFueZxueplfgy1CIQctVM8JTKPPV +sPZd5HmxOcFlfvNwd8Pq8nmrlH8HPTJt4urGma79rK6wXfCWbo9ZMgzrWZhX6FfMWaOVx/TE g2sWEyuEZScUYaiG+8Q3ZHA1gzfnWRsj3m+dle2g34/tQKBtJIXEUOUW1zXNM2DkR6KZiEmB9 E9i1a6UWU4GTqTP3l10WFUm/SA5giDoj+yPPCHpZSH4PBcxjPieWpCP7HxUYQ0m0gPaLNAVp0 Z4lH8AFa9ooij5eV4n7i7b2NyFtroixKhUW390XalymrNjZuy3ri9DPI5PXnRa8uNMLap3Svt iCReJDCi96dS4XDm1C5gS0s5SxSYKLvCSdgLpxW4LlxyDbwm4N7S6H9QvIfdqxQPvHbTLAx+/ j+3Gn06Z0pGEwJphJ0Ft58qzjdhiTUK+ZDH7TgiS8jcfZcO+OIi7APlcrUUaN78+wQ0EIuwBM PKaOTaiBoNkKlCxL2z6bG2MnaN73rAH4L3J6iGiGubHm8SQ12X6wp+xh6an6omlK0Klmw+8bR yZCfegI52Y1OnlnhMoXEL3T9P8GVbNn75mzB1hpk4lJosq/n9qSvPR1zo3nV7vvPXwiRYcL2B ZRDfm1JwQxaXDR+tNbHGRhAe25WrLMZRoLLCqzqYQ2UrmZe/+oSEsuI5LQD/42x5804U= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Move the preloader_console_init() call after spl_early_init() to avoid board hang in SPL. While at it remove explicit in-code console/debug UART pinmuxing (uart1 and its pinmuxing are already marked as u-boot,dm-spl via device tree). Fixes: 4551e1898769 ("configs: verdin-imx8mm: verdin-imx8mp: enable dm serial") Signed-off-by: Marcel Ziswiler --- I only very recently this weekend learned that verdin-imx8mm has such hang early in SPL issue due to it missing to move the preloader_console_init() call similar as to what Peng did in [1]. Unfortunately, this likely breaks Peng's [V2,00/14] imx8m: convert to DM_SERIAL series of late [2] and would need applying before ASAP. Sorry about that. [1] https://patchwork.ozlabs.org/project/uboot/patch/20220415043538.27868-3-peng.fan@oss.nxp.com/ [2] https://patchwork.ozlabs.org/project/uboot/cover/20220505074341.24086-1-peng.fan@oss.nxp.com/ board/toradex/verdin-imx8mm/spl.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c index 1f3f38351ef..f0361f93ea9 100644 --- a/board/toradex/verdin-imx8mm/spl.c +++ b/board/toradex/verdin-imx8mm/spl.c @@ -74,15 +74,8 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -/* Verdin UART_3, Console/Debug UART */ -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_SAI2_RXFS_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -96,8 +89,6 @@ __weak void board_early_init(void) imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); - - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); } int power_init_board(void) @@ -143,8 +134,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -162,6 +151,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); power_init_board(); -- 2.34.1