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 C3AB1C433EF for ; Mon, 20 Dec 2021 06:09:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B636182FA3; Mon, 20 Dec 2021 07:09:44 +0100 (CET) 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="lKMcl++C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3723683051; Mon, 20 Dec 2021 07:09:43 +0100 (CET) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (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 829A180FD5 for ; Mon, 20 Dec 2021 07:09:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pj1-x1035.google.com with SMTP id rj2-20020a17090b3e8200b001b1944bad25so3472394pjb.5 for ; Sun, 19 Dec 2021 22:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=p22sdo6hQFBa3BDxJqI4eE1lD73sEhc2Xs/8noL+EmE=; b=lKMcl++CWKE241wER9JIj1NiHtTaMXJSIcUh61B19fV3VV0D2l90vUk04EqP9FPQSw qJNyZZzeOGCpg0kJoxBgu00kE4rMij0pAdH8hq0uP51bYp8nNCZAH+zUNmF2wWVYhGSH 8/5BWavOKAEyTI9QdQI/I6rfWwZnUoNqm2uqE8d9C+BOn1AHpIqrq7iUtA/+4ynewPX3 vMVq1g2zqD+Jv3tf9LhL1qmlvj3LOjhMyJGO0uIf0vwJxqkMibixDVxg3UMLzhqeNOpZ jNR1vKDpU+ePdyHDPEv0Fia8mVwntwShTjwG2UOEbJozWvgSQQA9jh/uY0b5IdZQSl8L Wr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=p22sdo6hQFBa3BDxJqI4eE1lD73sEhc2Xs/8noL+EmE=; b=YSVwC3PlJfFP0YORpS0U5Kab7iusskTSbJs5WoPVhuT0HH88VPTTGh3Sm5B3mtyku3 quTJpT/Zr7hdwl+UHiU5YLKb9JTWV/k51JyZQmwgRD9rJgLiAayvB3ZVUw9yYcLwjomX Sf/HSpu0wzxgmqB++37vnN08EE57P77fkeUkA8SrreTyjGShUrftlkwRat0Pwky5bbRl hjZx92IWcq1hcgyGmHMxajnugEnWRX7WoV9iDbY4lL0S5qIUOf6X6oA4xboYIS1ZbPxe G534L9qCaVM4EDLNNyEUa6pYLwnyQunm1pXmsgmF9mVrg03Ej/bS+wfNFf0v6XCxS153 +9CQ== X-Gm-Message-State: AOAM531VLkfr/yJ9U69dY5eMs+5HDZjaKCEQMjNLgSrevUGk15CY7duJ tV7SiYQGHoycrX7dlbot4a5Rxw== X-Google-Smtp-Source: ABdhPJy9XmtJsrozm7hcEU6YyRRuwM9LswSS+OIMepnLaVnwJsRxDBMIfrGQberfas46nmDYduX/dg== X-Received: by 2002:a17:90b:38c9:: with SMTP id nn9mr16312883pjb.153.1639980577643; Sun, 19 Dec 2021 22:09:37 -0800 (PST) Received: from laputa ([2400:4050:c3e1:100:89bf:be4:468d:12c2]) by smtp.gmail.com with ESMTPSA id i185sm5984648pfe.199.2021.12.19.22.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 22:09:36 -0800 (PST) Date: Mon, 20 Dec 2021 15:09:31 +0900 From: AKASHI Takahiro To: Sughosh Ganu Cc: u-boot@lists.denx.de, Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Jason Liu , Tom Rini , Etienne Carriere Subject: Re: [RFC PATCH v2 6/8] FWU: Add boot time checks as highlighted by the FWU specification Message-ID: <20211220060931.GB31993@laputa> Mail-Followup-To: AKASHI Takahiro , Sughosh Ganu , u-boot@lists.denx.de, Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Jason Liu , Tom Rini , Etienne Carriere References: <20211219070605.14894-1-sughosh.ganu@linaro.org> <20211219070605.14894-7-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211219070605.14894-7-sughosh.ganu@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Sughosh, On Sun, Dec 19, 2021 at 12:36:03PM +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. > > Add these checks in the board initialisation sequence, invoked after > relocation. > > Signed-off-by: Sughosh Ganu > --- > Changes since V1: > * Define a funtion fwu_update_checks_pass to do the checks > before initiating the update > * Log the status of the boottime checks using boottime_check > variable and allow system to boot instead of hanging the > platform(fwu_boottime_checks) > > common/board_r.c | 6 ++ > include/fwu.h | 3 + > lib/fwu_updates/fwu.c | 163 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 172 insertions(+) > create mode 100644 lib/fwu_updates/fwu.c > > diff --git a/common/board_r.c b/common/board_r.c > index 31a59c585a..81678870b9 100644 > --- a/common/board_r.c > +++ b/common/board_r.c > @@ -78,6 +78,9 @@ > #ifdef CONFIG_EFI_SETUP_EARLY > #include > #endif > +#ifdef CONFIG_FWU_MULTI_BANK_UPDATE > +#include > +#endif > > DECLARE_GLOBAL_DATA_PTR; > > @@ -805,6 +808,9 @@ static init_fnc_t init_sequence_r[] = { > #endif > #ifdef CONFIG_EFI_SETUP_EARLY > (init_fnc_t)efi_init_obj_list, > +#endif > +#ifdef CONFIG_FWU_MULTI_BANK_UPDATE > + fwu_boottime_checks, > #endif Maybe I don't understand your code well. Why do you want to call fwu_boottime_checks() here? Why not in CONFIG_EFI_CAPSULE_UPDATE_EARLY (i.e. efi_launch_capsules() in main_loop())? -Takahiro Akashi > run_main_loop, > }; > diff --git a/include/fwu.h b/include/fwu.h > index 5ba437798d..2d2e674d6a 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -16,6 +16,9 @@ > EFI_GUID(0x8a7a84a0, 0x8387, 0x40f6, 0xab, 0x41, \ > 0xa8, 0xb9, 0xa5, 0xa6, 0x0d, 0x23) > > +int fwu_boottime_checks(void); > +u8 fwu_update_checks_pass(void); > + > int fwu_get_active_index(u32 *active_idx); > int fwu_update_active_index(u32 active_idx); > int fwu_get_image_alt_num(efi_guid_t image_type_id, u32 update_bank, > diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c > new file mode 100644 > index 0000000000..e964f9b0b1 > --- /dev/null > +++ b/lib/fwu_updates/fwu.c > @@ -0,0 +1,163 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (c) 2021, Linaro Limited > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +static u8 trial_state = 0; > +static u8 boottime_check = 0; > + > +static int fwu_trial_state_check(void) > +{ > + int ret, i; > + efi_status_t status; > + efi_uintn_t var_size; > + u16 trial_state_ctr; > + u32 nimages, active_bank, var_attributes, active_idx; > + struct fwu_mdata *mdata = NULL; > + struct fwu_image_entry *img_entry; > + struct fwu_image_bank_info *img_bank_info; > + > + ret = fwu_get_mdata(&mdata); > + if (ret < 0) > + return ret; > + > + ret = 0; > + nimages = CONFIG_FWU_NUM_IMAGES_PER_BANK; > + active_bank = mdata->active_index; > + img_entry = &mdata->img_entry[0]; > + for (i = 0; i < nimages; i++) { > + img_bank_info = &img_entry[i].img_bank_info[active_bank]; > + if (!img_bank_info->accepted) { > + trial_state = 1; > + break; > + } > + } > + > + 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 | > + EFI_VARIABLE_RUNTIME_ACCESS; > + status = efi_get_variable_int(L"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"); > + active_idx = mdata->active_index; > + ret = fwu_revert_boot_index(); > + if (ret < 0) { > + log_err("Unable to revert active_index\n"); > + goto out; > + } > + > + trial_state_ctr = 0; > + status = efi_set_variable_int(L"TrialStateCtr", > + &efi_global_variable_guid, > + var_attributes, > + 0, > + &trial_state_ctr, false); > + if (status != EFI_SUCCESS) { > + log_err("Unable to clear TrialStateCtr variable\n"); > + ret = -1; > + goto out; > + } > + } else { > + status = efi_set_variable_int(L"TrialStateCtr", > + &efi_global_variable_guid, > + var_attributes, > + var_size, > + &trial_state_ctr, false); > + if (status != EFI_SUCCESS) { > + log_err("Unable to increment TrialStateCtr variable\n"); > + ret = -1; > + goto out; > + } else { > + ret = 0; > + } > + } > + } > + > +out: > + free(mdata); > + return ret; > +} > + > +u8 fwu_update_checks_pass(void) > +{ > + return !trial_state && boottime_check; > +} > + > +int fwu_boottime_checks(void) > +{ > + int ret; > + u32 boot_idx, active_idx; > + > + ret = fwu_mdata_check(); > + if (ret < 0) { > + boottime_check = 0; > + 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"); > + boottime_check = 0; > + return 0; > + } > + > + ret = fwu_get_active_index(&active_idx); > + if (ret < 0) { > + log_err("Unable to read active_index\n"); > + boottime_check = 0; > + 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_update_active_index(boot_idx); > + if (ret < 0) > + boottime_check = 0; > + else > + boottime_check = 1; > + > + return 0; > + } > + > + ret = fwu_trial_state_check(); > + if (ret < 0) > + boottime_check = 0; > + else > + boottime_check = 1; > + > + return 0; > +} > -- > 2.17.1 >