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 B68E4EB64D9 for ; Fri, 7 Jul 2023 22:56:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 146798623A; Sat, 8 Jul 2023 00:56:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="bSNbSxfQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D06C86307; Sat, 8 Jul 2023 00:56:30 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 C530085F50 for ; Sat, 8 Jul 2023 00:56:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B38D961AB9; Fri, 7 Jul 2023 22:56:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C972EC433C7; Fri, 7 Jul 2023 22:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688770585; bh=3lspvlrAA5QcFiNheeClR+Hot8xzADH6WsBRmAqDPt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bSNbSxfQhlpSA3G/vTMhqQyW4o9g51y/B7mQ61BwEhbUgSz3dvtZ8+Tta6UXKiBIY 7tec3Xo7n4A8lVRh+7H1Sojc0jGrfG0RGw88GP13lNedstn5YJib/GvLPpzv3vhQfY +8BGyjmPZFmddOUg+0FIvi+LbxfnNN9GF/eHdC1mk3G2q+t70kv2cZGEHJ53JdWdLD maL2rBSSm6IBXcYDSJSfaA0SPkytYSZDdy3rQBc+lVrs2C7TTaCZXxIFlAqQ8pYLtK cSAavBmONYxmjSVoGjtM5KG/C2RUiWTAgyzBns61EQiewbhkG4ouvnU6dGIxMBKDjg 0S8V20XSTSbjA== Received: by pali.im (Postfix) id CCF8388C; Sat, 8 Jul 2023 00:56:21 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Jaehoon Chung , Tom Rini Cc: u-boot@lists.denx.de Subject: [PATCH v3 u-boot] mmc: spl: Make partition choice in default_spl_mmc_emmc_boot_partition() more explicit Date: Sat, 8 Jul 2023 00:54:38 +0200 Message-Id: <20230707225438.32334-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230413211057.10975-2-pali@kernel.org> References: <20230413211057.10975-2-pali@kernel.org> 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.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 To make eMMC partition choosing in default_spl_mmc_emmc_boot_partition() function better understandable, rewrite it via explicit switch-case code pattern. Also indicate an error when eMMC EXT_CSD[179] register is configured by user to value which is not suitable for eMMC booting and SPL do not know how to interpret it. Signed-off-by: Pali Rohár --- Changes in v3: * Instead of showing (verbose) warning, make them as errors and propagate them back to caller. * Add comment with explanation what happened and how to fix possible misconfigured configuration. Changes in v2: * Disable showing warning on sama5d2_xplained due to size restrictions --- This patch depends on another patch: mmc: spl: Add comments for default_spl_mmc_emmc_boot_partition() https://patchwork.ozlabs.org/project/uboot/patch/20230404202805.8523-1-pali@kernel.org/ --- common/spl/spl_mmc.c | 56 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index f7a42a11477d..656363a3b51a 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -408,15 +408,46 @@ int default_spl_mmc_emmc_boot_partition(struct mmc *mmc) * * Note: See difference between EXT_CSD_EXTRACT_PARTITION_ACCESS * and EXT_CSD_EXTRACT_BOOT_PART, specially about User area value. - * - * FIXME: When booting from this eMMC device is explicitly - * disabled then we use User area for booting. This is incorrect. - * Probably we should skip this eMMC device and select the next - * one for booting. Or at least throw warning about this fallback. */ - part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); - if (part == 7) - part = 0; + if (mmc->part_config == MMCPART_NOAVAILABLE) + part = 0; /* If partitions are not supported then we have only User Area partition */ + else { + switch(EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config)) { + case 0: /* Booting from this eMMC device is disabled */ + /* + * This eMMC device has disabled booting. + * This may happen because of misconfiguration of eMMC device or + * because user explicitly wanted to not boot from this eMMC device. + * eMMC boot configuration can be changed by "mmc partconf" command. + */ + part = -ENXIO; /* negative value indicates error */ + /* Note that error message is printed by caller of this function. */ + break; + case 1: /* Boot partition 1 is used for booting */ + part = 1; + break; + case 2: /* Boot partition 2 is used for booting */ + part = 2; + break; + case 7: /* User area is used for booting */ + part = 0; + break; + default: /* Other values are reserved */ + /* + * This eMMC device has configured booting from reserved value. + * This may happen because of misconfiguration of eMMC device or + * because this is newer eMMC device than what U-Boot understand. + * If newer eMMC specification defines meaning for some reserved + * values then switch above should be updated for new cases. + * At this stage we do not know how to interpret this reserved + * value so return error. + * eMMC boot configuration can be changed by "mmc partconf" command. + */ + part = -EINVAL; /* negative value indicates error */ + /* Note that error message is printed by caller of this function. */ + break; + } + } #endif return part; } @@ -471,6 +502,15 @@ int spl_mmc_load(struct spl_image_info *spl_image, switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: part = spl_mmc_emmc_boot_partition(mmc); + if (part < 0) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + if (part == -ENXIO) + puts("spl: mmc booting disabled\n"); + else + puts("spl: mmc misconfigured\n"); +#endif + return part; + } if (CONFIG_IS_ENABLED(MMC_TINY)) err = mmc_switch_part(mmc, part); -- 2.20.1