With migration of the FWU metadata structure to version 2, the size of the structure is not determined at build time, but at run time.
This means, that the offsets for the structures describing firmware images which are part of the FWU metadata(struct fwu_fw_store_desc, struct fwu_image_entry and struct fwu_image_bank_info) need to be computed at runtime. Add helper functions to get addresses of these structures.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org ---
Changes since V1: * New patch needed based on comments from Ilias on the earlier version.
include/fwu.h | 45 +++++++++++++++++++++++++++++++++ lib/fwu_updates/fwu.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+)
diff --git a/include/fwu.h b/include/fwu.h index 1815bd0064..7de462548c 100644 --- a/include/fwu.h +++ b/include/fwu.h @@ -8,6 +8,7 @@
#include <blk.h> #include <efi.h> +#include <fwu_mdata.h> #include <mtd.h> #include <uuid.h>
@@ -81,6 +82,50 @@ struct fwu_mdata_ops { EFI_GUID(0x0c996046, 0xbcc0, 0x4d04, 0x85, 0xec, \ 0xe1, 0xfc, 0xed, 0xf1, 0xc6, 0xf8)
+ +/** + * fwu_get_fw_desc() - Return pointer to firmware descriptor store struct + * @mdata: Pointer to the FWU metadata + * + * Returns pointer to the firmware store descriptor of the FWU metadata + * containing information on updatable images. + * + * Return: Pointer to the struct fwu_fw_store_desc + */ +static inline struct fwu_fw_store_desc *fwu_get_fw_desc(struct fwu_mdata *mdata) +{ + return (struct fwu_fw_store_desc *)((u8 *)mdata + sizeof(*mdata)); +} + +/** + * fwu_img_entry_offset() - Get pointer to struct fwu_image_entry + * @mdata: Pointer to the FWU metadata + * @idx: Image index for which pointer is to be returned + * + * Fetches pointer to am array element of type struct fwu_image_entry. + * This returns back a pointer to a structure which is providing + * information on a updatable image. + * + * Return: Pointer to an array element of type struct fwu_image_entry + * + */ +struct fwu_image_entry *fwu_img_entry_offset(struct fwu_mdata *mdata, u16 idx); + +/** + * fwu_img_bank_info_offset() - Get pointer to struct fwu_image_bank_info + * @mdata: Pointer to the FWU metadata + * @idx: Image index for which information is needed + * @bank: Bank for which pointer is to be returned + * + * Fetches pointer to an array element of type struct fwu_image_bank_info + * for a given image. This returns back a pointer to a structure which + * is providing information for a given bank for a particular image. + * + * Return: Pointer to an array element of type fwu_image_bank_info + * + */ +struct fwu_image_bank_info *fwu_img_bank_info_offset(struct fwu_mdata *mdata, + u16 idx, u8 bank); /** * fwu_read_mdata() - Wrapper around fwu_mdata_ops.read_mdata() */ diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index 86518108c2..5f1182a764 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -141,6 +141,64 @@ static int fwu_get_image_type_id(u8 image_index, efi_guid_t *image_type_id) return -ENOENT; }
+/** + * fwu_img_entry_offset() - Get pointer to struct fwu_image_entry + * @mdata: Pointer to the FWU metadata + * @idx: Image index for which pointer is to be returned + * + * Fetches pointer to am array element of type struct fwu_image_entry. + * This returns back a pointer to a structure which is providing + * information on a updatable image. + * + * Return: Pointer to an array element of type struct fwu_image_entry + * + */ +struct fwu_image_entry *fwu_img_entry_offset(struct fwu_mdata *mdata, u16 idx) +{ + u8 num_banks; + size_t offset; + + num_banks = fwu_get_fw_desc(mdata)->num_banks; + + offset = sizeof(struct fwu_mdata) + + sizeof(struct fwu_fw_store_desc) + + (sizeof(struct fwu_image_entry) + + sizeof(struct fwu_image_bank_info) * num_banks) * idx; + + return (struct fwu_image_entry *)((char *)mdata + offset); +} + +/** + * fwu_img_bank_info_offset() - Get pointer to struct fwu_image_bank_info + * @mdata: Pointer to the FWU metadata + * @idx: Image index for which information is needed + * @bank: Bank for which pointer is to be returned + * + * Fetches pointer to an array element of type struct fwu_image_bank_info + * for a given image. This returns back a pointer to a structure which + * is providing information for a given bank for a particular image. + * + * Return: Pointer to an array element of type fwu_image_bank_info + * + */ +struct fwu_image_bank_info *fwu_img_bank_info_offset(struct fwu_mdata *mdata, + u16 idx, u8 bank) +{ + u8 num_banks; + size_t offset; + + num_banks = fwu_get_fw_desc(mdata)->num_banks; + + offset = sizeof(struct fwu_mdata) + + sizeof(struct fwu_fw_store_desc) + + (sizeof(struct fwu_image_entry) + + sizeof(struct fwu_image_bank_info) * num_banks) * idx + + sizeof(struct fwu_image_entry) + + sizeof(struct fwu_image_bank_info) * bank; + + return (struct fwu_image_bank_info *)((char *)mdata + offset); +} + /** * fwu_sync_mdata() - Update given meta-data partition(s) with the copy provided * @mdata: FWU metadata structure