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 9E106C433FE for ; Fri, 21 Oct 2022 15:08:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CA9A84FDF; Fri, 21 Oct 2022 17:08:39 +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="IddvP2Ns"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFDBD84FD8; Fri, 21 Oct 2022 17:08:37 +0200 (CEST) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 AA9A284FEA for ; Fri, 21 Oct 2022 17:08:33 +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-x52a.google.com with SMTP id w8so4683574edc.1 for ; Fri, 21 Oct 2022 08:08:33 -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=AFRZUvGzwHCGmCP7XvsEb3fRzCHibynJoRPP4wclNTU=; b=IddvP2Ns4nazW1wCIODjObPgVvw4lLPnz+XPAoX04B8/UpovwoE3tZNB1/TbheazR5 sBmuptywrh5zxHKNp9YdbTRE0M57CJdOzkAnEhB24F6eWlv7eBUS+0sGC2Dk5rg5OWks +OfU60F3oRypRKnbPLJ2zCijFcx+5kxwuT9OyqI4UgZkaLw2IeIzrsyXSTn848ULRx2+ Dm0Rj1md/SVBKqildEsgDr7QbAB78KDwpXsOliMqU5fZiQ9Zgqyc3AS0GYbd6MLe+ecq eycuh47ZZ+sWQBut+LrWzYDjr/2xfOJlkTaSWoEnsbwK+p+6StoEqHPX8pBn72r28xwk gkRQ== 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=AFRZUvGzwHCGmCP7XvsEb3fRzCHibynJoRPP4wclNTU=; b=NNe5Nq7Rghl3RyBmbwxuxuH3nSa6nn/eFyoYWOFKj+HueMYKS2iAqYW17bsCiXDOnZ t/rvfFiOHF7OSVWD3C3ezM3mZn0YfVF5KdF3VELIzQRbzbKW2H/vTmvfbW0gLxEai4mG O1t1FUUr9xPDwCNevKaQH4CxqkJ5L1P02060RtoaquE1hvE6fABXgP7agOa8zy/Hfelc iabuD2nmSGczdlAh9XqG8yJJlu1s8I6xVIdvoePWpHNSUyEePZPpiFoc6/dgRlf5U6kn 7OglCVUcuO6KryL6xhoH1HeY8xdHI7ufHIGyCUQXyw865pba5GgffQADg6uRQoqFvaWG Lx6Q== X-Gm-Message-State: ACrzQf0oA1Xcb+Zd9PfM08YVDS4FcMkRVa5CUiQvhs9CA3cMqgXStBd1 vDAgBiXgJAC1y0US5Z+4nO515g== X-Google-Smtp-Source: AMsMyM5k7FTJEd55MjP7YEBsXxO+/ot2RjhAerMNlOJ1IVoYKNPXZrEszyLQaT0cWKDfjmHuQYmjtg== X-Received: by 2002:a17:907:a04a:b0:78d:cef2:b219 with SMTP id gz10-20020a170907a04a00b0078dcef2b219mr15722689ejc.735.1666364912255; Fri, 21 Oct 2022 08:08:32 -0700 (PDT) Received: from hera (ppp046103015185.access.hol.gr. [46.103.15.185]) by smtp.gmail.com with ESMTPSA id nb36-20020a1709071ca400b0077f4f63a6f4sm11786618ejc.112.2022.10.21.08.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 08:08:31 -0700 (PDT) Date: Fri, 21 Oct 2022 18:08:29 +0300 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , Takahiro Akashi , Patrick Delaunay , Patrice Chotard , Simon Glass , Tom Rini , Etienne Carriere , Jassi Brar Subject: Re: [PATCH v15 09/15] FWU: Add boot time checks as highlighted by the FWU specification Message-ID: References: <20221021124608.681387-1-sughosh.ganu@linaro.org> <20221021124608.681387-10-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221021124608.681387-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 Hi Sughosh, > > #include > #include > @@ -44,6 +53,96 @@ static int fwu_get_dev_mdata(struct udevice **dev, struct fwu_mdata *mdata) > return ret; > } > > +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 && > + status != EFI_SUCCESS)) || > + (!delete && status != EFI_SUCCESS)) > + return -1; > + > + return 0; > +} > + > +static int trial_counter_read(u16 *trial_state_ctr) > +{ > + efi_status_t status; > + efi_uintn_t var_size; > + > + var_size = (efi_uintn_t)sizeof(trial_state_ctr); > + 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"); > + return -1; > + } > + > + return 0; > +} > + > +static int fwu_trial_count_update(void) > +{ > + int ret; > + u16 trial_state_ctr; > + > + ret = trial_counter_read(&trial_state_ctr); > + if (ret) { > + log_debug("Unable to read trial_state_ctr\n"); > + 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"); > + ret = 1; > + } else { > + ret = trial_counter_update(&trial_state_ctr); > + if (ret) > + log_err("Unable to increment TrialStateCtr variable\n"); > + } > + > +out: > + return ret; > +} > + > +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) { > + log_info("System booting in Trial State\n"); > + return 1; > + } > + } > + > + return 0; > +} > + > static int fwu_get_image_type_id(u8 *image_index, efi_guid_t *image_type_id) > { > u8 index; > @@ -499,3 +598,94 @@ __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 if checks do not pass > + * > + */ > +u8 fwu_update_checks_pass(void) > +{ > + return !in_trial && boottime_check; > +} > + > +/** > + * fwu_empty_capsule_checks_pass() - Check if empty capsule can be processed > + * > + * Check if the empty capsule can be processed to either accept or revert > + * an earlier executed update. The empty capsules need to be processed > + * only when the platform is in Trial State and the boot time checks have > + * passed > + * > + * Return: 1 if OK, 0 if not to be allowed > + * > + */ > +u8 fwu_empty_capsule_checks_pass(void) > +{ > + return in_trial && boottime_check; > +} > + > +static int fwu_boottime_checks(void *ctx, struct event *event) > +{ > + int ret; > + u32 boot_idx, active_idx; > + struct udevice *dev; > + struct fwu_mdata mdata = { 0 }; > + > + 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_get_dev_mdata(&dev, &mdata); > + if (ret) > + return ret; > + > + in_trial = in_trial_state(&mdata); > + if (!in_trial || (ret = fwu_trial_count_update()) > 0) Why do we need to assign ret here? if (!in_trial || !fwu_trial_count_update()) should be enough > + ret = trial_counter_update(NULL); > + > + if (!ret) > + boottime_check = 1; > + > + return 0; > +} > +EVENT_SPY(EVT_MAIN_LOOP, fwu_boottime_checks); > -- > 2.34.1 > With that Acked-by: Ilias Apalodimas