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 138F7C636CD for ; Tue, 31 Jan 2023 06:42:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D1DB085824; Tue, 31 Jan 2023 07:42:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.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=nxp.com header.i=@nxp.com header.b="d6YH3M0B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BEB2085836; Tue, 31 Jan 2023 07:42:20 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2050.outbound.protection.outlook.com [40.107.21.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 776928580B for ; Tue, 31 Jan 2023 07:42:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SutFZntzxQB+M/gG4/6zNYQN+z2U2jbI8uVPAAf0z1yNOW7H8MiUMCVSavpm9zlqZ0m4FQNBqxVXAi/8obBlwkObIdU2eivxZ6mtbS8juOBW+5+IAa/vvKXGaTCoBDZeICOl41OaMIVxd4XVZ2c2t4JucHXmbZuF7m0kWO8tBzYabeIk63PvRwSDwpybBwCURpxYQ+GRDBE3iAzxZ8C7AeUlb3zq8Pia/EUGPaEzT6pRucngbUnEakNR3Sv7gclbhCVGiLKRAr5ZNNYuD1GsW6Lb3PTHUfD0JWciXpTRAiY7UGt8na9tg7XeX9WAXvU4I2AWeCD3HxoUUvDXsuRzew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8KLOQ15ONMerPpUrRf3k/fBQoYUdy2sDzFCUqCiZ/FA=; b=GYzZz3cYm8S3BgeFdxVyDoety8IOnjWMHcmZCUiRXkehE5DHh4ZJzrFF2n3nrAe2vU68+KFTW5pTpZsHitNRvibVe4JngFj/f42W1b0OM88lnWcOzixGZOtu1beuvt1sZ7fCn6tygaOyHMYmCQHxb7ekVXh1jOBvw0R6wKVAwmBZiBVZFFmkPewNviykaLL23ZTi4bm3YfZ7rqPqIVKhzYr6QuZHgWJhw5WpYJCO0eoMlw8c3EqOSA0zm74LE0wJ9ss49rke/C/dzFiK2cugfwrwzvIzgZ+MUA09Ld5Wsypa/ISp8CQEMISXBDQo2NPG4tOdNYetkHiUJs/82cqBbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8KLOQ15ONMerPpUrRf3k/fBQoYUdy2sDzFCUqCiZ/FA=; b=d6YH3M0BNYIMAu3ZvAAOhTOQe3UsmcT7+aEWf6w+IrVMGsowejGO1YCsPm7kl62H+iBzyNILPD0u4HtJff3ofZhawlreCc/yFV2z9/aY5z0aRKOTQFrNOhDk1SGTkNOS/bto8yq+nimL6OKcm29H/2Vaari4+CVjC/VgSN50u/E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) by AS8PR04MB8053.eurprd04.prod.outlook.com (2603:10a6:20b:2ad::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Tue, 31 Jan 2023 06:42:16 +0000 Received: from AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6]) by AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6%5]) with mapi id 15.20.6043.038; Tue, 31 Jan 2023 06:42:16 +0000 From: Ye Li To: patrick.delaunay@foss.st.com, u-boot@lists.denx.de Cc: patrice.chotard@foss.st.com, peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH] env: mmc: Fix offset issue for env save Date: Tue, 31 Jan 2023 14:41:58 +0800 Message-Id: <1675147318-75117-1-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0040.apcprd01.prod.exchangelabs.com (2603:1096:4:193::14) To AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB5302:EE_|AS8PR04MB8053:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d4d9d01-06b7-458c-1c50-08db03564b01 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bs6GUtbLOW86Hj2b0Qntz8xgNZR9Xr+WTd+86ZdQ1tZ6lk211+iRwgKOiwfo1b1uBjBjDvOqA75aS+Q/zqvdwGYOPKfzdLlq1OQIAIoYEc8INKR4ysGzAVuZ2hYz/coADj1uIfDxrWBPV+AEavcwru2Zv7RvysMnxDhtH3wOLfze4Ce31RgbQYdLcXBMIga4G8UfGYyg4t41Ldbco6h6VOFTVBVHvR+YrNO2SrfoMarY0t+VYTIflo6v0riE/PWc7OoVS+VAmSaAVQS/haaNkxa8uZfQ26KgoA0YLGLmx/4p8eRBpwC5N76N90LlX8+aIicM1HFJbWCw+hPETxMgDJ/dgfo0DBRhd3243/eHpDweiMLA8u85dcP0zZLay7rw+U2ObU1+I8aQaSQ8r7+2U++jlm52iliF1qPx8fd+tTjzEGK4Pti4gvhPpiDE/aPCqos0LRLI9xYm6+ttpBpA2B7rcHjwF+DkU+cyD5F92KoLkfj7PDnBGaYGdef6VXIcALPZDqrCkMIAqAAoHuj7NsmflpRHMkzAFoeizWWa91m3xBTw5inUJKQKrBlfJOY4dBk9mUCg5ukBHP0F1nDKbU7QIyrFVpONUxeAks60Zb0I4Nvc31ZQIumG4Aj8wQsTd8NiW0TRlMmesTBUewAJK4TgiTuhr7pxuyfySIssZONMPNUJyKjCWo7SXQOED24R7mR4G5OhXG3iqJ2Y9Vw5mA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5302.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(376002)(39860400002)(396003)(366004)(346002)(136003)(451199018)(2906002)(66556008)(4744005)(83380400001)(5660300002)(8936002)(41300700001)(44832011)(6512007)(26005)(6666004)(6506007)(186003)(4326008)(86362001)(38100700002)(66476007)(2616005)(38350700002)(8676002)(316002)(478600001)(66946007)(36756003)(52116002)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?foN3+Pbn3chZpTDtyKY8GBKgiTSCPBjbfOklyBXObW7Vb09HXhd22NFlKpCX?= =?us-ascii?Q?fp5eD4/mIWcY6iK/2gOg27o676Mtfm9EGpkesCSbS2KVmT9uY4WL+Dn0alsK?= =?us-ascii?Q?ZpHYks0UsMS9/UB2eQbdsrIZTxKZlZCjSO4ILuIWJIB/XInqJdwkZLOOxmlw?= =?us-ascii?Q?K2Qc5xtf76xoqS4isCZm9CVu4woc+l1tetFCAmIgAf0v0McumhJz3hmLo3Qa?= =?us-ascii?Q?25qGHCL4YBKgK7CeOsLykDv/TCfSceda041UTfzG73i/aiJ0om6McFWLt04y?= =?us-ascii?Q?jJBcnqEiBJnNe1CezYXCqgktRwDASm0WLD0PBgdiz2t7Now1ZU7QvRbGb6so?= =?us-ascii?Q?Eql2Wv8tdwVuff7aHK3K1qxC9bZQQVcyGyqgZtBzNE1dvifUWJueZUPT/Ce1?= =?us-ascii?Q?eM6hzXxph/KpPdai5kWDc/UwDlYX4Ac8nCSeswTEBFUaUpoNxr2oML4UZifc?= =?us-ascii?Q?fsbV8AKwijj3amkFnHnJ2RIt+heuQ6cSYiGnSEqiJt0Qj1TSGv4ibdS51G6Q?= =?us-ascii?Q?ruSnhJqZwMkPCPFIzuWiXduqDIndsZa1BUw80JambLFBVeF8JveCwTNALcT4?= =?us-ascii?Q?WSUiwo34Rum7WQVi/C3hxavFKgCqgfgNOP2P7BjoK6SxNmFBYx04qcrQFFtZ?= =?us-ascii?Q?SEELF77j9C9tdVnun2nQNJUOcLXlhrbex5i4innW/gwfUmLuVAAGRV1O9otw?= =?us-ascii?Q?Exls6LX+Gy/rh6xGXdVg9qbWHNTJ5yCjENbZOqWxMqkR4mC03iUK/E6D083c?= =?us-ascii?Q?K/qlbWmo3i+K9w7FaXJBvfYeOpTs0UCe6E1QRVI1nlZQeLm5rlucJgkz6A07?= =?us-ascii?Q?CLqn75j4hOfIbKUQb3H3nuYpRe4JgUviT19vOqzDiww/piwJUNeNkl0CiEHL?= =?us-ascii?Q?I5kd54R1oM06qh7aTWCjjmgEYsEAd8g21QQB3wCnGlgNWfKexMPR3qSdiFHD?= =?us-ascii?Q?raWqyN6j/GEFkPVpHVszBiP2eBmsPOUw1V4+Bv3eKJB/jL8Q415+VghbjaAx?= =?us-ascii?Q?I6e+GX7HxvvHX/jApU18dmKpcnMcCx5EQnNl4QflSJ/UJV3JnrQscCM2aXwS?= =?us-ascii?Q?0PXPS4+YSlnu7JZuV9KW7j0Uhfagfynvk5memfhCiEfXTAtJw6nTZPHugAej?= =?us-ascii?Q?rMvI1iBXYFanZk6AOJsgqXaDF2GlNudBICWoXPCvuCJ2u6ARAyCGl8YyDONz?= =?us-ascii?Q?ZOHLLLCBfbN43G4+ppcF5olrG/15F8ZNBomZ4Whk1sywyWQl+DSO1YoKKILm?= =?us-ascii?Q?T8h+cIpM4FcL01KG31WT0EwmJIPWQ1WIG2GUZ/BW2DzYZWZNR0n3RGBNgmuF?= =?us-ascii?Q?aWrQo9wKxpj5hcG/UVicK7I8r8uvh9vajSrNHZAmVTqoBdcAm7p3WfWcXL8T?= =?us-ascii?Q?E1IxEy/J/NJqpu9uGeNa3G1xIjpsZqAUDWOg4lgPtNlBiE8JTN7xtqXpbjQ7?= =?us-ascii?Q?KrIc4W3wuqP0l1S6xHNpqtadan/Y0DN7eeUjBnjGAWeljZGx10Q7YsIcqDFO?= =?us-ascii?Q?ZzvhwcxJC2gh7gIT6lHSOU63aeCPcLsfovKsDNrGTSDebfDzzmCvYT6l4yox?= =?us-ascii?Q?/yX6MTkf3C03QzcC0nNZqW4WEHhYXY4T8pZBIksi?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4d9d01-06b7-458c-1c50-08db03564b01 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5302.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 06:42:16.7241 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m1AYCTr1ikPIH+ApW4JEI5hayuZe7uo08RQeDyjG8ig33Qfr5slJ1qGYX3JCQbFd X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8053 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.6 at phobos.denx.de X-Virus-Status: Clean Fix the issue in commit 46c9016 (env: mcc: Drop unnecessary #ifdefs) If CONFIG_SYS_REDUNDAND_ENVIRONMENT is not defined, the offset value becomes undetermined, so write env to unexpected offset. Signed-off-by: Ye Li --- env/mmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/env/mmc.c b/env/mmc.c index 8576141..5b01f65 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -273,11 +273,11 @@ static int env_mmc_save(void) if (ret) goto fini; } + } - if (mmc_get_env_addr(mmc, copy, &offset)) { - ret = 1; - goto fini; - } + if (mmc_get_env_addr(mmc, copy, &offset)) { + ret = 1; + goto fini; } printf("Writing to %sMMC(%d)... ", copy ? "redundant " : "", dev); -- 2.7.4