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 07308ECAAD3 for ; Wed, 7 Sep 2022 05:59:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AF56584A0E; Wed, 7 Sep 2022 07:59:07 +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="VqB3ft7T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 765C284A2F; Wed, 7 Sep 2022 07:59:06 +0200 (CEST) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 CAF0D8498C for ; Wed, 7 Sep 2022 07:59:03 +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-x62d.google.com with SMTP id lz22so7111111ejb.3 for ; Tue, 06 Sep 2022 22:59:03 -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=cUKsaE7poam3nZZ6inQzLTAqCZ9gF/3xFrricivFVUk=; b=VqB3ft7T2GPDkUAzk4VpCMDNT1Cn8mcIvRidnliDaL6KBZ+8FA354ZBZ5h4gH40wcX 9h1crgeQlEzCR9KBiKeOJQiHk2GJiU7uAFrGyzqCAAPZQN/pE7z763iJttUalrVH4k6L oX9rpXBK94GIvlrpElIW8YbfEYLyMSjdcGOzfuemvFl45ckBV6co5QCEP5yTar7znyNV kTSQhf01lob+CLFYfcwXM2hryMyg01OE1vixN3sJwZRlc36MiuIFulIIrxA+sjZdPKLH hAJRwvKQtZHzU/oiJXtfBxNsqpfZGNxrN4RZnTn36UF75tfVHNieYrIKvm5UVLEV0pkE BTmw== 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=cUKsaE7poam3nZZ6inQzLTAqCZ9gF/3xFrricivFVUk=; b=pph3Frs1aurCUL+wQlccyzRh5T23t9i6NCErQUVNcNjvhYT+Lo++Vxnx/iDW4bCn71 QJ8YMuIT5gUxwdLLLoQpyuAe7MCNCP+3XPWAE4EcmUQ1Hdk9VrjN6U4PfVbq9ttNTnVM bq0GQLqODFe8RaQAI0oJ+vhTixLz7WLoO+0o2XfNSiA99Eh3LdMBrgNqSus6uL30BbxT TUqmW+ioQOXdb+u4IBBWpvu1xGjde9aD+FkWzjpZdwniUBW3/m1RvsZhcE6RZgIAm2W3 Edafl1Y0DLoYal+m3q6vTZeP2KHgrdIVjNE76+aOvlGDkHG3Cm9v3sUGMlBSPjXpSg+Z hlug== X-Gm-Message-State: ACgBeo2azv1SCkrYrqnMZ2LWfXbaZTbsfKVArfZqQUY+8gGg1htOiWw+ /Y+IUx4F5IsjZyrSF3kdUz4izA== X-Google-Smtp-Source: AA6agR4H4HtOAI0XOPJbz5+0WpkG+2fjtqxG/6p2AsWZUQUZobOaZB4Ul+BKzqCtGHccX87ocgHUFg== X-Received: by 2002:a17:907:9607:b0:741:7926:a64c with SMTP id gb7-20020a170907960700b007417926a64cmr1201534ejc.718.1662530343339; Tue, 06 Sep 2022 22:59:03 -0700 (PDT) Received: from hera ([46.103.15.185]) by smtp.gmail.com with ESMTPSA id 1-20020a170906328100b0073ddb2eff27sm7686800ejw.167.2022.09.06.22.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 22:59:02 -0700 (PDT) Date: Wed, 7 Sep 2022 08:59:00 +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 v9 06/15] FWU: Add helper functions for accessing FWU metadata Message-ID: References: <20220826095716.1676150-1-sughosh.ganu@linaro.org> <20220826095716.1676150-7-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220826095716.1676150-7-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 Fri, Aug 26, 2022 at 03:27:07PM +0530, Sughosh Ganu wrote: > Add weak functions for getting the update index value and dfu > alternate number needed for FWU Multi Bank update > functionality. > > The current implementation for getting the update index value is for > platforms with 2 banks. If a platform supports more than 2 banks, it > can implement it's own function. The function to get the dfu alternate > number has been added for platforms with GPT partitioned storage > devices. Platforms with other storage partition scheme need to > implement their own function. > > Signed-off-by: Sughosh Ganu > Reviewed-by: Patrick Delaunay > --- > Changes since V8: > * Add comments for API functions > * Update the logic to get the update index as suggested by Jassi > > include/fwu.h | 29 ++++++++++ > lib/fwu_updates/fwu.c | 27 +++++++++ > lib/fwu_updates/fwu_gpt.c | 115 ++++++++++++++++++++++++++++++++++++++ > 3 files changed, 171 insertions(+) > create mode 100644 lib/fwu_updates/fwu_gpt.c > > diff --git a/include/fwu.h b/include/fwu.h > index ecabf11210..7ebd3a7115 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -211,4 +211,33 @@ int fwu_accept_image(efi_guid_t *img_type_id, u32 bank); > */ > int fwu_clear_accept_image(efi_guid_t *img_type_id, u32 bank); > > +/** > + * fwu_plat_get_alt_num() - Get the DFU Alt Num for the image from the platform > + * @dev: FWU device > + * @image_guid: Image GUID for which DFU alt number needs to be retrieved > + * @alt_num: Pointer to the alt_num > + * > + * Get the DFU alt number from the platform for the image specified by the > + * image GUID. > + * > + * Return: 0 if OK, -ve on error > + * > + */ > +int fwu_plat_get_alt_num(struct udevice *dev, efi_guid_t *image_guid, > + int *alt_num); > + > +/** > + * fwu_plat_get_update_index() - Get the value of the update bank > + * @update_idx: Bank number to which images are to be updated > + * > + * Get the value of the bank(partition) to which the update needs to be > + * made. > + * > + * Note: This is a weak function and platforms can override this with > + * their own implementation for selection of the update bank. > + * > + * Return: 0 if OK, -ve on error > + * > + */ > +int fwu_plat_get_update_index(uint *update_idx); > #endif /* _FWU_H_ */ > diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c > index a871d77b4c..94b15859a5 100644 > --- a/lib/fwu_updates/fwu.c > +++ b/lib/fwu_updates/fwu.c > @@ -355,3 +355,30 @@ int fwu_clear_accept_image(efi_guid_t *img_type_id, u32 bank) > return fwu_clrset_image_accept(img_type_id, bank, > IMAGE_ACCEPT_CLEAR); > } > + > +/** > + * fwu_plat_get_update_index() - Get the value of the update bank > + * @update_idx: Bank number to which images are to be updated > + * > + * Get the value of the bank(partition) to which the update needs to be > + * made. > + * > + * Note: This is a weak function and platforms can override this with > + * their own implementation for selection of the update bank. > + * > + * Return: 0 if OK, -ve on error > + * > + */ > +__weak int fwu_plat_get_update_index(uint *update_idx) > +{ > + int ret; > + u32 active_idx; > + > + ret = fwu_get_active_index(&active_idx); > + if (ret < 0) > + return -1; > + > + *update_idx = (active_idx + 1) % CONFIG_FWU_NUM_BANKS; > + > + return ret; > +} > diff --git a/lib/fwu_updates/fwu_gpt.c b/lib/fwu_updates/fwu_gpt.c > new file mode 100644 > index 0000000000..a3134b80c9 > --- /dev/null > +++ b/lib/fwu_updates/fwu_gpt.c > @@ -0,0 +1,115 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) 2022, Linaro Limited > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +static int get_gpt_dfu_identifier(struct blk_desc *desc, efi_guid_t *image_guid) > +{ > + int i; > + struct disk_partition info; > + efi_guid_t unique_part_guid; > + > + for (i = 1; i < MAX_SEARCH_PARTITIONS; i++) { > + if (part_get_info(desc, i, &info)) > + continue; > + uuid_str_to_bin(info.uuid, unique_part_guid.b, > + UUID_STR_FORMAT_GUID); > + > + if (!guidcmp(&unique_part_guid, image_guid)) > + return i; > + } > + > + log_err("No partition found with image_guid %pUs\n", image_guid); > + return -ENOENT; > +} > + > +static int fwu_gpt_get_alt_num(struct blk_desc *desc, efi_guid_t *image_guid, > + int *alt_num, unsigned char dfu_dev) > +{ > + int ret = -1; > + int i, part, dev_num; > + int nalt; > + struct dfu_entity *dfu; > + > + dev_num = desc->devnum; > + part = get_gpt_dfu_identifier(desc, image_guid); > + if (part < 0) > + return -ENOENT; > + > + dfu_init_env_entities(NULL, NULL); > + > + nalt = 0; > + list_for_each_entry(dfu, &dfu_list, list) { > + nalt++; > + } Nit, you don't need {} > + > + if (!nalt) { > + log_warning("No entities in dfu_alt_info\n"); > + dfu_free_entities(); > + return -ENOENT; > + } > + > + for (i = 0; i < nalt; i++) { > + dfu = dfu_get_entity(i); > + > + if (!dfu) > + continue; > + > + /* > + * Currently, Multi Bank update > + * feature is being supported > + * only on GPT partitioned > + * MMC/SD devices. > + */ > + if (dfu->dev_type != dfu_dev) > + continue; > + > + if (dfu->layout == DFU_RAW_ADDR && > + dfu->data.mmc.dev_num == dev_num && > + dfu->data.mmc.part == part) { > + *alt_num = dfu->alt; > + ret = 0; Can we make this function return the partition number and < 0 on failure? If it's too big of a change, I don't mind keeping it as is Regards /Ilias > + break; > + } > + } > + > + dfu_free_entities(); > + > + return ret; > +} > + > +/** > + * fwu_plat_get_alt_num() - Get the DFU alt number > + * @dev: FWU metadata device > + * @image_guid: GUID value of the image for which the alt num is to > + * be obtained > + * @alt_num: The DFU alt number for the image that is to be updated > + * > + * Get the DFU alt number for the image that is to be updated. The > + * image is identified with the image_guid parameter that is passed > + * to the function. > + * > + * Note: This is a weak function and platforms can override this with > + * their own implementation for obtaining the alt number value. > + * > + * Return: 0 if OK, -ve on error > + * > + */ > +__weak int fwu_plat_get_alt_num(struct udevice *dev, efi_guid_t *image_guid, > + int *alt_num) > +{ > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + return fwu_gpt_get_alt_num(dev_get_uclass_plat(priv->blk_dev), > + image_guid, alt_num, DFU_DEV_MMC); > +} > -- > 2.34.1 >