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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BC60C433F5 for ; Sun, 17 Oct 2021 17:23:47 +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 17B28604DA for ; Sun, 17 Oct 2021 17:23:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 17B28604DA 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 6248A8316B; Sun, 17 Oct 2021 19:23:43 +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=1634491423; bh=SUlBz3BFPnCxlOperKd0ZOflEIA7mKa4VxtwdzbizpE=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=xTzOx3vXt+DTSIiWw38FIudYOC9/DVVG+le5M/ePuEVKNnQIYRiO42Myiw4K4svFH d5T62qD467kSJrpi6fuP3hEG9q6nW3d3+rzKl93dspDkXIpuwr5nC6hrESp4sobZi2 h8j2B2aS7iEXFB0X8EnzgKgXy8aufMDV7Y0HwJ/+3gwAktyR6lJlIiQYJ2kHFG0EqP d4wW4zrh+mIes6AVP2oFFVFIDMvf9pxdiFgCC6ChtSv5M2TIfv1KF1b3T4GD+RkQx0 zIUAHSslN1tzzHkfBWQCZUr5XEu0wJ1lHnEy9ug/6ysA+KnIScGdU4udQGdLi1P2W/ h84K7vP+YaMzw== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (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 B926A8314C; Sun, 17 Oct 2021 19:23:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1634491421; bh=SUlBz3BFPnCxlOperKd0ZOflEIA7mKa4VxtwdzbizpE=; h=From:To:Cc:Subject:Date:From; b=z1VRn5zHiLMV1s8ToldNgkrL9kPcxu6qgKhxyMoJ1AOFhFzvRSCzk30/VuxnaRMG0 yn3W18shmq4oMsyI0TohaiBFBXIsCWHopDXPG85uGB1slfKU9Tm0ZKHVv+2rc5vOLN t8xQLm5m7lkee85rfNn43IvgU33Xe2V7E/G7gtuMf6Tg0eur5/lJewkngu8tranpX9 G+2ladB+Tn2AimDrWP2LClmEvEim2GtxtJf4xBrXLHVAcLXOUWZEZOyynN/iN4rYPX dUVVayHqSw9xbxaZi5p7oZAaQswxUpkgWYq2kvo9cD8S+sjQLPLfp58gNt8Nzfciur V/SIcS7BxEF6A== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Jaehoon Chung , Peng Fan , Stefano Babic Subject: [PATCH v2] env: mmc: Add support for redundant env in both eMMC boot partitions Date: Sun, 17 Oct 2021 19:23:36 +0200 Message-Id: <20211017172336.47710-1-marex@denx.de> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Currently the MMC environment driver supports storing redundant environment only in one eMMC partition at different offsets. This is sub-optimal, since if this one boot partition is erased, both copies of environment are lost. Since the eMMC has two boot partitions, add support for storing one copy of environment in each of the two boot partitions. To enable this functionality, select CONFIG_SYS_REDUNDAND_ENVIRONMENT to indicate redundant environment should be used. Set CONFIG_SYS_MMC_ENV_PART to 1 to indicate environment should be stored in eMMC boot partition. Set CONFIG_ENV_OFFSET equal to CONFIG_ENV_OFFSET_REDUND, and both to the offset from start of eMMC boot partition where the environment should be located. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Jaehoon Chung Cc: Peng Fan Cc: Stefano Babic --- V2: Add documentation of this behavior into Kconfig help text --- env/Kconfig | 5 +++++ env/mmc.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index f75f2b13536..06d72bad1dc 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -200,6 +200,11 @@ config ENV_IS_IN_MMC This value may also be positive or negative; this is handled in the same way as CONFIG_ENV_OFFSET. + In case CONFIG_SYS_MMC_ENV_PART is 1 (i.e. environment in eMMC boot + partition) then setting CONFIG_ENV_OFFSET_REDUND to the same value + as CONFIG_ENV_OFFSET makes use of the second eMMC boot partition for + the redundant environment copy. + This value is also in units of bytes, but must also be aligned to an MMC sector boundary. diff --git a/env/mmc.c b/env/mmc.c index e111d8e5881..465b104559b 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -26,6 +26,18 @@ DECLARE_GLOBAL_DATA_PTR; +/* + * In case the environment is redundant, stored in eMMC hardware boot + * partition and the environment and redundant environment offsets are + * identical, store the environment and redundant environment in both + * eMMC boot partitions, one copy in each. + * */ +#if (defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) && \ + (CONFIG_SYS_MMC_ENV_PART == 1) && \ + (CONFIG_ENV_OFFSET == CONFIG_ENV_OFFSET_REDUND)) +#define ENV_MMC_HWPART_REDUND +#endif + #if CONFIG_IS_ENABLED(OF_CONTROL) static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) { @@ -126,13 +138,11 @@ __weak uint mmc_get_env_part(struct mmc *mmc) static unsigned char env_mmc_orig_hwpart; -static int mmc_set_env_part(struct mmc *mmc) +static int mmc_set_env_part(struct mmc *mmc, uint part) { - uint part = mmc_get_env_part(mmc); int dev = mmc_get_env_dev(); int ret = 0; - env_mmc_orig_hwpart = mmc_get_blk_desc(mmc)->hwpart; ret = blk_select_hwpart_devnum(IF_TYPE_MMC, dev, part); if (ret) puts("MMC partition switch failed\n"); @@ -140,7 +150,7 @@ static int mmc_set_env_part(struct mmc *mmc) return ret; } #else -static inline int mmc_set_env_part(struct mmc *mmc) {return 0; }; +static inline int mmc_set_env_part(struct mmc *mmc, uint part) {return 0; }; #endif static const char *init_mmc_for_env(struct mmc *mmc) @@ -157,7 +167,8 @@ static const char *init_mmc_for_env(struct mmc *mmc) if (mmc_init(mmc)) return "MMC init failed"; #endif - if (mmc_set_env_part(mmc)) + env_mmc_orig_hwpart = mmc_get_blk_desc(mmc)->hwpart; + if (mmc_set_env_part(mmc, mmc_get_env_part(mmc))) return "MMC partition switch failed"; return NULL; @@ -209,6 +220,13 @@ static int env_mmc_save(void) #ifdef CONFIG_ENV_OFFSET_REDUND if (gd->env_valid == ENV_VALID) copy = 1; + +#ifdef ENV_MMC_HWPART_REDUND + ret = mmc_set_env_part(mmc, copy + 1); + if (ret) + goto fini; +#endif + #endif if (mmc_get_env_addr(mmc, copy, &offset)) { @@ -273,6 +291,12 @@ static int env_mmc_erase(void) #ifdef CONFIG_ENV_OFFSET_REDUND copy = 1; +#ifdef ENV_MMC_HWPART_REDUND + ret = mmc_set_env_part(mmc, copy + 1); + if (ret) + goto fini; +#endif + if (mmc_get_env_addr(mmc, copy, &offset)) { ret = CMD_RET_FAILURE; goto fini; @@ -331,7 +355,20 @@ static int env_mmc_load(void) goto fini; } +#ifdef ENV_MMC_HWPART_REDUND + ret = mmc_set_env_part(mmc, 1); + if (ret) + goto fini; +#endif + read1_fail = read_env(mmc, CONFIG_ENV_SIZE, offset1, tmp_env1); + +#ifdef ENV_MMC_HWPART_REDUND + ret = mmc_set_env_part(mmc, 2); + if (ret) + goto fini; +#endif + read2_fail = read_env(mmc, CONFIG_ENV_SIZE, offset2, tmp_env2); ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2, -- 2.33.0