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 8AC21C433F5 for ; Mon, 3 Oct 2022 09:56:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 409D084D77; Mon, 3 Oct 2022 11:56:18 +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="vCYIEbgj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 410CA84DBB; Mon, 3 Oct 2022 11:56:17 +0200 (CEST) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 9FC7B84D35 for ; Mon, 3 Oct 2022 11:56:13 +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-ej1-x62f.google.com with SMTP id f1so3459814ejw.7 for ; Mon, 03 Oct 2022 02:56:13 -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; bh=EYK/rKi6jzBulfn1k+pGFl0cbD6Gck6PTfof6D0Ijj8=; b=vCYIEbgjQoOzn8rEOZftxUxRR4X4X36a35bW7P9oeEjYtR5slS2lffLnmRPPQ82c96 3in1NjngtD2fK/bnIjcv3gzx63WOBFzp8rRMsfWfzWxEjYju8DsjM4W27eu2M9K1a4PP BgmI0HPvVMM8s1mTee7Mv45jioa0EUcw5eorXSq+Nfcngd3InPtBFESg1w/VY2REYtyW ZqurWApsNtPf1fFMuIctAk7OAYnrejIBdIrY1TFO8icJ2xkY6dc48nDb8iVjY4wvvURf sq9IM9hvCvGnicEXoU5gNXpT4uaWY4S1/44xfsi7VJlxuZ2TwR0JCJD6o8nHTOa+tg6U 1BLg== 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; bh=EYK/rKi6jzBulfn1k+pGFl0cbD6Gck6PTfof6D0Ijj8=; b=c221U2oYQPfbM33uIfWkegL2sVQ3dFN/1TJkL4aYPzrNDZzuXWWFYyXwI5aWkWxQOF OvMjdESQfDEJXa/OGcwLyvjU5mdbtRS+LCuRkEe8SCIvSrtEM0u3Ws0SbKSLr3/nn24y 7//9FNSaeEn9Yj7Ve/cn1qjuNFhsoVpCx6okUh0ReZxjM6OsVhfkzixtO5gVVzQI0Nx1 +Wlo8ACOmS+vkP/BDk/+ccnV3+4Sqpqahujjpxv9CqI1JnDrzw5zBEWOLgJfhFDHd7aT bUDnsDH7gyvZlQc0wN3w/rtteC+aYCDlhhVxozNpX5c38I3VnvJfSKIEC/DQZk4N/O2q Jo8g== X-Gm-Message-State: ACrzQf2mqYCS5Olsrgi62aMYNMcUeA+/8UcWt+PH0K44+7cHH9+/3lBf 7lv81ZyKDkIHiNWteBkMzM3P8g== X-Google-Smtp-Source: AMsMyM6CHWWKMuxorACYaMeALhteHychLOP77TBbccz8tBaVTkEfjZLjLkFSPCF8aiBLVTHnImOaqg== X-Received: by 2002:a17:907:70a:b0:741:78ab:dce5 with SMTP id xb10-20020a170907070a00b0074178abdce5mr14987402ejb.527.1664790973152; Mon, 03 Oct 2022 02:56:13 -0700 (PDT) Received: from hades (ppp046103015185.access.hol.gr. [46.103.15.185]) by smtp.gmail.com with ESMTPSA id ky9-20020a170907778900b0073ddff7e432sm5257828ejc.14.2022.10.03.02.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:56:12 -0700 (PDT) Date: Mon, 3 Oct 2022 12:56:10 +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 v11 09/15] FWU: Add boot time checks as highlighted by the FWU specification Message-ID: References: <20220928092956.2535777-1-sughosh.ganu@linaro.org> <20220928092956.2535777-10-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220928092956.2535777-10-sughosh.ganu@linaro.org> 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 On Wed, Sep 28, 2022 at 02:59:50PM +0530, Sughosh Ganu wrote: > The FWU Multi Bank Update specification requires the Update Agent to > carry out certain checks at the time of platform boot. The Update > Agent is the component which is responsible for updating the firmware > components and maintaining and keeping the metadata in sync. > > The spec requires that the Update Agent perform the following checks > at the time of boot > * Sanity check of both the metadata copies maintained by the platform. > * Get the boot index passed to U-Boot by the prior stage bootloader > and use this value for metadata bookkeeping. > * Check if the system is booting in Trial State. If the system boots > in the Trial State for more than a specified number of boot counts, > change the Active Bank to be booting the platform from. > > Call these checks through the main loop event at the time of platform > boot. > > Signed-off-by: Sughosh Ganu > Reviewed-by: Etienne Carriere > --- > Changes since V10: > * Remove the spurious newline addition in efi_setup.c > * Move the assignment of trial_state outside the if() as suggested by > Jassi > > include/fwu.h | 13 +++ > lib/fwu_updates/fwu.c | 193 +++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 204 insertions(+), 2 deletions(-) > > diff --git a/include/fwu.h b/include/fwu.h > index 71a03cf70b..2effa7da38 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -253,4 +253,17 @@ int fwu_plat_get_update_index(uint *update_idx); > * > */ > void fwu_plat_get_bootidx(uint *boot_idx); > + > +/** > + * 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); > + > #endif /* _FWU_H_ */ > diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c > index 5cf6bec6a0..5cde5514d2 100644 > --- a/lib/fwu_updates/fwu.c > +++ b/lib/fwu_updates/fwu.c > @@ -4,10 +4,19 @@ > */ > > #include > +#include > #include > +#include > +#include > #include > #include > -#include > +#include > + > +#include > +#include > + > +static u8 trial_state; > +static u8 boottime_check; > > #include > #include > @@ -16,8 +25,113 @@ > #define IMAGE_ACCEPT_SET BIT(0) > #define IMAGE_ACCEPT_CLEAR BIT(1) > > -static int fwu_get_dev_mdata(struct udevice **dev, struct fwu_mdata *mdata) > +static int trial_counter_update(u16 *trial_state_ctr) > +{ > + bool delete; > + u32 var_attr; > + efi_status_t status; > + efi_uintn_t var_size; > + > + delete = !trial_state_ctr ? true : false; > + var_size = !trial_state_ctr ? 0 : (efi_uintn_t)sizeof(*trial_state_ctr); > + var_attr = !trial_state_ctr ? 0 : EFI_VARIABLE_NON_VOLATILE | > + EFI_VARIABLE_BOOTSERVICE_ACCESS; > + status = efi_set_variable_int(u"TrialStateCtr", > + &efi_global_variable_guid, > + var_attr, > + var_size, trial_state_ctr, false); > + > + if ((delete && (status != EFI_NOT_FOUND && Is there a legitimate case where we need to delete the variable while it's not there? Wouldn't that be some kind of failure we shouldn't hide? > + status != EFI_SUCCESS)) || > + (!delete && status != EFI_SUCCESS)) > + return -1; > + > + return 0; > +} > + > +static int in_trial_state(struct fwu_mdata *mdata) > +{ > + u32 i, active_bank; > + struct fwu_image_entry *img_entry; > + struct fwu_image_bank_info *img_bank_info; > + > + active_bank = mdata->active_index; > + img_entry = &mdata->img_entry[0]; > + for (i = 0; i < CONFIG_FWU_NUM_IMAGES_PER_BANK; i++) { > + img_bank_info = &img_entry[i].img_bank_info[active_bank]; > + if (!img_bank_info->accepted) { > + return 1; > + } > + } > + > + return 0; > +} > + > +static int fwu_trial_state_check(struct udevice *dev) > +{ > + int ret; > + efi_status_t status; > + efi_uintn_t var_size; > + u16 trial_state_ctr; > + u32 var_attributes; > + struct fwu_mdata mdata = { 0 }; > + > + ret = fwu_get_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"); > + var_attributes = EFI_VARIABLE_NON_VOLATILE | > + EFI_VARIABLE_BOOTSERVICE_ACCESS; > + status = efi_get_variable_int(u"TrialStateCtr", > + &efi_global_variable_guid, > + &var_attributes, > + &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; > + } > + } 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_dev_mdata(struct udevice **dev, struct fwu_mdata *mdata) > { > int ret; > > @@ -27,6 +141,9 @@ static int fwu_get_dev_mdata(struct udevice **dev, struct fwu_mdata *mdata) > return ret; > } > > + if (!mdata) > + return 0; > + Doesn't this belong to the patch that introduced the function? > ret = fwu_get_mdata(*dev, mdata); > if (ret < 0) > log_debug("Unable to get valid FWU metadata\n"); > @@ -388,3 +505,75 @@ __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) I think this should be declared as bool > +{ > + int ret; > + struct udevice *dev; > + u32 boot_idx, active_idx; > + > + ret = fwu_get_dev_mdata(&dev, NULL); > + if (ret) > + return ret; > + > + ret = fwu_mdata_check(dev); > + if (ret) { > + return 0; > + } You don't need {} > + > + /* > + * 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(dev); > + if (!ret) > + boottime_check = 1; > + > + return 0; > +} > +EVENT_SPY(EVT_MAIN_LOOP, fwu_boottime_checks); > -- > 2.34.1 > Cheers /Ilias