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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CDECC433F5 for ; Thu, 18 Nov 2021 14:01:25 +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 865B3610CA for ; Thu, 18 Nov 2021 14:01:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 865B3610CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com 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 E80F682F50; Thu, 18 Nov 2021 15:01:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="f1kqnWM2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 18EE882F8B; Thu, 18 Nov 2021 15:01:20 +0100 (CET) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F20C3811DE for ; Thu, 18 Nov 2021 15:01:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michael@amarulasolutions.com Received: by mail-ed1-x535.google.com with SMTP id x15so27521165edv.1 for ; Thu, 18 Nov 2021 06:01:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z1rrOGK55cpoJNNzMvUybruu+xjbl/E+n7Uq+UmypC8=; b=f1kqnWM2y5BJhpYcRYPa6VnVtKUzdoRa4wAN3G+jinozOk+10Z2tTjQUnlVUdl2s+f ilsCoR6c2V6q5gMe18No0pEwBmVke1jDCZkRLmej0N6zcCp69NNpR5Dc2ki+qkdFlEjk Clj6up3YpsQB3QloNmvMVk0Jaon5CsZYe2M1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z1rrOGK55cpoJNNzMvUybruu+xjbl/E+n7Uq+UmypC8=; b=M40/Yms6fYc8gIi1Ba6WIuiWSwiSxk/n+4V41sEa4BDi5G18jzjXehswp8XdzbkBvi plu1I0yrmJhfRC/91cuAoB8e1dJsFjwWSBMtixjpdNOUswklOp+JEHjDiED6glgbuJH1 y6ml8MJ2lwqWTeyftwCtnvZEhREJ54LFiewqdC4qgXBes0z0USp7+39EqUuAI3ODGQ9P Yc+K78nWjzpdADVfTXVMrXw+VuAf/y1TK0+rmC5Wm2i8cKKkRVR/rQU1K5R1CcxEsQq/ ZK5vDhYGDsXPyrJoCnzWe/kuREfbXb1nkKhIAt/G6V90H1sZ1CAYIkhBZi+GN0bkAUWu 9fjw== X-Gm-Message-State: AOAM5315lf6W1ahsZOD+xflzYoeZ8glhOUSEN/MdD6YzthqXSW+YoYjA tizI3BW9owyBpTuAVv3mFANHKQ== X-Google-Smtp-Source: ABdhPJwb2KdUpeDRpjctYbSURZvWqcORRW3wr8GTdJDDNBrGWL/nkwXxkyoUeMBj3myOuE8RlYicqw== X-Received: by 2002:a17:907:2d12:: with SMTP id gs18mr34064036ejc.126.1637244075158; Thu, 18 Nov 2021 06:01:15 -0800 (PST) Received: from panicking.amarulasolutions.com ([62.18.234.25]) by smtp.gmail.com with ESMTPSA id oz13sm1390477ejc.65.2021.11.18.06.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 06:01:14 -0800 (PST) From: Michael Trimarchi To: Ye Li , Stefano Babic , Fabio Estevam Cc: u-boot@lists.denx.de, Ariel D'Alessandro , linux-amarula@amarulasolutions.com, Anthony Brandon Subject: [PATCH V2] cmd_nandbcb: Support secondary boot address of imx8mn Date: Thu, 18 Nov 2021 15:01:12 +0100 Message-Id: <20211118140112.326532-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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 Add support of secondary boot address for imx8mn. The secondary boot address is hardcoded in the fuse. The value is calculated from there according to the following description: 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 • For FlexSPI boot, the valid values are: 0, 1, 2, 3, 4, 5, 6, and 7. Signed-off-by: Michael Trimarchi --- Changes V1->V2: - adjust commit message - drop and extra blank line --- arch/arm/mach-imx/cmd_nandbcb.c | 40 +++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 09622c13c9..bd14b8583a 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -132,6 +132,7 @@ static struct platform_config imx8q_plat_config = { /* boot search related variables and definitions */ static int g_boot_search_count = 4; +static int g_boot_secondary_offset; static int g_boot_search_stride; static int g_pages_per_stride; @@ -275,9 +276,9 @@ static int nandbcb_set_boot_config(int argc, char * const argv[], boot_stream2_address = ((maxsize - boot_stream1_address) / 2 + boot_stream1_address); - if (boot_cfg->secondary_boot_stream_off_in_MB) + if (g_boot_secondary_offset) boot_stream2_address = - (loff_t)boot_cfg->secondary_boot_stream_off_in_MB * 1024 * 1024; + (loff_t)g_boot_secondary_offset * 1024 * 1024; max_boot_stream_size = boot_stream2_address - boot_stream1_address; @@ -1269,6 +1270,36 @@ static bool check_fingerprint(void *data, int fingerprint) return (*(int *)(data + off) == fingerprint); } +static int fuse_secondary_boot(u32 bank, u32 word, u32 mask, u32 off) +{ + int err; + u32 val; + int ret; + + err = fuse_read(bank, word, &val); + if (err) + return 0; + + val = (val & mask) >> off; + + if (val > 10) + return 0; + + switch (val) { + case 0: + ret = 4; + break; + case 1: + ret = 1; + break; + default: + ret = 2 << val; + break; + } + + return ret; +}; + static int fuse_to_search_count(u32 bank, u32 word, u32 mask, u32 off) { int err; @@ -1506,6 +1537,11 @@ static int do_nandbcb(struct cmd_tbl *cmdtp, int flag, int argc, g_boot_search_count); } + if ((plat_config.misc_flags) & FIRMWARE_SECONDARY_FIXED_ADDR) { + if (is_imx8mn()) + g_boot_secondary_offset = fuse_secondary_boot(2, 1, 0xff0000, 16); + } + cmd = argv[1]; --argc; ++argv; -- 2.25.1