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 C9AD3C433FE for ; Mon, 10 Oct 2022 10:38:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6E2B284EE2; Mon, 10 Oct 2022 12:38:15 +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="NZoo5zQ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AEFD684E26; Mon, 10 Oct 2022 12:38:13 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 9351684E1A for ; Mon, 10 Oct 2022 12:38:10 +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=rogerq@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E9B1B60A1A; Mon, 10 Oct 2022 10:38:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2748CC433C1; Mon, 10 Oct 2022 10:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665398288; bh=pEWt+aY2N73/56mhFJbIcD5YWVVujEVs0j4fKkb9MBY=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=NZoo5zQ8Gvl2o0nOtHOo55c0iLuV/KSblF+xZRfSxNwnogsShmN3eE2M3fF+jkRgN s4V/RfJIitvsDQRtdYBQ3vLf6m77QdhFJvuI6AOdMDDfKM9D/o5Ka5T0fygyCjJiNz i1TjWu9GHNDSqQLa+YTCjI69snet+MrwnJ0gENf8wlV5zF7IKD11QXgAsmwbyLLDnB ZHGmQMq7lWHP9Wi8ChY3nzLGPUTDprWED7khYcyU6vjAcBAR8tdGvhfSuXifJkiuas 43jGUdCMwAlCEX26oNR3Ia1LE+vtNmQJy5NiWDSU6feE1EqGNhZ21U0vqzF8amWyqg z5iEXfWe2oGPw== Message-ID: Date: Mon, 10 Oct 2022 13:38:04 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [u-boot][PATCH] spl: spl_legacy: Fix NAND boot on OMAP3 BeagleBoard Content-Language: en-US To: trini@konsulko.com, Dario Binacchi Cc: tony@atomide.com, gadiyar@ti.com, u-boot@lists.denx.de References: <20220929101128.3502-1-rogerq@kernel.org> From: Roger Quadros In-Reply-To: <20220929101128.3502-1-rogerq@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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.6 at phobos.denx.de X-Virus-Status: Clean +Dario On 29/09/2022 13:11, Roger Quadros wrote: > OMAP3 BeagleBoard NAND boot hangs when spl_load_legacy_img() tries > to read the header into 'struct hdr' which is allocated on the > stack. > > As the header has already been read once before by spl_nand.c, > we can avoid the extra header read here by simply passing around > the pointer to the header. > > This fixes NAND boot on OMAP3 BeagleBoard. > > Signed-off-by: Roger Quadros > --- > common/spl/spl_legacy.c | 19 ++++++++----------- > common/spl/spl_nand.c | 2 +- > common/spl/spl_nor.c | 6 +++++- > include/spl.h | 7 +++++-- > 4 files changed, 19 insertions(+), 15 deletions(-) > > diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c > index ae8731c782..2e9226c990 100644 > --- a/common/spl/spl_legacy.c > +++ b/common/spl/spl_legacy.c > @@ -77,32 +77,29 @@ static inline int spl_image_get_comp(const struct image_header *hdr) > > int spl_load_legacy_img(struct spl_image_info *spl_image, > struct spl_boot_device *bootdev, > - struct spl_load_info *load, ulong header) > + struct spl_load_info *load, ulong offset, > + struct image_header *hdr) > { > __maybe_unused SizeT lzma_len; > __maybe_unused void *src; > - struct image_header hdr; > ulong dataptr; > int ret; > > - /* Read header into local struct */ > - load->read(load, header, sizeof(hdr), &hdr); > - > /* > * If the payload is compressed, the decompressed data should be > * directly write to its load address. > */ > - if (spl_image_get_comp(&hdr) != IH_COMP_NONE) > + if (spl_image_get_comp(hdr) != IH_COMP_NONE) > spl_image->flags |= SPL_COPY_PAYLOAD_ONLY; > > - ret = spl_parse_image_header(spl_image, bootdev, &hdr); > + ret = spl_parse_image_header(spl_image, bootdev, hdr); > if (ret) > return ret; > > /* Read image */ > - switch (spl_image_get_comp(&hdr)) { > + switch (spl_image_get_comp(hdr)) { > case IH_COMP_NONE: > - dataptr = header; > + dataptr = offset; > > /* > * Image header will be skipped only if SPL_COPY_PAYLOAD_ONLY > @@ -119,7 +116,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, > lzma_len = LZMA_LEN; > > /* dataptr points to compressed payload */ > - dataptr = header + sizeof(hdr); > + dataptr = offset + sizeof(hdr); > > debug("LZMA: Decompressing %08lx to %08lx\n", > dataptr, spl_image->load_addr); > @@ -143,7 +140,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, > > default: > debug("Compression method %s is not supported\n", > - genimg_get_comp_short_name(image_get_comp(&hdr))); > + genimg_get_comp_short_name(image_get_comp(hdr))); > return -EINVAL; > } > > diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c > index 7b7579a2df..5eb67b5468 100644 > --- a/common/spl/spl_nand.c > +++ b/common/spl/spl_nand.c > @@ -119,7 +119,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, > load.bl_len = 1; > load.read = spl_nand_legacy_read; > > - return spl_load_legacy_img(spl_image, bootdev, &load, offset); > + return spl_load_legacy_img(spl_image, bootdev, &load, offset, header); > } else { > err = spl_parse_image_header(spl_image, bootdev, header); > if (err) > diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c > index 7986e930d2..f00a5c395b 100644 > --- a/common/spl/spl_nor.c > +++ b/common/spl/spl_nor.c > @@ -111,10 +111,14 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, > > /* Legacy image handling */ > if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT)) { > + struct image_header hdr; > + > load.bl_len = 1; > load.read = spl_nor_load_read; > + spl_nor_load_read(&load, spl_nor_get_uboot_base(), sizeof(hdr), &hdr); > return spl_load_legacy_img(spl_image, bootdev, &load, > - spl_nor_get_uboot_base()); > + spl_nor_get_uboot_base(), > + &hdr); > } > > return 0; > diff --git a/include/spl.h b/include/spl.h > index aac6648f94..7fa5e51c39 100644 > --- a/include/spl.h > +++ b/include/spl.h > @@ -353,7 +353,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, > * spl_load_legacy_img() - Loads a legacy image from a device. > * @spl_image: Image description to set up > * @load: Structure containing the information required to load data. > - * @header: Pointer to image header (including appended image) > + * @offset: Pointer to image > + * @hdr: Pointer to image header > * > * Reads an legacy image from the device. Loads u-boot image to > * specified load address. > @@ -361,7 +362,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, > */ > int spl_load_legacy_img(struct spl_image_info *spl_image, > struct spl_boot_device *bootdev, > - struct spl_load_info *load, ulong header); > + struct spl_load_info *load, ulong offset, > + struct image_header *hdr); > + > > /** > * spl_load_imx_container() - Loads a imx container image from a device.