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 A224CC433F5 for ; Tue, 21 Dec 2021 04:53:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F3CB83772; Tue, 21 Dec 2021 05:53:31 +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="L2tjYXL6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75DCC8310B; Tue, 21 Dec 2021 05:53:29 +0100 (CET) Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (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 B99118304F for ; Tue, 21 Dec 2021 05:53:25 +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-pj1-x102c.google.com with SMTP id lr15-20020a17090b4b8f00b001b19671cbebso2045951pjb.1 for ; Mon, 20 Dec 2021 20:53:25 -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=1EZasJg61g4cI/cPZFjx/80/bcEHlSoR1YJOM0C+6HU=; b=L2tjYXL6ZZr1dK7cPPRuxqy8cFkLvTFuecAqseLMoIRmbV1/E2rs2Jo8+e2MN8HySs 9pnxpSD6bfAmTYkC0pn4hmWdNLZBl/6kTwPs+oh5r0t5320oyJYWCMNNV7JZCLhuy6P4 JF77RgNTQlvwfrW2xmOqza0vSwkme+eMi5l8+KkdqIZvO34PgdW4JlMpIOC08HI1sWn9 YOuGfr3y1DcQKNmeZid937nvSrC5aphhYz1KWLeQIs3pOPsWf/Q+/zAmK7ajuJ40tKCe 5K7mAmXuw1ug4TBwRmi9hSUn58Te8hbegH3fyZWAnBFZZ7aUWRPvWx8oWJSb520kr+LW 7yJQ== 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=1EZasJg61g4cI/cPZFjx/80/bcEHlSoR1YJOM0C+6HU=; b=kjnnKydLa9VEsYyBBWxRkXsvX6oLohgMBgOwvNRqvMFX2ZcdkRdNTOcD5yWrATpFYn mPwCtbsnvFNw1v4w6qN25U/T/RH5zItEt4CnAe/RGrtpWkKjbb1WIULBvtJDBGkSTgFF 1M8Cz1vbsgt9iPR7lHDV+vMQBu8bSs1iRWBs0L3QT5uto92rTbg/Cmr6fFyZr/pJ9vZ3 mMfvA4T4HUJxPbSaH1SoiekaU7rwst7zMY+CrSBN57tcc4MqwO8zmz0bXRd8HA+TR/Un 8TXo9/vOS5TcQdoo3CxPQb2sPZmvUTGGkqfo2OTHIzovXUXQvhabr8l0doRiUxqUgptx GqCg== X-Gm-Message-State: AOAM532Y399QKYggTBJeLqwPEJtBJAyibiIK5BCl5oJB67P8Hqwjw2fo l84cmGjtlL1WXrCAHhZWYspvCQ== X-Google-Smtp-Source: ABdhPJzliiANEOnolqvWDfwAcGgZLvLRDUBmbNuBdGTBHHfY+3RJ1J7/vYDeAl8+bWu4kX8E5VVVIQ== X-Received: by 2002:a17:902:da8e:b0:141:fa9d:806d with SMTP id j14-20020a170902da8e00b00141fa9d806dmr1429718plx.26.1640062403936; Mon, 20 Dec 2021 20:53:23 -0800 (PST) Received: from laputa ([2400:4050:c3e1:100:d16:64:2a8d:b1a8]) by smtp.gmail.com with ESMTPSA id x11sm974712pjq.52.2021.12.20.20.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 20:53:23 -0800 (PST) Date: Tue, 21 Dec 2021 13:53:18 +0900 From: AKASHI Takahiro To: Sughosh Ganu Cc: u-boot@lists.denx.de, Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Jason Liu , Tom Rini , Etienne Carriere Subject: Re: [RFC PATCH v2 5/8] EFI: FMP: Add provision to update image's ImageTypeId in image descriptor Message-ID: <20211221045318.GD40272@laputa> Mail-Followup-To: AKASHI Takahiro , Sughosh Ganu , u-boot@lists.denx.de, Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , Simon Glass , Bin Meng , Ilias Apalodimas , Jose Marinho , Grant Likely , Jason Liu , Tom Rini , Etienne Carriere References: <20211219070605.14894-1-sughosh.ganu@linaro.org> <20211219070605.14894-6-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211219070605.14894-6-sughosh.ganu@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 Sughosh, On Sun, Dec 19, 2021 at 12:36:02PM +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 V1: > * Define a new function fwu_plat_get_alt_num for filling up > all the dfu partitions with a preset ImageTypeId guid > * Remove the distinction made in the earlier version for > setting image_type_id as suggested by Heinrich > > 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 If I understand your code correctly, a guid in descriptor for any image (I mean any part defined by dfu_alto_info) will have the same value even with this change. If so, why do we have to take an array of GUIDs as a parameter? On your previous version, Heinrich made a comment like: ! The sequence of GUIDs in a capsule should not influence the update. The ! design lacks a configuration defining which GUID maps to which DFU part. ! ! Please, get rid of all DFU environment variables and describe the update ! in a configuration file that you add to the capsule. Have you addressed this issue in this series? (To do that, we may have to introduce a new format of capsule file.) -Takahiro Akashi > * > * 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; > + > 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; > + } > + > 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 >