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 CAC72C433EF for ; Mon, 20 Dec 2021 16:36:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38AEA8345C; Mon, 20 Dec 2021 17:36:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="hxoNcue6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 33CDD83468; Mon, 20 Dec 2021 17:36:29 +0100 (CET) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 7B12A83104 for ; Mon, 20 Dec 2021 17:36:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82d.google.com with SMTP id f20so10291639qtb.4 for ; Mon, 20 Dec 2021 08:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DFjeiYVGlmorkfKZJuI2OZoFXhny3snDZadBKVhHztY=; b=hxoNcue63a5v4gCI9frq+GUi94rTsUFMfRYbxLl70UOV25yU47L31wd2BG0BcuLly0 fiQS1t4MMydijd5YSVatQ5eAj7x4YSxrOoIOSXbfzwCIDL9My6Cm2Vsd6Zf1wlokwZLp ujK/frkXPt8Ntf7KGJ1nq/Q3tcn6vxPGaMj8E= 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:references :mime-version:content-disposition:in-reply-to; bh=DFjeiYVGlmorkfKZJuI2OZoFXhny3snDZadBKVhHztY=; b=k7YDOtoMbecxQlLlmwaTmEZHc+Nq90iwGu771cBRC+zP5FC73LWRmGjnSmU/V/RRfd IG7Gxp23Mf6UBIZ+B7zoDJB2AOP/O+nEcqbnD2Y1xbING4NzBOm2amrvl8i6KaX5AAHR ovsXaPDLTcjTf3sicwbUQVlGAJSmNf8OaTFVb+eD6X2rDpnhbexyaDdeqRnbOjuYOB5A CgCE8pw04zUeHo9yhea3TPxjL9CHz+QVtuLQjtElt4YZ9KFLEDy51VlmXxjEvEHyzS90 67EXphOFYerwh6mrK7Dr19RUYTduEhCrjDfSIuz0u37HPwrh9gncI8+FAG7kDABawNR1 3VQw== X-Gm-Message-State: AOAM5310jMCMx1I8/CNPiSzaroMzqzSYYdSmUl/6uPlbuirn7hR1XmN+ bMNoLEDuJN8P7fm8GamikPdpbw== X-Google-Smtp-Source: ABdhPJwBTWA+2dXQ3va6phBiBWeJm2+ii62FqMq/REgBVbu5QX+EziUVf/razg+24C7iEizQHU6A4w== X-Received: by 2002:ac8:5c54:: with SMTP id j20mr13068018qtj.438.1640018183036; Mon, 20 Dec 2021 08:36:23 -0800 (PST) Received: from bill-the-cat (2603-6081-7b01-cbda-c90a-b114-2d52-2406.res6.spectrum.com. [2603:6081:7b01:cbda:c90a:b114:2d52:2406]) by smtp.gmail.com with ESMTPSA id 8sm15681160qtz.28.2021.12.20.08.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 08:36:21 -0800 (PST) Date: Mon, 20 Dec 2021 11:36:19 -0500 From: Tom Rini To: Masami Hiramatsu 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 Subject: Re: [RFC PATCH v2 7/8] FWU: Add support for FWU Multi Bank Update feature Message-ID: <20211220163619.GD2773246@bill-the-cat> References: <20211219070605.14894-1-sughosh.ganu@linaro.org> <20211219070605.14894-8-sughosh.ganu@linaro.org> <20211220061448.GC31993@laputa> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RUvhGz2nhX7DIu1B" Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett 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 --RUvhGz2nhX7DIu1B Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 20, 2021 at 10:13:35PM +0900, Masami Hiramatsu wrote: > Hi Sughosh, >=20 > 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 imag= es > >> > to one of multiple sets(also called banks) of images. The firmware > >> > images are clubbed together in banks, with the system booting images > >> > 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 dedicat= ed > >> > partition. > >> > > >> > At the time of update, the metadata is read to identify the bank to > >> > 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 platform > >> > + > >> > +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 times > >> > + 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_capsu= le.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_managem= ent_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_firmwar= e( > >> > 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_firmware( > >> > goto out; > >> > } > >> > > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > >> > + /* > >> > + * Based on the value of update_image_type_id, > >> > + * 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_id; > >> > + 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 for = 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 || stat= us =3D=3D -EINVAL) > >> > + ret =3D EFI_INVALID_PARAMETER; > >> > + 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_ima= ge_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_firmware( > >> > efi_free_pool(abort_reason); > >> > goto out; > >> > } > >> > + > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > >> > + status =3D fwu_clear_accept_image(&image_type_= id, > >> > + update_index); > >> > + if (status < 0) { > >> > + log_err("Unable to clear the accept bi= t 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 || stat= us =3D=3D -EINVAL) > >> > + ret =3D EFI_INVALID_PARAMETER; > >> > + goto out; > >> > + } > >> > + log_debug("Cleared out accepted bit for Image = %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 va= lue\n"); > >> > + ret =3D EFI_DEVICE_ERROR; > >> > + goto out; > >> > + } > >> > + } > >> > + > >> > ret =3D EFI_SUCCESS; > >> > for (i =3D 0, capsule =3D *capsule_header_array; i < capsule_c= ount; > >> > 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_id)= ) { > >> > + if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { > >> > + if (!fwu_update_checks_pass()) { > >> > + log_err("FWU checks failed. Ca= nnot start update\n"); > >> > + ret =3D EFI_INVALID_PARAMETER; > >> > + 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 image= has > >> > + * failed the OS acceptance test. OS h= as > >> > + * requested to revert back to the ear= lier > >> > + * boot index > >> > + */ > >> > + status =3D fwu_revert_boot_index(); > >> > + if (status < 0) { > >> > + log_err("Failed to revert the = FWU boot index\n"); > >> > + if (status =3D=3D -ENODEV || > >> > + status =3D=3D -ERANGE || > >> > + status =3D=3D -EIO) > >> > + ret =3D EFI_DEVICE_ERR= OR; > >> > + else if (status =3D=3D -EINVAL) > >> > + ret =3D EFI_INVALID_PA= RAMETER; > >> > + else if (status =3D=3D -ENOMEM) > >> > + ret =3D EFI_OUT_OF_RES= OURCES; > >> > + } else { > >> > + ret =3D EFI_SUCCESS; > >> > + log_err("Reverted the FWU acti= ve_index to %u. Recommend rebooting the system\n", > >> > + active_idx); > >> > + } > >> > + } else if (!guidcmp(&capsule->capsule_guid, > >> > + &fwu_guid_os_request_fw_ac= cept)) { > >> > + /* > >> > + * Image accepted by the OS. Set the a= cceptance > >> > + * status for the image. > >> > + */ > >> > + image_guid =3D (void *)(char *)capsule= + > >> > + capsule->header_size; > >> > + status =3D fwu_accept_image(image_guid= ); > >> > + if (status < 0) { > >> > + if (status =3D=3D -ENODEV || > >> > + status =3D=3D -ERANGE || > >> > + status =3D=3D -EIO) > >> > + ret =3D EFI_DEVICE_ERR= OR; > >> > + else if (status =3D=3D -EINVAL) > >> > + ret =3D EFI_INVALID_PA= RAMETER; > >> > + else if (status =3D=3D -ENOMEM) > >> > + ret =3D EFI_OUT_OF_RES= OURCES; > >> > + } 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 v= alues\n"); > >> > + if (status =3D=3D -EINVAL || status =3D=3D -ER= ANGE) > >> > + 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", files[= i]); > >> > + update_status =3D false; > >> > } > >> > /* delete a capsule either in case of success or failu= re */ > >> > 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 successf= ully, > >> > + * update the FWU metadata. > >> > + */ > >> > + log_debug("Update Complete. Now updating activ= e_index to %u\n", > >> > + update_index); > >> > + status =3D fwu_update_active_index(update_inde= x); > >> > + 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 || stat= us =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 ac= tive_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_status= =3D=3D false) { > >> > + log_err("All capsules were not updated. Not up= dating 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. N= ot sure if there would be a requirement to have a platform specific set of = operations for a GPT partitioned block device. Will wait for Masami to expl= ain. >=20 >=20 > 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. >=20 > 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! --=20 Tom --RUvhGz2nhX7DIu1B Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmHAsQAACgkQFHw5/5Y0 tyxpvgv+NkU9N/7c1RS8scbL3UW4PIL/ZHXyPIPsHshM2+rpDZj5xkvExwU4qGFR B3/v9NoSIbc3KTKCGqo2gxW12yPwwZ4Zy8fMN90Ygt/lea0SYAQ9HiQthLamf5rH 0CVqHE0odfUOwrUX5/4dpP3IaB6UK7kQXYVGWaN5JXtZOK+ZubPyqtQGMr1oC4Ca B3iQxKa09B3In+fDgzUKg6lGd6YfAk8MdSYjerAWjMTP4kl9EaymC0Cdjv0JctXw y4xUzJNaimC1vWosDS0NkjV7mBoleSmVUWp7Vu8e8qyBmF8v5HDKmW3GfS9uHgBU SB2QE+6P5pzdUKS3Myh6vpOTl6wbJFbQ2orSQog9WMSdXFqN0kDtHKmkekKdHtik nIUdJKye7GBY3RVRWkFqTbfETYlSvf5ivBPKpIOKEm84E5NFy4EySyG3HLCM4IxR GCA98MSQvXIlFvqSkMZpBrUV5Io4iIpEZA8PrxqupKgVm6K7DFiGntgWeB4PJojC oFO724vh =Cnok -----END PGP SIGNATURE----- --RUvhGz2nhX7DIu1B--