From patchwork Tue Jan 16 09:16:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 124632 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp947174lje; Tue, 16 Jan 2018 01:18:00 -0800 (PST) X-Google-Smtp-Source: ACJfBouBeBc5MAWWaayOIAH7l5C+vmaEYmsRGn6696Y9WSWeRaCwr0FGRur1teHA0Hv7VysrBYMD X-Received: by 10.80.150.35 with SMTP id y32mr52351451eda.175.1516094280096; Tue, 16 Jan 2018 01:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516094280; cv=none; d=google.com; s=arc-20160816; b=L1pdkNYL+FqhMmZGr59PPJjI9bWqAA3Q8QmehMuJSzxyvzbU4tZDCObeXMWOj+dyb+ WTd7MTfQDkW7oougGfK+UZnektLXnGP5wHhVzINAYSksDB17ufsRjKUg1tsK302gIKx6 ZcFjytwk1eXKIMGqlfs87Tjg+Pb89Go4SKasnq300TLdL3J4YHmh5zjr083ebYkCRlwJ HGZrYQHENezqn4BflVBVoat2dvyV1kKoqg795dVyxrDEu/I5WvXs97Geo4CzQ+yQOrC4 a5NnCxrym36fAemQs81sf6BuPJ38H3JHAIGQheFCY0yjOkUGFQU8ZNrcLisJZrJ4UrWL Ed1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=yCFbq+T9n4PvzXu1vTuQvcedNi25C+jAIcdyewCZxzk=; b=FCdOnYVmbf5yI52n8bGA3223G6QbDtN/6IRe0i5++nUgH7yNR0Xv3SND1AMz6Y/tXS w6pXYfEv6t6ZGF8XjoVBL+/edoJU44DYncL9m4cRTwgbYKcr7CHhr2ibnpjDgK1bpMRV jrmGfC6+HFpIbNF1401JxIMw9Rzhxn9yElw+0oDv3CgoU459ZqX+QQ9msEUtGblkJKKU Bws2IQttAPcKSHooSp309cjhM+T6Uc2InC9dG/+zZ8aetdIvLpzjvmtPgqqbLPSunQZT O9tC/35Pt5Rsi8B0D0JDA1cEihCLlv12HTBweZQ1+RgpwVDlDiBs6cDU8opxkOLIvkw9 8x2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id o26si399846edf.195.2018.01.16.01.17.59; Tue, 16 Jan 2018 01:18:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id AAFE6C21E41; Tue, 16 Jan 2018 09:17:21 +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=none 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 76A85C21E10; Tue, 16 Jan 2018 09:16:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B6633C21C4A; Tue, 16 Jan 2018 09:16:54 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 628F2C21CA6 for ; Tue, 16 Jan 2018 09:16:54 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 38C1D208B7; Tue, 16 Jan 2018 10:16:53 +0100 (CET) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0CF6720725; Tue, 16 Jan 2018 10:16:53 +0100 (CET) From: Maxime Ripard To: Tom Rini Date: Tue, 16 Jan 2018 10:16:46 +0100 Message-Id: X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: Andre Przywara , agraf@suse.de, u-boot@lists.denx.de, Maxime Ripard , Jagan Teki Subject: [U-Boot] [PATCH v2 10/15] env: Initialise all the environments 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Since we want to have multiple environments, we will need to initialise all the environments since we don't know at init time what drivers might fail when calling load. Let's init all of them, and only consider for further operations the ones that have not reported any errors at init time. Signed-off-by: Maxime Ripard Reviewed-by: Simon Glass --- env/env.c | 36 +++++++++++++++++++++++++------- include/asm-generic/global_data.h | 1 +- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/env/env.c b/env/env.c index 333fd71aad53..75da2b921804 100644 --- a/env/env.c +++ b/env/env.c @@ -60,6 +60,23 @@ static enum env_location env_locations[] = { ENVL_UNKNOWN, }; +static bool env_has_inited(enum env_location location) +{ + return gd->env_has_init & BIT(location); +} + +static void env_set_inited(enum env_location location) +{ + /* + * We're using a 32-bits bitmask stored in gd (env_has_init) + * using the above enum value as the bit index. We need to + * make sure that we're not overflowing it. + */ + BUILD_BUG_ON(ARRAY_SIZE(env_locations) > BITS_PER_LONG); + + gd->env_has_init |= BIT(location); +} + static enum env_location env_load_location; static enum env_location env_get_location(enum env_operation op, int prio) @@ -126,6 +143,9 @@ int env_get_char(int index) if (!drv->get_char) continue; + if (!env_has_inited(drv->location)) + continue; + ret = drv->get_char(index); if (!ret) return 0; @@ -148,6 +168,9 @@ int env_load(void) if (!drv->load) continue; + if (!env_has_inited(drv->location)) + continue; + printf("Loading Environment from %s... ", drv->name); ret = drv->load(); if (ret) @@ -173,6 +196,9 @@ int env_save(void) if (!drv->save) continue; + if (!env_has_inited(drv->location)) + continue; + printf("Saving Environment to %s... ", drv->name); ret = drv->save(); if (ret) @@ -194,14 +220,10 @@ int env_init(void) int prio; for (prio = 0; (drv = env_driver_lookup(ENVOP_INIT, prio)); prio++) { - if (!drv->init) - continue; - - ret = drv->init(); - if (!ret) - return 0; + if (!drv->init || !(ret = drv->init())) + env_set_inited(drv->location); - debug("%s: Environment %s failed to init (err=%d)\n", __func__, + debug("%s: Environment %s init done (ret=%d)\n", __func__, drv->name, ret); } diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 73e036d6fd4a..fd8cd45b050e 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -50,6 +50,7 @@ typedef struct global_data { #endif unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Environment valid? enum env_valid */ + unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */ unsigned long ram_top; /* Top address of RAM used by U-Boot */ unsigned long relocaddr; /* Start address of U-Boot in RAM */