From patchwork Wed Jul 17 08:25:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1133192 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VTnMVLzk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45pVv41Vcwz9sLt for ; Wed, 17 Jul 2019 18:34:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D8EAAC21DB3; Wed, 17 Jul 2019 08:32:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F03D6C21E12; Wed, 17 Jul 2019 08:26:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 11E69C21E90; Wed, 17 Jul 2019 08:25:58 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id 7864BC21E1E for ; Wed, 17 Jul 2019 08:25:52 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id p184so10462058pfp.7 for ; Wed, 17 Jul 2019 01:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKAdDJjZIA4r1+W+q1JMm7DGz9VgTsSeaJ9GmzeYCDQ=; b=VTnMVLzkYu+SvXzi8ltvw8PC4iVgu8RqJ3L7jD+8YC+4BcPiCcLzqbNHpTq7ACvOiW miQLiTNITyyFJODEITqJpEThF5aPMFqshU5Tbfgk52I1FQOIEEUVvOaoMdKU8f3JXDRt jAU/rIHI/tUfKvSsACuDTqU4Ryw1xeYfa65NSEdyEZrcTEYzr5zOixFo3mwXe6cwTtyI 4+zuY41lXzwADGKo3mmxeujbez0+ssMcvz+WJ7OXcYHw5pIr9ZDPoJkeQXTNDiu9b4QV tWQwEcX5uSX1smci/TWGW8tQdBiz4hy3FHI9WivPTBhHhb2qnFdewN+NYAzaDu3FkjKa NJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SKAdDJjZIA4r1+W+q1JMm7DGz9VgTsSeaJ9GmzeYCDQ=; b=RKrM7RuYeJ9hxz1H1SPr5nsUvNc/MMEsr9zaQUDTP/CWPWfXicazIcQ0KJSAs0yxT7 0sOqo6jWbWnRaqKrCnMGEkCXNaCUiE0/mbTSSLlv4bzHdgB8UM+HRdbRiR69KtbUENYG 3VdrRlJ9Jsw11lFLGyTg4Aq5pQBnESoT6zyrbJzUhiB0lD7tawxYh+UXnL5FSyV64jAq z5J+qxBPlmnW2eXKFw3nXyOhZQyPxOww1QcUKOchr4EmjgeQE5XPKXMumxX//1jpdENI wE2UpPx+t+hotfbW2VQ4Yf+2i0UAY6yuFcyU9JxUWQjFoZThzjeAGURNxLMJVHRaHo3v Rg9Q== X-Gm-Message-State: APjAAAUDOABM5PLNsCF8MvPV1A0U0IUJsryX2WzGrLI+4DQnlS3AV0+/ q9qjGAzqX+Daqz8NElMsjm464w== X-Google-Smtp-Source: APXvYqynh72njpgxBTVI6tgbsTpekl9BtPGXCH7YWGESxn5W+xTDRLujzYSZ8KAZ7N22reiSiysLLg== X-Received: by 2002:a17:90a:2041:: with SMTP id n59mr40903899pjc.6.1563351951191; Wed, 17 Jul 2019 01:25:51 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id j16sm18045516pjz.31.2019.07.17.01.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jul 2019 01:25:50 -0700 (PDT) From: AKASHI Takahiro To: trini@konsulko.com, xypron.glpk@gmx.de, agraf@csgraf.de, wd@denx.de Date: Wed, 17 Jul 2019 17:25:20 +0900 Message-Id: <20190717082525.891-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190717082525.891-1-takahiro.akashi@linaro.org> References: <20190717082525.891-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC, PATCH v4 11/16] env: save a context immediately if 'autosave' variable is changed X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" By definition, when any variable with VARSTORAGE_NON_VOLATILE_AUTOSAVE is modified with env_save_ext(), the associated context should be written back to storage immediately. Signed-off-by: AKASHI Takahiro --- cmd/nvedit.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index cc80ba712767..9896a4141a2a 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -271,8 +271,27 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag, /* Delete only ? */ if (argc < 3 || argv[2] == NULL) { - int rc = hdelete_r(name, &env_htab, env_flag); - return !rc; + uint32_t flags; + + int rc = hdelete_ext(name, &env_htab, ctx, &flags, env_flag); + if (!rc) { + debug("Failed to delete from hash table\n"); + return 1; + } + + if (env_flags_parse_varstorage_from_binflags(flags) + == env_flags_varstorage_non_volatile_autosave) { + int ret; + + ret = env_save_ext(ctx); + if (ret) { + printf("## Error saving variables, ret = %d\n", + ret); + return 1; + } + } + + return 0; } /* @@ -307,6 +326,17 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag, return 1; } + if (env_flags_parse_varstorage_from_binflags(ep->flags) + == env_flags_varstorage_non_volatile_autosave) { + int ret; + + ret = env_save_ext(ep->context); + if (ret) { + printf("## Error saving variables, ret = %d\n", ret); + return 1; + } + } + return 0; }