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 64851C433F5 for ; Wed, 6 Apr 2022 05:33:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A00783C84; Wed, 6 Apr 2022 07:32:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649223173; bh=bkUyuwQ7qcr1PgqKYtwbH3nh9t7eKY4ftSTeDANVot0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=aH862yRamIdG+JR/QipdwHHeyKNaP4aOkgs/KoQ3n5ulvYW1Zfo0Sm4XfHTwwLyyA 8Zg6ZV1c0KYEd4a2MdGGIRGas+HpSl5mS7uiBXOO1Mna1QYpx4i9ERKcM3wfisyLQ9 lcs0bS27+in8NO6vVyNWKiS7Hb05xCLjkFOB7pTOWvuLwTldNHI1GNnvlFIWaQbe3Z 7lXIGrpKU2WsruIjYZXneGj7nDB8EcilBYBR2oAqkR3fyjG1NWfDl6Ym4nwGRmtUZO ZWF1IRlYNEynQ0VL+8w2QYGvJXEHhcPrRHe5eQxhfcYJVRVx3iQDgQle6ZGRrwoSKA SYhCACt5hvWcw== Received: by phobos.denx.de (Postfix, from userid 109) id 4600083C9E; Wed, 6 Apr 2022 07:32:50 +0200 (CEST) Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [91.198.250.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8772883C67 for ; Wed, 6 Apr 2022 07:32:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4KYCp471myz9sWX; Wed, 6 Apr 2022 07:32:44 +0200 (CEST) Message-ID: <1313e210-70fb-e862-c4bf-7a335513818c@denx.de> Date: Wed, 6 Apr 2022 07:32:40 +0200 MIME-Version: 1.0 Subject: Re: [RFC PATCH 4/7] spl: Convert mmc to spl_load Content-Language: en-US To: Sean Anderson , Simon Glass Cc: =?UTF-8?Q?Marek_Beh=c3=ban?= , u-boot@lists.denx.de, Marek Vasut , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20220401190405.1932697-1-sean.anderson@seco.com> <20220401190405.1932697-5-sean.anderson@seco.com> From: Stefan Roese In-Reply-To: <20220401190405.1932697-5-sean.anderson@seco.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 On 4/1/22 21:04, Sean Anderson wrote: > This converts the mmc loader to spl_load. Legacy images are handled by > spl_load (via spl_parse_image_header), so mmc_load_legacy can be > omitted. > > Signed-off-by: Sean Anderson Reviewed-by: Stefan Roese Thanks, Stefan > --- > > common/spl/spl_mmc.c | 73 ++++---------------------------------------- > 1 file changed, 6 insertions(+), 67 deletions(-) > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index 1c41d24ff4..113566166f 100644 > --- a/common/spl/spl_mmc.c > +++ b/common/spl/spl_mmc.c > @@ -17,48 +17,6 @@ > #include > #include > > -static int mmc_load_legacy(struct spl_image_info *spl_image, > - struct spl_boot_device *bootdev, > - struct mmc *mmc, > - ulong sector, struct image_header *header) > -{ > - u32 image_offset_sectors; > - u32 image_size_sectors; > - unsigned long count; > - u32 image_offset; > - int ret; > - > - ret = spl_parse_image_header(spl_image, bootdev, header); > - if (ret) > - return ret; > - > - /* convert offset to sectors - round down */ > - image_offset_sectors = spl_image->offset / mmc->read_bl_len; > - /* calculate remaining offset */ > - image_offset = spl_image->offset % mmc->read_bl_len; > - > - /* convert size to sectors - round up */ > - image_size_sectors = (spl_image->size + mmc->read_bl_len - 1) / > - mmc->read_bl_len; > - > - /* Read the header too to avoid extra memcpy */ > - count = blk_dread(mmc_get_blk_desc(mmc), > - sector + image_offset_sectors, > - image_size_sectors, > - (void *)(ulong)spl_image->load_addr); > - debug("read %x sectors to %lx\n", image_size_sectors, > - spl_image->load_addr); > - if (count != image_size_sectors) > - return -EIO; > - > - if (image_offset) > - memmove((void *)(ulong)spl_image->load_addr, > - (void *)(ulong)spl_image->load_addr + image_offset, > - spl_image->size); > - > - return 0; > -} > - > static ulong h_spl_load_read(struct spl_load_info *load, ulong sector, > ulong count, void *buf) > { > @@ -86,6 +44,11 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, > struct image_header *header; > struct blk_desc *bd = mmc_get_blk_desc(mmc); > int ret = 0; > + struct spl_load_info load = { > + .dev = mmc, > + .bl_len = mmc->read_bl_len, > + .read = h_spl_load_read, > + }; > > header = spl_get_load_buffer(-sizeof(*header), bd->blksz); > > @@ -97,31 +60,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, > goto end; > } > > - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && > - image_get_magic(header) == FDT_MAGIC) { > - struct spl_load_info load; > - > - debug("Found FIT\n"); > - load.dev = mmc; > - load.priv = NULL; > - load.filename = NULL; > - load.bl_len = mmc->read_bl_len; > - load.read = h_spl_load_read; > - ret = spl_load_simple_fit(spl_image, &load, sector, header); > - } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { > - struct spl_load_info load; > - > - load.dev = mmc; > - load.priv = NULL; > - load.filename = NULL; > - load.bl_len = mmc->read_bl_len; > - load.read = h_spl_load_read; > - > - ret = spl_load_imx_container(spl_image, &load, sector); > - } else { > - ret = mmc_load_legacy(spl_image, bootdev, mmc, sector, header); > - } > - > + ret = spl_load(spl_image, bootdev, &load, header, 0, sector); > end: > if (ret) { > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT Viele Grüße, Stefan Roese -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de