From patchwork Tue Jul 4 06:16:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashok Reddy Soma X-Patchwork-Id: 1803022 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=IgfzC/FZ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QwCH35YHxz20b5 for ; Tue, 4 Jul 2023 16:16:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF42E846FB; Tue, 4 Jul 2023 08:16:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.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=amd.com header.i=@amd.com header.b="IgfzC/FZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9398C846B6; Tue, 4 Jul 2023 08:16:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20600.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eae::600]) (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 71EFF846FB for ; Tue, 4 Jul 2023 08:16:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=ashok.reddy.soma@amd.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iplL0IVJJdxuh+Y8l+VcO/FJWc05hZyQJK45WhlYsnZWGTgAiMBw2LeddUNjdXEx1cUZ+LcB2wxJksy2h4r7lzduAWghVlvw44bGrujmehCYIZ8PxT/z+uI5bgeMlwopUrcoXhLhF61EpQgXMc8kmofB3uDQom1/FH+yuiXKrQqQ8GVUWxNLYxkin9EfytN2UnD2sSKWfirOUa3DuanKvkune6kEbxInhToPDH1gblUXQdSzuqTl2uzNSovYh447EhMTlg5CZ1BhE5kovR4juzETSH9GTpRjMoJLQhpDBsK72QqjwSxekwpfPnmqMs18Z8WIRJ2FD4uLTvBXAIu9DQ== 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=2OyMixRD7m+HzQVKcEWG6ap90tBMWe6D8Wk+UF1EvV0=; b=NzSSa8e4eFB46uuYIxiYeppc283ln8OFsjlRaU796eETy5UQRERGdnbO3PN1OLFuJV9ARyWKEQhE9MLxTNbLoWXGqlUWA6pX/i2XNuBG2f4iEQ4gkGCweZEU8es6LAoVwaaoqKK46RrgztMc4vIyIWBFxOtVKtlh70oWi+C2guUa+rQ/W+/O8Dr+HcEt6KT7y+Kf9oB1qkSp7p6O9+XVhJuN3meAdmFLbRhGKSyphhN0wNOoWGGeubkaunWia3XY0mH6+3zUEUg6dkyckne3mGEJ9h2V8obCPHI6diArJgidHoodrjZ8v6VKCSAy5iqZi0iAXEJKdo1vDzdnq4lL+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.denx.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2OyMixRD7m+HzQVKcEWG6ap90tBMWe6D8Wk+UF1EvV0=; b=IgfzC/FZHsKlTBPalAY3jIW5SnkH85JThQ2l9vKWLUs9LMSHLKDdrsaGs4aGQoAwtJNWEXGB902RVSEsbgKKysJoxgrJfpRn5YQrpjk8C/qbT8tJzPhllUtP1PnowH7HoH4qwSXX23TU/aWNYdtealgoV5WEdGbZHKnH88CVcIs= Received: from MW4P220CA0025.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::30) by MN2PR12MB4255.namprd12.prod.outlook.com (2603:10b6:208:198::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.24; Tue, 4 Jul 2023 06:16:21 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::db) by MW4P220CA0025.outlook.office365.com (2603:10b6:303:115::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.31 via Frontend Transport; Tue, 4 Jul 2023 06:16:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6521.44 via Frontend Transport; Tue, 4 Jul 2023 06:16:19 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 4 Jul 2023 01:16:19 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 4 Jul 2023 01:16:18 -0500 Received: from xhdashokred41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Tue, 4 Jul 2023 01:16:16 -0500 From: Ashok Reddy Soma To: CC: , , , , Ashok Reddy Soma Subject: [PATCH] env: Fix default environment saving issue Date: Tue, 4 Jul 2023 00:16:07 -0600 Message-ID: <20230704061607.20798-1-ashok.reddy.soma@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT034:EE_|MN2PR12MB4255:EE_ X-MS-Office365-Filtering-Correlation-Id: 82e3f7cf-d8b2-4077-51dd-08db7c562eec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0G1rsd7TXj0JwbyUz8rspRys9iGDyal4aQKKDKuG+1FwH7LK3VzLsRkHyG8j41wQztfLU5e3zw6DfS4DjwbD1RtmfQUTEF2M4qH0BQdkDnaM4izl/Mt+yHFYpB6DehTYiIB3UM3CS3+K4bi+IHbmaRqSdPTA0xAmLwW0kULfbqsjZl54p+Tuhh+4aMKcO/1I9sNQp8C8iw+aEI686cFSh8HbhcR3O7JORJ9ndQqL8n0XIHra/6qjKtQbdJMvUPXlbwdD+C9784NO53u5R7jvrpgqxe8Z62qDt5ieel+x9Ojc6d8ul+Yrf+EF6YKmHa2HjOOzq8LNmYZwN3Mjf9LiEMuSZ09VATu57eQsKRWhFzdEoOTwt43rYExhx0JEIJy0nECbLbdDIGEdyaTOMcBy4dpHvYLf2zdy4S4gjoAMWaAOTzJJifzNmbnZ0lD623ON2WKVWzQfwFawJVjiSNVJpPNj8Rxn4XGz+9Ux4t3ZPR+K9Izf409pmwh5b7i0vdXLrGRq541arbW7yey2StrUP8fd1i5/h0G+6m+k8WBtvhX4yCpxYZOsLTYgke7dOtJCFM+u6cG86F9r39SrZ43xQ8WHIzQ/n6mqP+FnHbGtje7b0jhxnrPs2ZAd4zlYgyfnoulO3Ubw/QNiLuTi+ldpSdd4HViPUlpVl1jrNUdUKHmfmD+QfRcd7+P60w294dpNoeUZHb7zx73fywmzNt3hJB0c3SYXA/Amcu6Iob6NlNQS6tJvhv+ltetR2PX3BZCnpshTKtzqHiticE1uy3+GHQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(39860400002)(396003)(376002)(451199021)(36840700001)(40470700004)(46966006)(2616005)(82310400005)(336012)(426003)(36860700001)(66899021)(54906003)(47076005)(36756003)(86362001)(8676002)(41300700001)(8936002)(5660300002)(2906002)(103116003)(316002)(70586007)(70206006)(40460700003)(6916009)(81166007)(478600001)(6666004)(40480700001)(82740400003)(26005)(4326008)(356005)(1076003)(186003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2023 06:16:19.7765 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82e3f7cf-d8b2-4077-51dd-08db7c562eec X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4255 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 When CONFIG_SYS_REDUNDAND_ENVIRONMENT is enabled, by default env is getting saved to redundant environment irrespective of primary env is present or not. It means even if primary and redundant environment are not present, by default, env is getting stored to redundant environment. Even if primary env is present, it is choosing to store in redudndant env. Ideally it should look for primary env and choose to store in primary env if it is present. If both primary and redundant env are not present then it should save in to primary env area. Fix the issue by making env_valid = ENV_INVALID when both the environments are not present. Signed-off-by: Ashok Reddy Soma Reviewed-by: Simon Glass --- env/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/env/common.c b/env/common.c index 8beb8e6aa4..0ecdb248a0 100644 --- a/env/common.c +++ b/env/common.c @@ -353,6 +353,7 @@ int env_check_redund(const char *buf1, int buf1_read_fail, tmp_env2->crc; if (!crc1_ok && !crc2_ok) { + gd->env_valid = ENV_INVALID; return -ENOMSG; /* needed for env_load() */ } else if (crc1_ok && !crc2_ok) { gd->env_valid = ENV_VALID;