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 3A207C433EF for ; Thu, 20 Jan 2022 05:24:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A3B068128B; Thu, 20 Jan 2022 06:24:28 +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="UDhvlbWB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 833CB833A2; Thu, 20 Jan 2022 06:24:26 +0100 (CET) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (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 2FCAD803D0 for ; Thu, 20 Jan 2022 06:24:23 +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-pf1-x42d.google.com with SMTP id y27so216768pfa.0 for ; Wed, 19 Jan 2022 21:24:23 -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=paxIW2KcUhcCgBG9bVZJ1Ly6GpmfSmpU8X5XYvx2TwY=; b=UDhvlbWB6jJgdguwYwLkrgwa8PL34ft7GQtYlOegW4Ht78hYXsf82v7s5JM5UXI/on hLh42cuk4JF2fFkW8OgkbBHbPluDMrDvBvIg2rk/IbtyXY+BACsL9olStcpMh38R2NC3 Zb3e/FmCM+87xJN3gBJzhDpLN6vPcW1kFumcG9Ef8GAB44LQssULXNXAsS71LKmqXXly yOYXXaVl/Y2Pylxtl/efzBDYmebwWBVSX4DLygDUw/U+vr5sYMqm3L1vSJ23rgNrHJ4d MdJEP2hAgPenKdx7DHr3HdycAHUKhjhNv/MbyV/79pMXllxghnVk358PzCugVweIk8wq f8qg== 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=paxIW2KcUhcCgBG9bVZJ1Ly6GpmfSmpU8X5XYvx2TwY=; b=F2+SHEOnxIiBhoAg0PwBgdYIvvTQMmvoDunmIHES6BV8hkSzmc3B2B9ESeFbTn+dPO 8mINS5UduPuOOhhe1BZJdrxx6xRlfyzkofGO/JbwlNu7qK7v/Qh0M3K9laAiSQbfuaHV VmGd1+6fRb2r4ewnAUNJnQxJP+rgfboYeGvL5LYrxL5uID12lXWrjKK9lWi6QZKY3p2S 0bROnO/xuJiPY8x3Z4lDy2W5ODjxRs0N6OhnhvqyHKK7S0sFiHuhUBy5bhpMD9cT/mPc 46O6TryopyYU6ls73XgmjOmnskOXvziO1D24KM+XNo6EgW0yJPm+4mxXfbJ5WEm/H/6+ vtaw== X-Gm-Message-State: AOAM5327OfiY0S4gKjQ34ItOHv9ponBexiqTxPYA4ajYIAkh7ROvhvvr Dz9OtikBOOXrc0Nc5ks86TLQ/g== X-Google-Smtp-Source: ABdhPJxcE7Qbu39LjH8oMSVqiNGwa3B7VCQNcJ2s9PsdkAq4hcxxWxDoA0xFIsFL29p6i8hkIlnySg== X-Received: by 2002:a63:6c03:: with SMTP id h3mr29662163pgc.604.1642656261422; Wed, 19 Jan 2022 21:24:21 -0800 (PST) Received: from laputa ([2400:4050:c3e1:100:35ef:d002:eb6d:1b5]) by smtp.gmail.com with ESMTPSA id u9sm1477195pfi.14.2022.01.19.21.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 21:24:20 -0800 (PST) Date: Thu, 20 Jan 2022 14:24:15 +0900 From: AKASHI Takahiro To: Sughosh Ganu Cc: u-boot@lists.denx.de, Masami Hiramatsu , Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Tom Rini , Etienne Carriere Subject: Re: [RFC PATCH v3 5/9] EFI: FMP: Add provision to update image's ImageTypeId in image descriptor Message-ID: <20220120052415.GD42867@laputa> Mail-Followup-To: AKASHI Takahiro , Sughosh Ganu , u-boot@lists.denx.de, Masami Hiramatsu , Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Tom Rini , Etienne Carriere References: <20220119185548.16730-1-sughosh.ganu@linaro.org> <20220119185548.16730-6-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220119185548.16730-6-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.2 at phobos.denx.de X-Virus-Status: Clean On Thu, Jan 20, 2022 at 12:25:44AM +0530, Sughosh Ganu wrote: > The FWU Multi Banks Update feature allows updating different types of > updatable firmware images on the platform. These image types are > identified using the ImageTypeId GUID value. Add support in the > GetImageInfo function of the FMP protocol to get the GUID values for > the individual images and populate these in the image descriptor for > the corresponding images. > > Signed-off-by: Sughosh Ganu > --- > > Changes since V2: None > > lib/efi_loader/efi_firmware.c | 90 ++++++++++++++++++++++++++++++++--- > 1 file changed, 83 insertions(+), 7 deletions(-) > > diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c > index a1b88dbfc2..648342ae72 100644 > --- a/lib/efi_loader/efi_firmware.c > +++ b/lib/efi_loader/efi_firmware.c > @@ -10,6 +10,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -96,6 +97,46 @@ efi_status_t EFIAPI efi_firmware_set_package_info_unsupported( > return EFI_EXIT(EFI_UNSUPPORTED); > } > > +static efi_status_t fill_part_guid_array(const efi_guid_t *guid, > + efi_guid_t **part_guid_arr) > +{ > + int i; > + int dfu_num = 0; > + efi_guid_t *guid_arr; > + struct dfu_entity *dfu; > + efi_status_t ret = EFI_SUCCESS; > + > + dfu_init_env_entities(NULL, NULL); > + > + dfu_num = 0; > + list_for_each_entry(dfu, &dfu_list, list) { > + dfu_num++; > + } > + > + if (!dfu_num) { > + log_warning("Probably dfu_alt_info not defined\n"); > + ret = EFI_NOT_READY; > + goto out; > + } > + > + *part_guid_arr = malloc(sizeof(efi_guid_t) * dfu_num); > + if (!*part_guid_arr) { > + ret = EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + guid_arr = *part_guid_arr; > + for (i = 0; i < dfu_num; i++) { > + guidcpy(guid_arr, guid); > + ++guid_arr; > + } > + > +out: > + dfu_free_entities(); > + > + return ret; > +} > + > /** > * efi_get_dfu_info - return information about the current firmware image > * @this: Protocol instance > @@ -104,9 +145,9 @@ efi_status_t EFIAPI efi_firmware_set_package_info_unsupported( > * @descriptor_version: Pointer to version number > * @descriptor_count: Pointer to number of descriptors > * @descriptor_size: Pointer to descriptor size > - * package_version: Package version > - * package_version_name: Package version's name > - * image_type: Image type GUID > + * @package_version: Package version > + * @package_version_name: Package version's name > + * @guid_array: Image type GUID array > * > * Return information bout the current firmware image in @image_info. > * @image_info will consist of a number of descriptors. > @@ -122,7 +163,7 @@ static efi_status_t efi_get_dfu_info( > efi_uintn_t *descriptor_size, > u32 *package_version, > u16 **package_version_name, > - const efi_guid_t *image_type) > + const efi_guid_t *guid_array) > { > struct dfu_entity *dfu; > size_t names_len, total_size; > @@ -172,7 +213,7 @@ static efi_status_t efi_get_dfu_info( > next = name; > list_for_each_entry(dfu, &dfu_list, list) { > image_info[i].image_index = dfu->alt + 1; > - image_info[i].image_type_id = *image_type; > + image_info[i].image_type_id = guid_array[i]; > image_info[i].image_id = dfu->alt; > > /* copy the DFU entity name */ > @@ -250,6 +291,7 @@ efi_status_t EFIAPI efi_firmware_fit_get_image_info( > u16 **package_version_name) > { > efi_status_t ret; > + efi_guid_t *part_guid_arr = NULL; > > EFI_ENTRY("%p %p %p %p %p %p %p %p\n", this, > image_info_size, image_info, > @@ -264,12 +306,19 @@ efi_status_t EFIAPI efi_firmware_fit_get_image_info( > !descriptor_size || !package_version || !package_version_name)) > return EFI_EXIT(EFI_INVALID_PARAMETER); > > + ret = fill_part_guid_array(&efi_firmware_image_type_uboot_fit, > + &part_guid_arr); > + if (ret != EFI_SUCCESS) > + goto out; Why do you not call fwu_plat_fill_partition_guids() for FIT FMP driver? If you have a specific reason, please describe it. > + > ret = efi_get_dfu_info(image_info_size, image_info, > descriptor_version, descriptor_count, > descriptor_size, > package_version, package_version_name, > - &efi_firmware_image_type_uboot_fit); > + part_guid_arr); > > +out: > + free(part_guid_arr); > return EFI_EXIT(ret); > } > > @@ -358,7 +407,10 @@ efi_status_t EFIAPI efi_firmware_raw_get_image_info( > u32 *package_version, > u16 **package_version_name) > { > + int status; > efi_status_t ret = EFI_SUCCESS; > + const efi_guid_t null_guid = NULL_GUID; > + efi_guid_t *part_guid_arr = NULL; > > EFI_ENTRY("%p %p %p %p %p %p %p %p\n", this, > image_info_size, image_info, > @@ -373,12 +425,36 @@ efi_status_t EFIAPI efi_firmware_raw_get_image_info( > !descriptor_size || !package_version || !package_version_name)) > return EFI_EXIT(EFI_INVALID_PARAMETER); > > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > + ret = fill_part_guid_array(&null_guid, &part_guid_arr); > + if (ret != EFI_SUCCESS) > + goto out; > + > + /* > + * Call the platform function to fill the GUID array > + * with the corresponding partition GUID values > + */ > + status = fwu_plat_fill_partition_guids(&part_guid_arr); > + if (status < 0) { > + log_err("Unable to get partiion guid's\n"); > + ret = EFI_DEVICE_ERROR; > + goto out; > + } > + } else { > + ret = fill_part_guid_array(&efi_firmware_image_type_uboot_raw, > + &part_guid_arr); > + if (ret != EFI_SUCCESS) > + goto out; > + } The code: ret = fill_part_guid_array(&efi_firmware_image_type_uboot_raw, &part_guid_arr); if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) status = fwu_plat_fill_partition_guids(&part_guid_arr); would be much simpler here. But I don't know why you want to call fwu_plat_fill_partition_guids() only in case of CONFIG_FWU_MULTI_BANK_UPDATE. The functionality should be the same whether A/B update or not. -Takahiro Akashi > + > ret = efi_get_dfu_info(image_info_size, image_info, > descriptor_version, descriptor_count, > descriptor_size, > package_version, package_version_name, > - &efi_firmware_image_type_uboot_raw); > + part_guid_arr); > > +out: > + free(part_guid_arr); > return EFI_EXIT(ret); > } > > -- > 2.17.1 >