From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
To: Sughosh Ganu <sughosh.ganu@linaro.org>
Cc: u-boot@lists.denx.de, Heinrich Schuchardt <xypron.glpk@gmx.de>,
Takahiro Akashi <takahiro.akashi@linaro.org>,
Patrick Delaunay <patrick.delaunay@foss.st.com>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com>,
Tom Rini <trini@konsulko.com>,
Etienne Carriere <etienne.carriere@linaro.org>,
Michal Simek <monstr@monstr.eu>,
Jassi Brar <jaswinder.singh@linaro.org>
Subject: Re: [PATCH v7 02/13] FWU: Add FWU metadata structure and driver for accessing metadata
Date: Fri, 15 Jul 2022 13:13:52 +0300 [thread overview]
Message-ID: <CAC_iWjJOH9szRfjc=gAb5Vk6cK--N6eZpmx8LX0hYWZJTwyJnw@mail.gmail.com> (raw)
In-Reply-To: <20220714183913.118505-3-sughosh.ganu@linaro.org>
Hi Sughosh,
> + */
> +
> +#define LOG_CATEGORY UCLASS_FWU_MDATA
[...]
> +
> +/**
> + * fwu_verify_mdata() - Verify the FWU metadata
> + * @mdata: FWU metadata structure
> + * @pri_part: FWU metadata partition is primary or secondary
> + *
> + * Verify the FWU metadata by computing the CRC32 for the metadata
> + * structure and comparing it against the CRC32 value stored as part
> + * of the structure.
> +/**
> + * fwu_update_active_index() - Update active_index from the FWU metadata
> + * @active_idx: active_index value to be updated
> +int fwu_update_active_index(u32 active_idx)
> +{
> + int ret;
> + struct fwu_mdata *mdata = NULL;
> +
> + if (active_idx > CONFIG_FWU_NUM_BANKS - 1) {
> + log_err("Active index value to be updated is incorrect\n");
Nit but "Invalid active index value" is makes more sense
> + return -1;
> + }
> +
[...]
> +}
> +
> +/**
> + * fwu_get_image_alt_num() - Get the dfu alt number to be used for capsule update
> + * @image_type_id: pointer to the image guid as passed in the capsule
> + * @update_bank: Bank to which the update is to be made
> + * @alt_num: The alt_num for the image
> + *
> + * Based on the guid value passed in the capsule, along with the bank to which the
> + * image needs to be updated, get the dfu alt number which will be used for the
> + * capsule update
> + *
> + * Return: 0 if OK, -ve on error
> + *
> + */
> +int fwu_get_image_alt_num(efi_guid_t *image_type_id, u32 update_bank,
> + int *alt_num)
> +{
> + int ret, i;
> + efi_guid_t *image_guid;
> + struct udevice *dev = NULL;
> + struct fwu_mdata *mdata = NULL;
> + struct fwu_image_entry *img_entry;
> + const struct fwu_mdata_ops *ops = NULL;
> + struct fwu_image_bank_info *img_bank_info;
> +
> + ret = fwu_get_dev_ops(&dev, &ops);
> + if (ret)
> + return ret;
> +
> + ret = fwu_get_mdata(&mdata);
> + if (ret) {
> + log_err("Unable to get valid FWU metadata\n");
> + goto out;
> + }
> +
> + /*
> + * The FWU metadata has been read. Now get the image_uuid for the
> + * image with the update_bank.
> + */
> + for (i = 0; i < CONFIG_FWU_NUM_IMAGES_PER_BANK; i++) {
> + if (!guidcmp(image_type_id,
> + &mdata->img_entry[i].image_type_uuid)) {
> + img_entry = &mdata->img_entry[i];
> + img_bank_info = &img_entry->img_bank_info[update_bank];
> + image_guid = &img_bank_info->image_uuid;
> + ret = fwu_plat_get_alt_num(dev, image_guid, alt_num);
> + break;
> + }
> + }
> +
I think if you set ret = -EINVAL on top of the for loop you can mostly
get rid of the code below.
ret = -EINVAL
for () {
.....
ret = fwu_plat_get_alt_num(dev, image_guid, alt_num);
if (ret)
log_err("alt_num not found for partition with GUID %pUs\n", image_guid);
goto out; //on success instead of break
}
log_err("Partition with the image type %pUs not found\n", image_type_id);
out:
free(mdata);
return ret;
Isn't that more readable?
> + if (i == CONFIG_FWU_NUM_IMAGES_PER_BANK) {
> + log_err("Partition with the image type %pUs not found\n",
> + image_type_id);
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + if (!ret) {
> + log_debug("alt_num %d for partition %pUs\n",
> + *alt_num, image_guid);
> + } else {
> + log_err("alt_num not found for partition with GUID %pUs\n",
> + image_guid);
> + ret = -EINVAL;
> + }
> +
> +out:
> + free(mdata);
> +
> + return ret;
> +}
> +
> +/**
[...]
u32 bank, u8 action)
> +{
> + int ret, i;
> + u32 nimages;
Get rid of nimages when they are only used as
CONFIG_FWU_NUM_IMAGES_PER_BANK (there's more than one)
[...]
> diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
> index a432e43871..598a8c10a0 100644
> @@ -0,0 +1,67 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (c) 2022, Linaro Limited
> + */
> +
> +#if !defined _FWU_MDATA_H_
> +#define _FWU_MDATA_H_
> +
> +#include <efi.h>
> +
> +/**
> + * struct fwu_image_bank_info - firmware image information
> + * @image_uuid: Guid value of the image in this bank
> + * @accepted: Acceptance status of the image
> + * @reserved: Reserved
> + *
> + * The structure contains image specific fields which are
> + * used to identify the image and to specify the image's
> + * acceptance status
> + */
> +struct fwu_image_bank_info {
> + efi_guid_t image_uuid;
> + uint32_t accepted;
> + uint32_t reserved;
> +} __attribute__((__packed__));
The spec doesn't require those to be packed. If there's a reason we
should have it in comments, otherwise just drop the packed attribute
> +
> +/**
> + * struct fwu_image_entry - information for a particular type of image
> + * @image_type_uuid: Guid value for identifying the image type
> + * @location_uuid: Guid of the storage volume where the image is located
> + * @img_bank_info: Array containing properties of images
> + *
> + * This structure contains information on various types of updatable
> + * firmware images. Each image type then contains an array of image
> + * information per bank.
> + */
> +struct fwu_image_entry {
> + efi_guid_t image_type_uuid;
> + efi_guid_t location_uuid;
> + struct fwu_image_bank_info img_bank_info[CONFIG_FWU_NUM_BANKS];
> +} __attribute__((__packed__));
> +
> +/**
> + * struct fwu_mdata - FWU metadata structure for multi-bank updates
> + * @crc32: crc32 value for the FWU metadata
> + * @version: FWU metadata version
> + * @active_index: Index of the bank currently used for booting images
> + * @previous_active_inde: Index of the bank used before the current bank
> + * being used for booting
> + * @img_entry: Array of information on various firmware images that can
> + * be updated
> + *
> + * This structure is used to store all the needed information for performing
> + * multi bank updates on the platform. This contains info on the bank being
> + * used to boot along with the information needed for identification of
> + * individual images
> + */
> +struct fwu_mdata {
> + uint32_t crc32;
> + uint32_t version;
> + uint32_t active_index;
> + uint32_t previous_active_index;
> +
> + struct fwu_image_entry img_entry[CONFIG_FWU_NUM_IMAGES_PER_BANK];
> +} __attribute__((__packed__));
> +
> +#endif /* _FWU_MDATA_H_ */
> --
> 2.34.1
>
Thanks!
/Ilias
next prev parent reply other threads:[~2022-07-15 10:14 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 18:39 [PATCH v7 00/13] FWU: Add FWU Multi Bank Update feature support Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 01/13] dt/bindings: Add bindings for FWU Metadata storage device Sughosh Ganu
2022-07-15 6:05 ` Heinrich Schuchardt
2022-07-16 21:13 ` Jassi Brar
2022-07-18 5:32 ` Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 02/13] FWU: Add FWU metadata structure and driver for accessing metadata Sughosh Ganu
2022-07-15 10:13 ` Ilias Apalodimas [this message]
2022-07-14 18:39 ` [PATCH v7 03/13] FWU: Add FWU metadata access driver for GPT partitioned block devices Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 04/13] stm32mp1: dk2: Add a node for the FWU metadata device Sughosh Ganu
2022-07-15 6:17 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 05/13] stm32mp1: dk2: Add image information for capsule updates Sughosh Ganu
2022-07-15 6:35 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 06/13] FWU: stm32mp1: Add helper functions for accessing FWU metadata Sughosh Ganu
2022-07-15 7:52 ` Ilias Apalodimas
2022-07-22 3:39 ` Jassi Brar
2022-07-22 16:08 ` Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 07/13] FWU: STM32MP1: Add support to read boot index from backup register Sughosh Ganu
2022-07-15 6:17 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 08/13] FWU: Add boot time checks as highlighted by the FWU specification Sughosh Ganu
2022-07-15 7:02 ` Ilias Apalodimas
2022-07-20 7:35 ` Ilias Apalodimas
2022-07-27 11:04 ` Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 09/13] FWU: Add support for the FWU Multi Bank Update feature Sughosh Ganu
2022-07-15 11:58 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 10/13] FWU: cmd: Add a command to read FWU metadata Sughosh Ganu
2022-07-15 10:23 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 11/13] mkeficapsule: Add support for generating empty capsules Sughosh Ganu
2022-07-15 13:52 ` Ilias Apalodimas
2022-07-14 18:39 ` [PATCH v7 12/13] mkeficapsule: Add support for setting OEM flags in capsule header Sughosh Ganu
2022-07-15 16:40 ` Ilias Apalodimas
2022-07-18 5:35 ` Sughosh Ganu
2022-07-14 18:39 ` [PATCH v7 13/13] FWU: doc: Add documentation for the FWU feature Sughosh Ganu
2022-07-15 14:25 ` Heinrich Schuchardt
2022-07-22 17:42 ` [PATCH 0/5] FWU: Add support for mtd backed feature on DeveloperBox jassisinghbrar
2022-07-22 17:43 ` jassisinghbrar
2022-07-22 17:43 ` [PATCH 1/5] dt/bindings: Add bindings for FWU Metadata mtd storage jassisinghbrar
2022-07-25 7:04 ` Sughosh Ganu
2022-07-22 17:43 ` [PATCH 2/5] FWU: Add FWU metadata access driver for MTD storage regions jassisinghbrar
2022-09-01 6:45 ` Heinrich Schuchardt
2022-07-22 17:43 ` [PATCH 3/5] FWU: mtd: Add helper functions for accessing FWU metadata jassisinghbrar
2022-09-01 7:01 ` Heinrich Schuchardt
2022-07-22 17:43 ` [PATCH 4/5] dt: fwu: developerbox: enable fwu banks and mdata regions jassisinghbrar
2022-07-22 17:43 ` [PATCH 5/5] fwu: DeveloperBox: add support for FWU jassisinghbrar
2022-09-01 7:07 ` Heinrich Schuchardt
2022-09-01 7:22 ` Heinrich Schuchardt
2022-09-26 18:10 ` Jassi Brar
2022-07-25 7:18 ` [PATCH 0/5] FWU: Add support for mtd backed feature on DeveloperBox Sughosh Ganu
2022-07-25 13:31 ` Jassi Brar
2022-08-21 6:56 ` Heinrich Schuchardt
2022-08-21 7:16 ` Heinrich Schuchardt
2022-08-22 4:45 ` Sughosh Ganu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAC_iWjJOH9szRfjc=gAb5Vk6cK--N6eZpmx8LX0hYWZJTwyJnw@mail.gmail.com' \
--to=ilias.apalodimas@linaro.org \
--cc=bmeng.cn@gmail.com \
--cc=etienne.carriere@linaro.org \
--cc=jaswinder.singh@linaro.org \
--cc=monstr@monstr.eu \
--cc=patrice.chotard@foss.st.com \
--cc=patrick.delaunay@foss.st.com \
--cc=sjg@chromium.org \
--cc=sughosh.ganu@linaro.org \
--cc=takahiro.akashi@linaro.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).