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 EA29DC433EF for ; Mon, 20 Dec 2021 23:30:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9504883772; Tue, 21 Dec 2021 00:30:21 +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="juB+FBCS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50CA380FD2; Tue, 21 Dec 2021 00:30:20 +0100 (CET) Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 B03B780FD2 for ; Tue, 21 Dec 2021 00:30:14 +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=masami.hiramatsu@linaro.org Received: by mail-io1-xd2a.google.com with SMTP id c3so15454110iob.6 for ; Mon, 20 Dec 2021 15:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=sydaDhFDoQruOdpYbfMFUQvFPeQdBbcE82PJ5i5/Zmk=; b=juB+FBCSweLh6wV52VIb7C1TBr9p2mCaG8yXLIEiaDYj7buOA+Wguo23MtzxaImzvv E37dTZivVhE9zEktDLsqUqOjsLWH2Zo3i1OH5u2ZR9OvU6lR4/HPi5/X1FX0cLijmQBd b6sVul9a7UW9sKQrcuAOiYrrEOk4HC2TMRbDXTkgkT3bXhSc8nU98XRoRpn/RPcs+6c5 EVdsnuL8MeImw65Q1V+c/szxenPWvGPNxumkU1BLgq5xXTYQuWZc3shDrin1Sm+yHVrY 0KbY+ceKTzp0uK+rzgmqddRibZTbgGzORWpoyQ6FziGlFQ/wwc3OT01t7IJP4CTtVrYS AnBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=sydaDhFDoQruOdpYbfMFUQvFPeQdBbcE82PJ5i5/Zmk=; b=L5eBEVK2t7pzLv863kpJsaU7DImTaoNK9E19r7w8ACAbuHS1XkmdgSwuDx0Dg9FgT7 14uVW/t/FsmwE2BRd9GsqGE3jZppde9xAJo9Ktf4xi+5zFoTPe5RUe3amVuAyiUMAduN 7jxwGLE23gz+D644zZxgwLyJpx0TIrh+ueBOzyaEczhXhre9KepUUuYc30mKEIbU9UC2 O6B+yIiHT1VhjEnvfeNyEyHBtJn/L/OF+gDs5QCfqe1jAnGf/jeGHLwinu2ccjshBfs/ x1Apc2eQTzMb1rnxdh6s8t2VVbt1HSBnIrf5/NECIQ8TZFBH5zAlhaO8CzdUX5UdUvDu +qsQ== X-Gm-Message-State: AOAM530Vz0YWn32Ruww/DdS/yxgV1GC94N/uXNeK5IYyYY2cf3zfZiJU 6MrFsZIewXMmL84frq5bZsh1BIE6bEHpGAwMqiLRFA== X-Google-Smtp-Source: ABdhPJw//4IRVvVUJqONfskNqT3JTV48EGDCP/3SCvOlr59UKIYqkhBcvCVQs2rjPYj89NLlTnJPF8mt2oL5rS9Fngw= X-Received: by 2002:a6b:b2c1:: with SMTP id b184mr278887iof.24.1640043013068; Mon, 20 Dec 2021 15:30:13 -0800 (PST) MIME-Version: 1.0 References: <20211219070605.14894-1-sughosh.ganu@linaro.org> <20211219070605.14894-8-sughosh.ganu@linaro.org> <20211220061448.GC31993@laputa> <20211220163619.GD2773246@bill-the-cat> In-Reply-To: <20211220163619.GD2773246@bill-the-cat> From: Masami Hiramatsu Date: Tue, 21 Dec 2021 08:30:02 +0900 Message-ID: Subject: Re: [RFC PATCH v2 7/8] FWU: Add support for FWU Multi Bank Update feature To: Tom Rini Cc: Sughosh Ganu , AKASHI Takahiro , 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 , Etienne Carriere Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 Hi Tom, 2021=E5=B9=B412=E6=9C=8821=E6=97=A5(=E7=81=AB) 1:36 Tom Rini : > > On Mon, Dec 20, 2021 at 10:13:35PM +0900, Masami Hiramatsu wrote: > > Hi Sughosh, > > > > 2021=E5=B9=B412=E6=9C=8820=E6=97=A5(=E6=9C=88) 18:48 Sughosh Ganu : > > > > > > > > > On Mon, 20 Dec 2021 at 11:44, AKASHI Takahiro wrote: > > >> > > >> On Sun, Dec 19, 2021 at 12:36:04PM +0530, Sughosh Ganu wrote: > > >> > The FWU Multi Bank Update feature supports updation of firmware im= ages > > >> > to one of multiple sets(also called banks) of images. The firmware > > >> > images are clubbed together in banks, with the system booting imag= es > > >> > from the active bank. Information on the images such as which bank > > >> > they belong to is stored as part of the metadata structure, which = is > > >> > stored on the same storage media as the firmware images on a dedic= ated > > >> > partition. > > >> > > > >> > At the time of update, the metadata is read to identify the bank t= o > > >> > which the images need to be flashed(update bank). On a successful > > >> > update, the metadata is modified to set the updated bank as active > > >> > bank to subsequently boot from. > > >> > > > >> > Signed-off-by: Sughosh Ganu > > >> > --- > > >> > Changes since V1: > > >> > * Call function fwu_update_checks_pass to check if the > > >> > update can be initiated > > >> > * Do not allow firmware update from efi_init_obj_list as the > > >> > fwu boot-time checks need to be run > > >> > > > >> > include/fwu.h | 18 +++- > > >> > lib/Kconfig | 32 ++++++ > > >> > lib/Makefile | 1 + > > >> > lib/efi_loader/efi_capsule.c | 198 ++++++++++++++++++++++++++++++= ++++- > > >> > lib/efi_loader/efi_setup.c | 3 +- > > >> > lib/fwu_updates/Makefile | 11 ++ > > >> > lib/fwu_updates/fwu.c | 27 +++++ > > >> > 7 files changed, 284 insertions(+), 6 deletions(-) > > >> > create mode 100644 lib/fwu_updates/Makefile > > >> > > > >> > diff --git a/include/fwu.h b/include/fwu.h > > >> > index 2d2e674d6a..bf50fe9277 100644 > > >> > --- a/include/fwu.h > > >> > +++ b/include/fwu.h > > >> > @@ -10,14 +10,28 @@ > > >> > > > >> > #include > > >> > > > >> > -#define FWU_MDATA_VERSION 0x1 > > >> > +#define FWU_MDATA_GUID \ > > >> > + EFI_GUID(0x8a7a84a0, 0x8387, 0x40f6, 0xab, 0x41, \ > > >> > + 0xa8, 0xb9, 0xa5, 0xa6, 0x0d, 0x23) > > >> > + > > >> > +#define FWU_OS_REQUEST_FW_REVERT_GUID \ > > >> > + EFI_GUID(0xacd58b4b, 0xc0e8, 0x475f, 0x99, 0xb5, \ > > >> > + 0x6b, 0x3f, 0x7e, 0x07, 0xaa, 0xf0) > > >> > + > > >> > +#define FWU_OS_REQUEST_FW_ACCEPT_GUID \ > > >> > + EFI_GUID(0x0c996046, 0xbcc0, 0x4d04, 0x85, 0xec, \ > > >> > + 0xe1, 0xfc, 0xed, 0xf1, 0xc6, 0xf8) > > >> > > > >> > #define FWU_MDATA_GUID \ > > >> > EFI_GUID(0x8a7a84a0, 0x8387, 0x40f6, 0xab, 0x41, \ > > >> > 0xa8, 0xb9, 0xa5, 0xa6, 0x0d, 0x23) > > >> > > > >> > -int fwu_boottime_checks(void); > > >> > +#define FWU_MDATA_VERSION 0x1 > > >> > +#define FWU_IMAGE_ACCEPTED 0x1 > > >> > + > > >> > u8 fwu_update_checks_pass(void); > > >> > +int fwu_boottime_checks(void); > > >> > +int fwu_trial_state_ctr_start(void); > > >> > > > >> > int fwu_get_active_index(u32 *active_idx); > > >> > int fwu_update_active_index(u32 active_idx); > > >> > diff --git a/lib/Kconfig b/lib/Kconfig > > >> > index 807a4c6ade..7cb306317c 100644 > > >> > --- a/lib/Kconfig > > >> > +++ b/lib/Kconfig > > >> > @@ -835,3 +835,35 @@ config PHANDLE_CHECK_SEQ > > >> > When there are multiple device tree nodes with same name, > > >> > enable this config option to distinguish them using > > >> > phandles in fdtdec_get_alias_seq() function. > > >> > + > > >> > +config FWU_MULTI_BANK_UPDATE > > >> > + bool "Enable FWU Multi Bank Update Feature" > > >> > + depends on EFI_HAVE_CAPSULE_SUPPORT > > >> > + select PARTITION_TYPE_GUID > > >> > + select EFI_SETUP_EARLY > > >> > + help > > >> > + Feature for updating firmware images on platforms having > > >> > + multiple banks(copies) of the firmware images. One of the > > >> > + bank is selected for updating all the firmware components > > >> > + > > >> > +config FWU_NUM_BANKS > > >> > + int "Number of Banks defined by the platform" > > >> > + depends on FWU_MULTI_BANK_UPDATE > > >> > + help > > >> > + Define the number of banks of firmware images on a platfor= m > > >> > + > > >> > +config FWU_NUM_IMAGES_PER_BANK > > >> > + int "Number of firmware images per bank" > > >> > + depends on FWU_MULTI_BANK_UPDATE > > >> > + help > > >> > + Define the number of firmware images per bank. This value > > >> > + should be the same for all the banks. > > >> > + > > >> > +config FWU_TRIAL_STATE_CNT > > >> > + int "Number of times system boots in Trial State" > > >> > + depends on FWU_MULTI_BANK_UPDATE > > >> > + default 3 > > >> > + help > > >> > + With FWU Multi Bank Update feature enabled, number of time= s > > >> > + the platform is allowed to boot in Trial State after an > > >> > + update. > > >> > diff --git a/lib/Makefile b/lib/Makefile > > >> > index 5ddbc77ed6..bc5c1e22fc 100644 > > >> > --- a/lib/Makefile > > >> > +++ b/lib/Makefile > > >> > @@ -9,6 +9,7 @@ obj-$(CONFIG_EFI) +=3D efi/ > > >> > obj-$(CONFIG_EFI_LOADER) +=3D efi_driver/ > > >> > obj-$(CONFIG_EFI_LOADER) +=3D efi_loader/ > > >> > obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) +=3D efi_selftest/ > > >> > +obj-$(CONFIG_FWU_MULTI_BANK_UPDATE) +=3D fwu_updates/ > > >> > obj-$(CONFIG_LZMA) +=3D lzma/ > > >> > obj-$(CONFIG_BZIP2) +=3D bzip2/ > > >> > obj-$(CONFIG_TIZEN) +=3D tizen/ > > >> > diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_cap= sule.c > > >> > index 8301eed631..6dfe56bb0f 100644 > > >> > --- a/lib/efi_loader/efi_capsule.c > > >> > +++ b/lib/efi_loader/efi_capsule.c > > >> > @@ -14,6 +14,7 @@ > > >> > #include > > >> > #include > > >> > #include > > >> > +#include > > >> > #include > > >> > #include > > >> > #include > > >> > @@ -30,6 +31,13 @@ static const efi_guid_t efi_guid_firmware_manag= ement_capsule_id =3D > > >> > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > > >> > const efi_guid_t efi_guid_firmware_management_protocol =3D > > >> > EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GUID; > > >> > +const efi_guid_t fwu_guid_os_request_fw_revert =3D > > >> > + FWU_OS_REQUEST_FW_REVERT_GUID; > > >> > +const efi_guid_t fwu_guid_os_request_fw_accept =3D > > >> > + FWU_OS_REQUEST_FW_ACCEPT_GUID; > > >> > + > > >> > +__maybe_unused static u32 update_index; > > >> > +__maybe_unused static bool capsule_update; > > >> > > > >> > #ifdef CONFIG_EFI_CAPSULE_ON_DISK > > >> > /* for file system access */ > > >> > @@ -403,10 +411,13 @@ static efi_status_t efi_capsule_update_firmw= are( > > >> > void *image_binary, *vendor_code; > > >> > efi_handle_t *handles; > > >> > efi_uintn_t no_handles; > > >> > - int item; > > >> > + int item, alt_no; > > >> > struct efi_firmware_management_protocol *fmp; > > >> > u16 *abort_reason; > > >> > + efi_guid_t image_type_id; > > >> > efi_status_t ret =3D EFI_SUCCESS; > > >> > + int status; > > >> > + u8 image_index; > > >> > > > >> > /* sanity check */ > > >> > if (capsule_data->header_size < sizeof(*capsule) || > > >> > @@ -481,8 +492,36 @@ static efi_status_t efi_capsule_update_firmwa= re( > > >> > goto out; > > >> > } > > >> > > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > > >> > + /* > > >> > + * Based on the value of update_image_type_i= d, > > >> > + * derive the alt number value. This will be > > >> > + * passed as update_image_index to the > > >> > + * set_image function. > > >> > + */ > > >> > + image_type_id =3D image->update_image_type_i= d; > > >> > + status =3D fwu_get_image_alt_num(image_type_= id, > > >> > + update_index, > > >> > + &alt_no); > > >> > + if (status < 0) { > > >> > + log_err("Unable to get the alt no fo= r the image type %pUl\n", > > >> > + &image_type_id); > > >> > + if (status =3D=3D -ENODEV || status = =3D=3D -EIO) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else if (status =3D=3D -ENOMEM) > > >> > + ret =3D EFI_OUT_OF_RESOURCES= ; > > >> > + else if (status =3D=3D -ERANGE || st= atus =3D=3D -EINVAL) > > >> > + ret =3D EFI_INVALID_PARAMETE= R; > > >> > + goto out; > > >> > + } > > >> > + log_debug("alt_no %u for Image Type Id %pUl\= n", > > >> > + alt_no, &image_type_id); > > >> > + image_index =3D alt_no + 1; > > >> > + } else { > > >> > + image_index =3D image->update_image_index; > > >> > + } > > >> > abort_reason =3D NULL; > > >> > - ret =3D EFI_CALL(fmp->set_image(fmp, image->update_i= mage_index, > > >> > + ret =3D EFI_CALL(fmp->set_image(fmp, image_index, > > >> > image_binary, > > >> > image_binary_size, > > >> > vendor_code, NULL, > > >> > @@ -493,6 +532,24 @@ static efi_status_t efi_capsule_update_firmwa= re( > > >> > efi_free_pool(abort_reason); > > >> > goto out; > > >> > } > > >> > + > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > > >> > + status =3D fwu_clear_accept_image(&image_typ= e_id, > > >> > + update_index= ); > > >> > + if (status < 0) { > > >> > + log_err("Unable to clear the accept = bit for the image %pUl\n", > > >> > + &image_type_id); > > >> > + if (status =3D=3D -ENODEV || status = =3D=3D -EIO) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else if (status =3D=3D -ENOMEM) > > >> > + ret =3D EFI_OUT_OF_RESOURCES= ; > > >> > + else if (status =3D=3D -ERANGE || st= atus =3D=3D -EINVAL) > > >> > + ret =3D EFI_INVALID_PARAMETE= R; > > >> > + goto out; > > >> > + } > > >> > + log_debug("Cleared out accepted bit for Imag= e %pUl\n", &image_type_id); > > >> > + } > > >> > + > > >> > } > > >> > > > >> > out: > > >> > @@ -527,6 +584,9 @@ efi_status_t EFIAPI efi_update_capsule( > > >> > u64 scatter_gather_list) > > >> > { > > >> > struct efi_capsule_header *capsule; > > >> > + efi_guid_t *image_guid; > > >> > + u32 active_idx; > > >> > + int status; > > >> > unsigned int i; > > >> > efi_status_t ret; > > >> > > > >> > @@ -538,6 +598,16 @@ efi_status_t EFIAPI efi_update_capsule( > > >> > goto out; > > >> > } > > >> > > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > > >> > + /* Obtain the update_index from the platform */ > > >> > + status =3D fwu_plat_get_update_index(&update_index); > > >> > + if (status < 0) { > > >> > + log_err("Failed to get the FWU update_index = value\n"); > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + goto out; > > >> > + } > > >> > + } > > >> > + > > >> > ret =3D EFI_SUCCESS; > > >> > for (i =3D 0, capsule =3D *capsule_header_array; i < capsule= _count; > > >> > i++, capsule =3D *(++capsule_header_array)) { > > >> > @@ -552,7 +622,64 @@ efi_status_t EFIAPI efi_update_capsule( > > >> > i, &capsule->capsule_guid); > > >> > if (!guidcmp(&capsule->capsule_guid, > > >> > &efi_guid_firmware_management_capsule_i= d)) { > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)= ) { > > >> > + if (!fwu_update_checks_pass()) { > > >> > + log_err("FWU checks failed. = Cannot start update\n"); > > >> > + ret =3D EFI_INVALID_PARAMETE= R; > > >> > + goto out; > > >> > + } > > >> > + } > > >> > + > > >> > ret =3D efi_capsule_update_firmware(capsule= ); > > >> > + capsule_update =3D true; > > >> > + } else if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE))= { > > >> > + capsule_update =3D false; > > >> > + if (!guidcmp(&capsule->capsule_guid, > > >> > + &fwu_guid_os_request_fw_revert)= ) { > > >> > + /* > > >> > + * One of the previously updated ima= ge has > > >> > + * failed the OS acceptance test. OS= has > > >> > + * requested to revert back to the e= arlier > > >> > + * boot index > > >> > + */ > > >> > + status =3D fwu_revert_boot_index(); > > >> > + if (status < 0) { > > >> > + log_err("Failed to revert th= e FWU boot index\n"); > > >> > + if (status =3D=3D -ENODEV || > > >> > + status =3D=3D -ERANGE || > > >> > + status =3D=3D -EIO) > > >> > + ret =3D EFI_DEVICE_E= RROR; > > >> > + else if (status =3D=3D -EINV= AL) > > >> > + ret =3D EFI_INVALID_= PARAMETER; > > >> > + else if (status =3D=3D -ENOM= EM) > > >> > + ret =3D EFI_OUT_OF_R= ESOURCES; > > >> > + } else { > > >> > + ret =3D EFI_SUCCESS; > > >> > + log_err("Reverted the FWU ac= tive_index to %u. Recommend rebooting the system\n", > > >> > + active_idx); > > >> > + } > > >> > + } else if (!guidcmp(&capsule->capsule_guid, > > >> > + &fwu_guid_os_request_fw_= accept)) { > > >> > + /* > > >> > + * Image accepted by the OS. Set the= acceptance > > >> > + * status for the image. > > >> > + */ > > >> > + image_guid =3D (void *)(char *)capsu= le + > > >> > + capsule->header_size; > > >> > + status =3D fwu_accept_image(image_gu= id); > > >> > + if (status < 0) { > > >> > + if (status =3D=3D -ENODEV || > > >> > + status =3D=3D -ERANGE || > > >> > + status =3D=3D -EIO) > > >> > + ret =3D EFI_DEVICE_E= RROR; > > >> > + else if (status =3D=3D -EINV= AL) > > >> > + ret =3D EFI_INVALID_= PARAMETER; > > >> > + else if (status =3D=3D -ENOM= EM) > > >> > + ret =3D EFI_OUT_OF_R= ESOURCES; > > >> > + } else { > > >> > + ret =3D EFI_SUCCESS; > > >> > + } > > >> > + } > > >> > } else { > > >> > log_err("Unsupported capsule type: %pUl\n", > > >> > &capsule->capsule_guid); > > >> > @@ -563,6 +690,36 @@ efi_status_t EFIAPI efi_update_capsule( > > >> > goto out; > > >> > } > > >> > > > >> > + /* > > >> > + * Update the FWU metadata once all the capsules have > > >> > + * been updated. This is done only for the Runtime > > >> > + * capsule update service. > > >> > + * The update_index value now gets written to the > > >> > + * active_index and the update_index value also > > >> > + * gets updated. > > >> > + * For the capsule-on-disk feature, the updation > > >> > + * of the FWU metadata happens in efi_launch_capsules > > >> > + */ > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE) && > > >> > + !IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK)) { > > >> > + status =3D fwu_update_active_index(update_index); > > >> > + if (status < 0) { > > >> > + log_err("Failed to update FWU metadata index= values\n"); > > >> > + if (status =3D=3D -EINVAL || status =3D=3D -= ERANGE) > > >> > + ret =3D EFI_INVALID_PARAMETER; > > >> > + else if (status =3D=3D -ENODEV || status =3D= =3D -EIO) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else if (status =3D=3D -ENOMEM) > > >> > + ret =3D EFI_OUT_OF_RESOURCES; > > >> > + } else { > > >> > + status =3D fwu_trial_state_ctr_start(); > > >> > + if (status < 0) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else > > >> > + ret =3D EFI_SUCCESS; > > >> > + } > > >> > + } > > >> > + > > >> > if (IS_ENABLED(CONFIG_EFI_ESRT)) { > > >> > /* Rebuild the ESRT to reflect any updated FW images= . */ > > >> > ret =3D efi_esrt_populate(); > > >> > @@ -1090,8 +1247,10 @@ efi_status_t efi_launch_capsules(void) > > >> > { > > >> > struct efi_capsule_header *capsule =3D NULL; > > >> > u16 **files; > > >> > + int status; > > >> > unsigned int nfiles, index, i; > > >> > efi_status_t ret; > > >> > + bool update_status =3D true; > > >> > > > >> > if (check_run_capsules() !=3D EFI_SUCCESS) > > >> > return EFI_SUCCESS; > > >> > @@ -1119,9 +1278,11 @@ efi_status_t efi_launch_capsules(void) > > >> > ret =3D efi_capsule_read_file(files[i], &capsule); > > >> > if (ret =3D=3D EFI_SUCCESS) { > > >> > ret =3D EFI_CALL(efi_update_capsule(&capsule= , 1, 0)); > > >> > - if (ret !=3D EFI_SUCCESS) > > >> > + if (ret !=3D EFI_SUCCESS) { > > >> > log_err("Applying capsule %ls failed= \n", > > >> > files[i]); > > >> > + update_status =3D false; > > >> > + } > > >> > > > >> > /* create CapsuleXXXX */ > > >> > set_capsule_result(index, capsule, ret); > > >> > @@ -1129,6 +1290,7 @@ efi_status_t efi_launch_capsules(void) > > >> > free(capsule); > > >> > } else { > > >> > log_err("Reading capsule %ls failed\n", file= s[i]); > > >> > + update_status =3D false; > > >> > } > > >> > /* delete a capsule either in case of success or fai= lure */ > > >> > ret =3D efi_capsule_delete_file(files[i]); > > >> > @@ -1136,7 +1298,37 @@ efi_status_t efi_launch_capsules(void) > > >> > log_err("Deleting capsule %ls failed\n", > > >> > files[i]); > > >> > } > > >> > + > > >> > efi_capsule_scan_done(); > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > > >> > + if (update_status =3D=3D true && capsule_update =3D= =3D true) { > > >> > + /* > > >> > + * All the capsules have been updated succes= sfully, > > >> > + * update the FWU metadata. > > >> > + */ > > >> > + log_debug("Update Complete. Now updating act= ive_index to %u\n", > > >> > + update_index); > > >> > + status =3D fwu_update_active_index(update_in= dex); > > >> > + if (status < 0) { > > >> > + log_err("Failed to update FWU metada= ta index values\n"); > > >> > + if (status =3D=3D -EINVAL || status = =3D=3D -ERANGE) > > >> > + ret =3D EFI_INVALID_PARAMETE= R; > > >> > + else if (status =3D=3D -ENODEV || st= atus =3D=3D -EIO) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else if (status =3D=3D -ENOMEM) > > >> > + ret =3D EFI_OUT_OF_RESOURCES= ; > > >> > + } else { > > >> > + log_debug("Successfully updated the = active_index\n"); > > >> > + status =3D fwu_trial_state_ctr_start= (); > > >> > + if (status < 0) > > >> > + ret =3D EFI_DEVICE_ERROR; > > >> > + else > > >> > + ret =3D EFI_SUCCESS; > > >> > + } > > >> > + } else if (capsule_update =3D=3D true && update_stat= us =3D=3D false) { > > >> > + log_err("All capsules were not updated. Not = updating FWU metadata\n"); > > >> > + } > > >> > + } > > >> > > > >> > for (i =3D 0; i < nfiles; i++) > > >> > free(files[i]); > > >> > diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup= .c > > >> > index 1aba71cd96..6601176a2d 100644 > > >> > --- a/lib/efi_loader/efi_setup.c > > >> > +++ b/lib/efi_loader/efi_setup.c > > >> > @@ -298,7 +298,8 @@ efi_status_t efi_init_obj_list(void) > > >> > goto out; > > >> > > > >> > /* Execute capsules after reboot */ > > >> > - if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK) && > > >> > + if (!IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE) && > > >> > + IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK) && > > >> > !IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) > > >> > ret =3D efi_launch_capsules(); > > >> > out: > > >> > diff --git a/lib/fwu_updates/Makefile b/lib/fwu_updates/Makefile > > >> > new file mode 100644 > > >> > index 0000000000..73099a30cb > > >> > --- /dev/null > > >> > +++ b/lib/fwu_updates/Makefile > > >> > @@ -0,0 +1,11 @@ > > >> > +# SPDX-License-Identifier: GPL-2.0+ > > >> > +# > > >> > +# Copyright (c) 2021, Linaro Limited > > >> > +# > > >> > + > > >> > +obj-$(CONFIG_FWU_MULTI_BANK_UPDATE) +=3D fwu_mdata.o > > >> > +obj-$(CONFIG_FWU_MULTI_BANK_UPDATE) +=3D fwu.o > > >> > + > > >> > +ifdef CONFIG_EFI_PARTITION > > >> > +obj-$(CONFIG_FWU_MULTI_BANK_UPDATE) +=3D fwu_mdata_gpt_blk.o > > >> > +endif > > >> > > >> If I understand correctly, any platform may have its own > > >> fwu_mdata_ops. So we should not unconditionally compile in > > >> fwu_mdata_gpt_blk.o even if CONFIG_EFI_PARTITION is enabled. > > > > > > > > > I can put in an additional guard of CONFIG_BLK for building the file.= Not sure if there would be a requirement to have a platform specific set o= f operations for a GPT partitioned block device. Will wait for Masami to ex= plain. > > > > > > OK, I'm trying to implement the AB update on the developerbox > > platform, which doesn't have GPT, nor BLK since the firmware will be > > stored on the SPI NOR flash. So I will introduce a new fwu_mdata_sf.c. > > For this purpose, I introduced CONFIG_FWU_MULTI_BANK_UPDATE_SF, which > > depends on CONFIG_FWU_MULTI_BANK_UPDATE and CONFIG_DM_SPI_FLASH. Thus, > > I also recommend you to introduce CONFIG_FWU_MULTI_BANK_UPDATE_GPT_BLK > > and it should depends on CONFIG_BLK and selects CONFIG_EFI_PARTITION. > > > > BTW, there are some code pieces which can shared with the > > fwu_mdata_gpt_blk.c, for example, comparing primary and seconday > > metadata and calculate the crc32. > > Here's my concern / question. At what level is this abstraction being > used? I want to be sure that other SoCs, such as say a Rockchip > platform (I have a SystemReady IR certified one on the way) can re-use > this code as well but I'm sure it will need things written to different > offsets within the SPI/eMMC. Thanks! For the metadata, I introduced CONFIG_FWU_SF_PRIMARY_METADATA_OFFSET and CONFIG_FWU_SF_PRIMARY_METADATA_OFFSET for configuring offset of the metadata on SPI Flash for my prototype code. I think it might be better to introduce accessors for the metadata, e.g. fwu_load_pri_mdata()/fwu_save_sec_mdata() etc. so that the platform can choose the media which stores metadata independent from the firmware storage. For the firmware offset, it is defined in the dfu_alt_info, so you can use (or even mix) any storage media like SPI nor or MTD or eMMC. Thank you, > > -- > Tom --=20 Masami Hiramatsu