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 A466AC0015E for ; Sat, 29 Jul 2023 15:10:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C18E86826; Sat, 29 Jul 2023 17:10:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (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=1690643428; bh=USNe5YunPwzDPxoXhrKH7wqrzSJq9/gBQslsH9n12e8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VoYVGTgg4YP6Lo3hAoZ0qVM1QzeO6j0UVB5cHJYePBIqx/G/gQC1/c6i9MYSCdgpF Z7TzKgKU8Db3I30Q4QMb6VxqV0GyJ/F/Wa4y3c5z77gZMpP8tE5+Pd/lx8+rPzhddK /UeKBTiXidBVx1wO2lGCNAbAAX/XpIJoj6ScMShatsoC6zYEi18mB4/0Zin9Yw6Z7E Od26VTW+pFqacM98af6A4DkGbHPMgZDbMsABm8WJRBbbyfJIJOQKUzN4acCmqPbAXl oSNLXDEYMf7JTQZ3h4tfPNALaFjpNIe8BejIe1cWY4YZrSk6IF0uzHeYDx5pqLS5t4 in8Or1wGzCPTw== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id B7579866BD; Sat, 29 Jul 2023 17:10:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1690643421; bh=USNe5YunPwzDPxoXhrKH7wqrzSJq9/gBQslsH9n12e8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kbPvJ6qOorYtzKTXQZJJH8kbwvTfu4zxG5BvssqsE9KY8AVNtBPt3/4prNMMXiNxm XivuoIYvCorNoI1XgSVcpgVvF1kHEEU82Fct4nMGt7VpsbizsA6wBR/jKjQ2uFMMjp K16DGxg/5Z6MiXsfP8OWqcXRTcC2leJYJiDw89mOV/emO7rLVVox6X8DlH3sPhQYYY /tEgu4I2enE1pDj1HjGMKVhPys8N7v2bnXr2dVokyPGniZ8YDJW4M4GEdjJNfxvVN0 TlPGPo6rLwMI5qY23/TvKM2/an2jjaqTmuYNNjx88VagHfoUPl1wSZbHtt4JDikEej ZgZfE4Tk27oRQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: Fedor Ross , Marek Vasut , Fabio Estevam , Peng Fan , Stefano Babic Subject: [PATCH 2/3] ARM: imx: Use correct U-Boot offset in case of secondary boot from eMMC Date: Sat, 29 Jul 2023 17:09:45 +0200 Message-Id: <20230729150946.214878-2-marex@denx.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230729150946.214878-1-marex@denx.de> References: <20230729150946.214878-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fedor Ross In case of a secondary image boot from the user area of an eMMC device, the correct offset must be calculated. The offset is fused in the fuse IMG_CNTN_SET1_OFFSET of the i.MX8M Nano and Plus. The calculation of the offset is described in the reference manual (IMX8MNRM Rev. 2, 07/2022 and IMX8MPRM Rev. 1, 06/2021): The fuse IMG_CNTN_SET1_OFFSET (0x490[22:19]) is defined as follows: * Secondary boot is disabled if fuse value is bigger than 10, n = fuse value bigger than 10. * n == 0: Offset = 4MB * n == 2: Offset = 1MB * Others & n <= 10 : Offset = 1MB*2^n Signed-off-by: Fedor Ross Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Peng Fan Cc: Stefano Babic --- arch/arm/mach-imx/imx8m/soc.c | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index b8d7a050dc9..2234ef947a1 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -28,8 +28,10 @@ #include #include #include +#include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -726,6 +728,43 @@ int spl_mmc_emmc_boot_partition(struct mmc *mmc) } #endif +#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) +#define IMG_CNTN_SET1_OFFSET GENMASK(22, 19) +unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, + unsigned long raw_sect) +{ + u32 val, offset; + + if (fuse_read(2, 1, &val)) { + debug("Error reading fuse!\n"); + return raw_sect; + } + + val = FIELD_GET(IMG_CNTN_SET1_OFFSET, val); + if (val > 10) { + debug("Secondary image boot disabled!\n"); + return raw_sect; + } + + if (val == 0) + offset = SZ_4M; + else if (val == 1) + offset = SZ_2M; + else if (val == 2) + offset = SZ_1M; + else /* flash.bin offset = 1 MiB * 2^n */ + offset = SZ_1M << val; + + offset /= 512; + offset -= CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET; + + if (imx8m_detect_secondary_image_boot()) + raw_sect += offset; + + return raw_sect; +} +#endif + bool is_usb_boot(void) { return get_boot_device() == USB_BOOT; -- 2.40.1