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 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 D7E7AC43217 for ; Thu, 20 Oct 2022 12:29:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A932984EC6; Thu, 20 Oct 2022 14:29:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="kA8NchSq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F0F5A84F94; Thu, 20 Oct 2022 14:29:35 +0200 (CEST) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D4B5784D72 for ; Thu, 20 Oct 2022 14:29:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x533.google.com with SMTP id u21so29645700edi.9 for ; Thu, 20 Oct 2022 05:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=FR0qBsFbMUl4lkMzoGCItMdXh9zUhyAm//v+1bLDSjA=; b=kA8NchSqrjZiNnmYLKlEBRbpzaYcrf2MXPAozNP1wMPPcWNc1t03vpJ+aIGJ/EA80s CjeLBVsnWhzkEPEEAanfxrL+DgskbX9ZpGPOIqDj4fFyjaSUZcevMwMQHEw/Ql9TwNJ5 381j0+0I80lZ4kRVeC5i4gU2syv88wtrlQANXWNzFiriAeeQxGLcVjLqowvFdFVABTdm bynMmteTycAXhBRIfdunSJjao6fLqgHXsuP/EUX2xuPgJHCGP1y/JrQX8pltumz0KSA9 RRaW5taaBClGBzoM3LwP9hC6fmG3ybO2COYmVeJxeYTG8VAKBHyjUMjAeEbGcWPBWAXi lgbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FR0qBsFbMUl4lkMzoGCItMdXh9zUhyAm//v+1bLDSjA=; b=GlhncGZyvlwF5goQfrBwNn2KloEdGCmzHFYcvaWc8sojQsNmjhy9m6SsRd5Shc9LgO a3nGcmdyNSgqjWq4lomWHOq+Bbg8nvxCJsieeSdPVxHZ6f0zZ1r2MbhNe60Iyw7rnDii OB3tmS6g6hKdelfJpbQA4CMjl4REt0EtFE/L3SgxrLK1COW4u6ESiqUYSdFHHyXA/On6 eESy5l77oW0epbO3l+saljJCdJfdeSlQuBNLuOjlcVRAH0z+1Uuw4XGq8SY63qammmDm jWu6yUl7Nb2jdxouW/9SZGiN4NF0iNoMCyNmWT8WaDvfKt6vE/1akyxYlmWumjWFD7EX hglQ== X-Gm-Message-State: ACrzQf0PtLUumaCrVfB4h7K04p1neTIv4wFccbLlppH4sbKDRz+4iXWw TD7zCLeIcWeuwmoDheNd4ml+Fw== X-Google-Smtp-Source: AMsMyM5PAF6RhN2Am4yYy6kXeqIgGRLmNxDnz4cDuc2JlpQUeTY78ncgICjLEB1fDv8Kvu8YW1hU4A== X-Received: by 2002:a05:6402:5114:b0:45d:b850:a4e2 with SMTP id m20-20020a056402511400b0045db850a4e2mr11720992edd.316.1666268972390; Thu, 20 Oct 2022 05:29:32 -0700 (PDT) Received: from hera (ppp046103015185.access.hol.gr. [46.103.15.185]) by smtp.gmail.com with ESMTPSA id p22-20020aa7cc96000000b00458898fe90asm12018906edt.5.2022.10.20.05.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 05:29:31 -0700 (PDT) Date: Thu, 20 Oct 2022 15:29:29 +0300 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , Takahiro Akashi , Patrick Delaunay , Patrice Chotard , Simon Glass , Bin Meng , Tom Rini , Etienne Carriere , Michal Simek , Jassi Brar Subject: Re: [PATCH v14 09/15] FWU: Add boot time checks as highlighted by the FWU specification Message-ID: References: <20221018114337.439816-1-sughosh.ganu@linaro.org> <20221018114337.439816-10-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 Hi Sughosh, > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static int fwu_trial_state_check(void) > > > +{ > > > + int ret; > > > + struct udevice *dev; > > > + efi_status_t status; > > > + efi_uintn_t var_size; > > > + u16 trial_state_ctr; > > > + struct fwu_mdata mdata = { 0 }; > > > + > > > + ret = fwu_get_dev_mdata(&dev, &mdata); > > > + if (ret) > > > + return ret; > > > + > > > + trial_state = in_trial_state(&mdata); > > > + if (trial_state) { > > > + var_size = (efi_uintn_t)sizeof(trial_state_ctr); > > > + log_info("System booting in Trial State\n"); > > > + status = efi_get_variable_int(u"TrialStateCtr", > > > + &efi_global_variable_guid, > > > + NULL, > > > + &var_size, &trial_state_ctr, > > > + NULL); > > > + if (status != EFI_SUCCESS) { > > > + log_err("Unable to read TrialStateCtr variable\n"); > > > + ret = -1; > > > + goto out; > > > + } > > > + > > > + ++trial_state_ctr; > > > + if (trial_state_ctr > CONFIG_FWU_TRIAL_STATE_CNT) { > > > + log_info("Trial State count exceeded. Revert back to previous_active_index\n"); > > > + ret = fwu_revert_boot_index(); > > > + if (ret) { > > > + log_err("Unable to revert active_index\n"); > > > + goto out; > > > + } > > > + > > > + /* Delete the TrialStateCtr variable */ > > > + ret = trial_counter_update(NULL); > > > + if (ret) { > > > + log_err("Unable to delete TrialStateCtr variable\n"); > > > + goto out; > > > + } > > > > This is a bit confusing for me. If the trial_state_ctr we need to goto out > > anyway right? So why don't we explicitly add a goto out at the end and get > > rid of the else that's following ? > > Actually, we don't need the goto statement above, as well as the one > used below, in the else part. I can get rid of it. Personally I feel > that this provides more clarity as to how the code flow is, but I can > get rid of it if you so prefer. Thanks. > > -sughosh My previous reply wasn't that clear let me try again. Indeed the goto's aren't needed and that's the first confusing thing. On top of that the fwu_trial_state_check() is a bit misleading as well, since it does a lot more than checking. So that functions does - check the trial state counter - remove it if not on trial state - bump the counter - if the counter exceeds a threshold try to delete it Also due to the fact that this runs from the event loop, the return codes are a bit confusing However this is only called from a fwu_boottime_checks() so we can break it up in smaller pieces that would be easier to read. In fwu_trial_state_check() you only need the metadata to check whether you are in trial state or not. So I would suggest 1. Create a trial_counter_read() which only reads the EFI variable 2. move the metadata code in fwu_boottime_checks()a instead of fwu_trial_state_check() 3. rename fwu_trial_state_check() -> fwu_try_update_cnt() static u8 trial_state; -> s/trial_state/in_trial/ static int fwu_boottime_checks(void *ctx, struct event *event) { ..... ret = fwu_get_dev_mdata(&dev, &mdata); if (ret) return ret;(NULL); in_trial = in_trial_state(&mdata) + 1; cnt = trial_counter_read(); if (in_trial && cnt < CONFIG_FWU_TRIAL_STATE_CNT) ret = fwu_try_update_cnt() if (fail) trial_counter_update else trial_counter_update(NULL); There will be an extra GetVariable call since we unconditionally read the counter now, but we can add if (in_trial), although it doesn't matter that much. Can you give it a shot and see if that works for you? Thanks /Ilias > > > > > > + } else { > > > + ret = trial_counter_update(&trial_state_ctr); > > > + if (ret) { > > > + log_err("Unable to increment TrialStateCtr variable\n"); > > > + goto out; > > > + } > > > + } > > > + } else { > > > + /* Delete the variable */ > > > + ret = trial_counter_update(NULL); > > > + if (ret) { > > > + log_err("Unable to delete TrialStateCtr variable\n"); > > > + } > > > + } > > > + > > > +out: > > > + return ret; > > > +} > > > + > > > static int fwu_get_image_type_id(u8 *image_index, efi_guid_t *image_type_id) > > > { > > > u8 index; > > > @@ -494,3 +607,69 @@ __weak int fwu_plat_get_update_index(uint *update_idx) > > > > > > return ret; > > > } > > > + > > > +/** > > > + * fwu_update_checks_pass() - Check if FWU update can be done > > > + * > > > + * Check if the FWU update can be executed. The updates are > > > + * allowed only when the platform is not in Trial State and > > > + * the boot time checks have passed > > > + * > > > + * Return: 1 if OK, 0 on error > > > + * > > > + */ > > > +u8 fwu_update_checks_pass(void) > > > +{ > > > + return !trial_state && boottime_check; > > > +} > > > + > > > +static int fwu_boottime_checks(void *ctx, struct event *event) > > > +{ > > > + int ret; > > > + u32 boot_idx, active_idx; > > > + > > > + ret = fwu_check_mdata_validity(); > > > + if (ret) > > > + return 0; > > > + > > > + /* > > > + * Get the Boot Index, i.e. the bank from > > > + * which the platform has booted. This value > > > + * gets passed from the ealier stage bootloader > > > + * which booted u-boot, e.g. tf-a. If the > > > + * boot index is not the same as the > > > + * active_index read from the FWU metadata, > > > + * update the active_index. > > > + */ > > > + fwu_plat_get_bootidx(&boot_idx); > > > + if (boot_idx >= CONFIG_FWU_NUM_BANKS) { > > > + log_err("Received incorrect value of boot_index\n"); > > > + return 0; > > > + } > > > + > > > + ret = fwu_get_active_index(&active_idx); > > > + if (ret) { > > > + log_err("Unable to read active_index\n"); > > > + return 0; > > > + } > > > + > > > + if (boot_idx != active_idx) { > > > + log_info("Boot idx %u is not matching active idx %u, changing active_idx\n", > > > + boot_idx, active_idx); > > > + ret = fwu_set_active_index(boot_idx); > > > + if (!ret) > > > + boottime_check = 1; > > > + > > > + return 0; > > > + } > > > + > > > + if (efi_init_obj_list() != EFI_SUCCESS) > > > + return 0; > > > + > > > + ret = fwu_trial_state_check(); > > > + if (!ret) > > > + boottime_check = 1; > > > + > > > + return 0; > > > +} > > > +EVENT_SPY(EVT_MAIN_LOOP, fwu_boottime_checks); > > > -- > > > 2.34.1 > > > > > > > Thanks > > /Ilias