Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 701C8C48BD1 for ; Wed, 9 Jun 2021 10:33:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CAA05608FE for ; Wed, 9 Jun 2021 10:33:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CAA05608FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BAFBB82EF5; Wed, 9 Jun 2021 12:33:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.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=kernel.org header.i=@kernel.org header.b="fJj8LnXM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C5CB82EFC; Wed, 9 Jun 2021 12:33:49 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 00C0D82EBF for ; Wed, 9 Jun 2021 12:33:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kristo@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id C2438608FE; Wed, 9 Jun 2021 10:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623234823; bh=VLTj8jmt4TglwGkyuIq3TlLpcPSnEgntZPkod0MSikQ=; h=Subject:From:To:Cc:References:Date:In-Reply-To:From; b=fJj8LnXMSIE9INvVJUgvTsdXkjpQq0kKe93hqK3UGM6qPnKJK9zBGRjth326aeiWQ 9VCqkrm5oG2regt2B9VEHVvS6nOTThDni1iPlT/nhT3m48MX8RYpSfN7hydbEuR7ZJ kKqLt5ZzB98cNNrlgBmAj4JjJp+nCxJZOTwk2Wj3VRX1ddkiSOqZbdk5HV/yeCuk06 JnDNmv6+ubdDCbFtdUyVkepbQxchC7ZrFVbd2929oN8t0a2gLROcIsomqVTMoKz5iM ijCcWsvwv9O7F1J5lMFgzKL7KOIxcZSujgQj26WHa6mNZN0oI+8P+P0mPIvs1CMgAe WgPzkZPiBh5AA== Subject: Re: [PATCHv5 04/26] common: fit: Update board_fit_image_post_process() to pass fit and node_offset From: Tero Kristo To: u-boot@lists.denx.de, lokeshvutla@ti.com Cc: trini@konsulko.com References: <20210603063255.5483-1-kristo@kernel.org> <20210603063255.5483-5-kristo@kernel.org> Message-ID: <003888ee-b277-03fe-9d28-9e77e44771fe@kernel.org> Date: Wed, 9 Jun 2021 13:33:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210603063255.5483-5-kristo@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Hi, There is apparently a build failure with ARM socfpga board, the change below fixes it and should be squashed to the original patch: diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 650122fcd4..36eecdc057 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -103,7 +103,8 @@ __weak int board_fit_config_name_match(const char *name) #endif #if IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS) -void board_fit_image_post_process(void **p_image, size_t *p_size) +void board_fit_image_post_process(const void *fit, int node, void **p_image, + size_t *p_size) { if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH)) { if (socfpga_vendor_authentication(p_image, p_size)) -- -Tero On 03/06/2021 09:32, Tero Kristo wrote: > From: Lokesh Vutla > > board_fit_image_post_process() passes only start and size of the image, > but type of the image is not passed. So pass fit and node_offset, to > derive information about image to be processed. > > Signed-off-by: Lokesh Vutla > Reviewed-by: Tom Rini > Signed-off-by: Tero Kristo > --- > arch/arm/mach-k3/security.c | 3 ++- > arch/arm/mach-keystone/mon.c | 3 ++- > board/ti/am335x/board.c | 3 ++- > board/ti/am43xx/board.c | 3 ++- > board/ti/am57xx/board.c | 3 ++- > board/ti/dra7xx/evm.c | 3 ++- > common/image-fit.c | 2 +- > common/spl/spl_fit.c | 2 +- > include/image.h | 5 ++++- > 9 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c > index 66f90a5a34..5b5ff9ba7b 100644 > --- a/arch/arm/mach-k3/security.c > +++ b/arch/arm/mach-k3/security.c > @@ -18,7 +18,8 @@ > #include > #include > > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > struct ti_sci_handle *ti_sci = get_ti_sci_handle(); > struct ti_sci_proc_ops *proc_ops = &ti_sci->ops.proc_ops; > diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c > index 58995d73ac..b863bab196 100644 > --- a/arch/arm/mach-keystone/mon.c > +++ b/arch/arm/mach-keystone/mon.c > @@ -103,7 +103,8 @@ static int k2_hs_bm_auth(int cmd, void *arg1) > return result; > } > > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > int result = 0; > void *image = *p_image; > diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c > index 5959ff73dc..5c156a5d1d 100644 > --- a/board/ti/am335x/board.c > +++ b/board/ti/am335x/board.c > @@ -960,7 +960,8 @@ int board_fit_config_name_match(const char *name) > #endif > > #ifdef CONFIG_TI_SECURE_DEVICE > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > secure_boot_verify_image(p_image, p_size); > } > diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c > index e9febb9592..a71b588efc 100644 > --- a/board/ti/am43xx/board.c > +++ b/board/ti/am43xx/board.c > @@ -896,7 +896,8 @@ int embedded_dtb_select(void) > #endif > > #ifdef CONFIG_TI_SECURE_DEVICE > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > secure_boot_verify_image(p_image, p_size); > } > diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c > index 05c26c74d9..399a2e5d91 100644 > --- a/board/ti/am57xx/board.c > +++ b/board/ti/am57xx/board.c > @@ -1199,7 +1199,8 @@ static int board_bootmode_has_emmc(void) > #endif > > #ifdef CONFIG_TI_SECURE_DEVICE > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > secure_boot_verify_image(p_image, p_size); > } > diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c > index 05f251f778..23e8005991 100644 > --- a/board/ti/dra7xx/evm.c > +++ b/board/ti/dra7xx/evm.c > @@ -1065,7 +1065,8 @@ int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) > #endif > > #ifdef CONFIG_TI_SECURE_DEVICE > -void board_fit_image_post_process(void **p_image, size_t *p_size) > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size) > { > secure_boot_verify_image(p_image, p_size); > } > diff --git a/common/image-fit.c b/common/image-fit.c > index e614643fe3..0c5a05948d 100644 > --- a/common/image-fit.c > +++ b/common/image-fit.c > @@ -2143,7 +2143,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, > > /* perform any post-processing on the image data */ > if (!host_build() && IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS)) > - board_fit_image_post_process(&buf, &size); > + board_fit_image_post_process(fit, noffset, &buf, &size); > > len = (ulong)size; > > diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c > index caddf51196..57d621d5b3 100644 > --- a/common/spl/spl_fit.c > +++ b/common/spl/spl_fit.c > @@ -320,7 +320,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, > } > > if (CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS)) > - board_fit_image_post_process(&src, &length); > + board_fit_image_post_process(fit, node, &src, &length); > > load_ptr = map_sysmem(load_addr, length); > if (IS_ENABLED(CONFIG_SPL_GZIP) && image_comp == IH_COMP_GZIP) { > diff --git a/include/image.h b/include/image.h > index 459685d4d4..0c24bf6f35 100644 > --- a/include/image.h > +++ b/include/image.h > @@ -1581,11 +1581,14 @@ int board_fit_config_name_match(const char *name); > * into the FIT creation (i.e. the binary blobs would have been pre-processed > * before being added to the FIT image). > * > + * @fit: pointer to fit image > + * @node: offset of image node > * @image: pointer to the image start pointer > * @size: pointer to the image size > * @return no return value (failure should be handled internally) > */ > -void board_fit_image_post_process(void **p_image, size_t *p_size); > +void board_fit_image_post_process(const void *fit, int node, void **p_image, > + size_t *p_size); > > #define FDT_ERROR ((ulong)(-1)) > >