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 9D6D9C433EF for ; Fri, 21 Jan 2022 11:52:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E2666820AC; Fri, 21 Jan 2022 12:52:08 +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="oW+8E/si"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1AE138197D; Fri, 21 Jan 2022 12:52:07 +0100 (CET) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (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 50A7E8197D for ; Fri, 21 Jan 2022 12:52:04 +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=ilias.apalodimas@linaro.org Received: by mail-wm1-x32e.google.com with SMTP id f202-20020a1c1fd3000000b0034dd403f4fbso18540369wmf.1 for ; Fri, 21 Jan 2022 03:52:04 -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:references:mime-version :content-disposition:in-reply-to; bh=dq4T5d8/YmXsKQpMlZ+b0i3TWdAw4FpVNvg8mMtP/2g=; b=oW+8E/sipdbWyvthFaJ/03di/sGH0AVJopr3w+xB6yyqk1s8ah7jaS/yR/aEUnpWS0 5yBw8Q+prHHMqzzN4vXnOalROFMehl/x7W6x3d3aFqiwiyJy/7oW+RC+SnJpihLxF5/d KpiLXVERQ9INuzUXfwWI9iv3/JIrETW7xUz3o5i8znDVjYvPgbnrqL/FXAZYPGUZX01t 8DHcrZRZ783LtqW9+hIII6LJMTNcY1Nc12YLqGTO8zsGuQfXeUbBGjFB3emx3Jw1hhtW MTkRg9slQiDMf+mHpajuO5xqwrCqQq/ai6hIBo0X9rFzJ05UiWkfehVc8NpOBbBbG4Sc EOnw== 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=dq4T5d8/YmXsKQpMlZ+b0i3TWdAw4FpVNvg8mMtP/2g=; b=l55EtNJexlM5qEdCQ1XB8yjToMYRX5ezVC5zxcNAhy6mfqd3Zkrb6ImnvtbU+pt/Hr 6mn3Ki2dJfXDIA7t8zuA6SodDXpFL6Tg9yXMT4nCEgyEaXhOqqE1UY5SnQWbn89DEgmt v7EeLp1NxI7Sn/OiaNF8eriPl2OOKyTs30lIRRL6xXJCzneZvtiYiZpTLyWVeKLD/wd5 N2gVaOGQQsodbbSU//byiGIi2o7fQT3qb0099EpXjV/bDEOg7Mqn7U7+l8/xGsNcv+8z dobIc9eNHvV6pQHOSrGVZIfQf/0G+cJ7Tqc84JGlqFl7qRC6gdH5nZE2um1BGDUuTM+v i6gw== X-Gm-Message-State: AOAM5303+3/+YzhegOivVevW72kmyDdcjO2uS7Q5jKAB5p/tbaQQh0Hh GGYjj/zCSFgHkCyd9nDGBSaaNg== X-Google-Smtp-Source: ABdhPJwQRLkjjlyjrDo8fOG1bGYKDid5KpUHfRCVTLe8iftw2LsiROUpO1W4UReSlHgvQ2B+n9Rl4w== X-Received: by 2002:adf:e510:: with SMTP id j16mr3666585wrm.58.1642765923773; Fri, 21 Jan 2022 03:52:03 -0800 (PST) Received: from hades (athedsl-4461669.home.otenet.gr. [94.71.4.85]) by smtp.gmail.com with ESMTPSA id s9sm5223455wrr.84.2022.01.21.03.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 03:52:02 -0800 (PST) Date: Fri, 21 Jan 2022 13:52:00 +0200 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Masami Hiramatsu , Patrick Delaunay , Patrice Chotard , Heinrich Schuchardt , Alexander Graf , AKASHI Takahiro , Simon Glass , Bin Meng , Jose Marinho , Grant Likely , Tom Rini , Etienne Carriere Subject: Re: [RFC PATCH v3 3/9] FWU: stm32mp1: Add helper functions for accessing FWU metadata Message-ID: References: <20220119185548.16730-1-sughosh.ganu@linaro.org> <20220119185548.16730-4-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220119185548.16730-4-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.5 at phobos.denx.de X-Virus-Status: Clean Hi Sughosh, [...] > } > > U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_COPRO, board_copro_image_process); > + > +#if defined(CONFIG_FWU_MULTI_BANK_UPDATE) > +#include > +#include > + > +static int gpt_plat_get_alt_num(int dev_num, void *identifier) > +{ > + int i; > + int ret = -1; > + u32 part; > + int alt_num = dfu_get_alt_number(); > + struct dfu_entity *dfu; > + > + part = *(u32 *)identifier; > + dfu_init_env_entities(NULL, NULL); > + > + for (i = 0; i < alt_num; i++) { > + dfu = dfu_get_entity(i); > + > + if (!dfu) > + continue; > + > + /* > + * Currently, Multi Bank update > + * feature is being supported > + * only on GPT partitioned > + * MMC/SD devices. > + */ > + if (dfu->dev_type != DFU_DEV_MMC) > + continue; And that's fine. But can you add a pr_warn or something on this check? So if anyone tries to implement this on a non-sd card can get a clear indication of what's not working? > + > + if (dfu->layout == DFU_RAW_ADDR && > + dfu->data.mmc.dev_num == dev_num && > + dfu->data.mmc.part == part) { > + ret = dfu->alt; > + break; > + } > + } > + > + dfu_free_entities(); > + > + return ret; > +} > + > +int fwu_plat_get_alt_num(void *identifier) > +{ > + int ret; > + struct blk_desc *desc; > + > + ret = fwu_plat_get_blk_desc(&desc); > + if (ret < 0) { > + log_err("Block device not found\n"); > + return -ENODEV; > + } > + > + return gpt_plat_get_alt_num(desc->devnum, identifier); > +} > + > +static int plat_fill_gpt_partition_guids(struct blk_desc *desc, > + efi_guid_t **part_guid_arr) > +{ > + int i, ret = 0; > + u32 part; > + struct dfu_entity *dfu; > + struct disk_partition info; > + efi_guid_t part_type_guid; > + int alt_num = dfu_get_alt_number(); > + > + dfu_init_env_entities(NULL, NULL); > + > + for (i = 0, part = 1; i < alt_num; i++) { > + dfu = dfu_get_entity(i); > + > + if (!dfu) > + continue; > + > + /* > + * Currently, Multi Bank update > + * feature is being supported > + * only on GPT partitioned > + * MMC/SD devices. > + */ > + if (dfu->dev_type != DFU_DEV_MMC) ditto > + continue; > + > + if (part_get_info(desc, part, &info)) { > + part++; > + continue; > + } > + > + uuid_str_to_bin(info.type_guid, part_type_guid.b, > + UUID_STR_FORMAT_GUID); > + guidcpy((*part_guid_arr + i), &part_type_guid); > + part++; > + } > + > + dfu_free_entities(); > + > + return ret; > +} > + > +int fwu_plat_fill_partition_guids(efi_guid_t **part_guid_arr) > +{ > + int ret; > + struct blk_desc *desc; > + > + ret = fwu_plat_get_blk_desc(&desc); > + if (ret < 0) { > + log_err("Block device not found\n"); > + return -ENODEV; > + } > + > + return plat_fill_gpt_partition_guids(desc, part_guid_arr); > +} > + > +int fwu_plat_get_update_index(u32 *update_idx) > +{ > + int ret; > + u32 active_idx; > + > + ret = fwu_get_active_index(&active_idx); > + > + if (ret < 0) > + return -1; > + > + *update_idx = active_idx ^= 0x1; > + > + return ret; > +} > + > +int fwu_plat_get_blk_desc(struct blk_desc **desc) > +{ > + int ret; > + struct mmc *mmc; > + struct udevice *dev; > + > + /* > + * Initial support is being added for the DK2 > + * platform > + */ > + if (CONFIG_IS_ENABLED(TARGET_ST_STM32MP15x) && > + (of_machine_is_compatible("st,stm32mp157c-dk2"))) { > + ret = uclass_get_device(UCLASS_MMC, 0, &dev); > + if (ret) > + return -1; > + > + mmc = mmc_get_mmc_dev(dev); > + if (!mmc) > + return -1; > + > + if (mmc_init(mmc)) > + return -1; > + > + *desc = mmc_get_blk_desc(mmc); > + if (!*desc) > + return -1; > + } > + > + return 0; > +} > + > +struct fwu_mdata_ops *get_plat_fwu_mdata_ops(void) > +{ > + if (CONFIG_IS_ENABLED(TARGET_ST_STM32MP15x) && > + (of_machine_is_compatible("st,stm32mp157c-dk2"))) { > + return &fwu_gpt_blk_ops; > + } > + > + return NULL; > +} > +#endif /* CONFIG_FWU_MULTI_BANK_UPDATE */ > diff --git a/include/fwu.h b/include/fwu.h > index 12f7eecdb0..b23a93ac40 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -59,4 +59,9 @@ int fwu_revert_boot_index(void); > int fwu_accept_image(efi_guid_t *img_type_id, u32 bank); > int fwu_clear_accept_image(efi_guid_t *img_type_id, u32 bank); > > +int fwu_plat_get_update_index(u32 *update_idx); > +int fwu_plat_get_blk_desc(struct blk_desc **desc); > +int fwu_plat_get_alt_num(void *identifier); > +int fwu_plat_fill_partition_guids(efi_guid_t **part_guid_arr); > + > #endif /* _FWU_H_ */ > diff --git a/lib/fwu_updates/fwu_mdata_gpt_blk.c b/lib/fwu_updates/fwu_mdata_gpt_blk.c > index cb47ddf4a7..796b08e76f 100644 > --- a/lib/fwu_updates/fwu_mdata_gpt_blk.c > +++ b/lib/fwu_updates/fwu_mdata_gpt_blk.c > @@ -37,6 +37,7 @@ static int gpt_get_mdata_partitions(struct blk_desc *desc, > struct disk_partition info; > const efi_guid_t fwu_mdata_guid = FWU_MDATA_GUID; > > + mdata_parts = 0; > for (i = 1; i < MAX_SEARCH_PARTITIONS; i++) { > if (part_get_info(desc, i, &info)) > continue; > @@ -324,7 +325,7 @@ out: > int fwu_gpt_get_active_index(u32 *active_idx) > { > int ret; > - struct fwu_mdata *mdata; > + struct fwu_mdata *mdata = NULL; Should these be part of the original patch? > > ret = gpt_get_mdata(&mdata); > if (ret < 0) { > @@ -355,7 +356,7 @@ static int gpt_get_image_alt_num(struct blk_desc *desc, > { > int ret, i; > u32 part; > - struct fwu_mdata *mdata; > + struct fwu_mdata *mdata = NULL; > struct fwu_image_entry *img_entry; > struct fwu_image_bank_info *img_bank_info; > struct disk_partition info; > @@ -459,7 +460,7 @@ static int fwu_gpt_set_clear_image_accept(efi_guid_t *img_type_id, > void *buf; > int ret, i; > u32 nimages; > - struct fwu_mdata *mdata; > + struct fwu_mdata *mdata = NULL; > struct fwu_image_entry *img_entry; > struct fwu_image_bank_info *img_bank_info; > > -- > 2.17.1 >