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 C3FC4C7EE21 for ; Thu, 4 May 2023 09:54:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE0128561F; Thu, 4 May 2023 11:53:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com 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=ventanamicro.com header.i=@ventanamicro.com header.b="DfJvOw2T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 30C258477B; Thu, 4 May 2023 11:53:48 +0200 (CEST) Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) (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 499858477B for ; Thu, 4 May 2023 11:53:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6436dfa15b3so220257b3a.1 for ; Thu, 04 May 2023 02:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1683194023; x=1685786023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E9HyfSFubHFFkQjEJneDVZ4OyP6j11lf0I0ob2SAe4I=; b=DfJvOw2T57UNXZ40DVT0aEunnltzbjeuIY1wBsGBo0VtuJdzSDJjoNqn6WhsPdsQkW YwfA58Jv8poTcEpmVqOdMczgtWCaBEQhpoeJXeWe58yT/5dZylCfN1D9eWnnZgTJQk1o LzOed1qyAr312rzQ+eB2lyQ91wxwGvxcq2MnLAlJ71RhW5HU8fBauC0dIE0o0+vRXaFd f+TsaB0duzT/1AlJLki5AKQdmhNM9NpCT8nkX3PtxgzxDc/7Fd+NLIaKET9kFZFQYYT6 pASDskGHKFHC/um/NwvfHGepfXOZUwD4LaReJnWBkE0mxnyXhYIxpyLX5w/NkgcQndSL BiZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683194023; x=1685786023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E9HyfSFubHFFkQjEJneDVZ4OyP6j11lf0I0ob2SAe4I=; b=fBraraelpOqBWe7ilowc59YJVUF7pakE9kUzmzKFrADlnSU2smW8Cf/xQ6zz6uipNW 9pjwSzRJfDWobLAF9fVejyKcoe5fNuqb4OE7UpXs/FKcvbGXDuux8urYfFOEPCCLkvw1 ev1MDWR12m7w7/WYPsMXpXxDOTeRuADgUAMMjQA9oZA2997j+r6f4LXNS9RB+HsdyHvN owE3AhqArjDaYtBjyiClYTcZIspzXegaqeejmcH0F7trYlJ4V6NyTKdUddL5srE28E/M Qoy+X1BVfsubHgXHKJ8YSWBcdSaG7nF/AmKgr2KiV/6J6UAmF/ckL26dtTTQ3AvUadD9 6YJg== X-Gm-Message-State: AC+VfDxzzcZPzfj3SYD6LKNbijXPNe3de1+LJO3pYJq0Sa5NMPboAY0v fcwAJG3f6kG/ODD+rpZCQbv0sQ== X-Google-Smtp-Source: ACHHUZ7eBIJUOZ9cHKMq/4eqMLdNDmnHEdYsPTb57Jd+fpXHWLtuNzwWdycL9TTNPv4C/qXbHmoupg== X-Received: by 2002:a05:6a20:7da6:b0:f0:2893:8a34 with SMTP id v38-20020a056a207da600b000f028938a34mr1638474pzj.52.1683194023586; Thu, 04 May 2023 02:53:43 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id w18-20020a63d752000000b0051b8172fa68sm21746267pgi.38.2023.05.04.02.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 02:53:43 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v3 2/5] spl: blk: Support loading images from fs Date: Thu, 4 May 2023 15:23:24 +0530 Message-Id: <20230504095327.2791676-3-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230504095327.2791676-1-mchitale@ventanamicro.com> References: <20230504095327.2791676-1-mchitale@ventanamicro.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Add a generic API to support loading of SPL payload from EXT or FAT filesystem on a given partition of a block device. Signed-off-by: Mayuresh Chitale --- common/spl/Makefile | 1 + common/spl/spl_blk_fs.c | 54 +++++++++++++++++++++++++++++++++++++++++ drivers/block/Kconfig | 7 ++++++ include/spl.h | 3 +++ 4 files changed, 65 insertions(+) create mode 100644 common/spl/spl_blk_fs.c diff --git a/common/spl/Makefile b/common/spl/Makefile index 13db3df993..5210ad0248 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -10,6 +10,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o +obj-$(CONFIG_$(SPL_TPL_)BLK_FS) += spl_blk_fs.o obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_FORMAT) += spl_legacy.o obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c new file mode 100644 index 0000000000..fb2e8bbea7 --- /dev/null +++ b/common/spl/spl_blk_fs.c @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 + * Ventana Micro Systems Inc. + * + * Derived work from spl_sata.c + */ + +#include +#include + +int spl_blk_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, + enum uclass_id uclass_id, int devnum) +{ + int ret = -ENOSYS, part; + struct blk_desc *blk_desc; + + blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum); + if (!blk_desc) + return ret; + + blk_show_device(uclass_id, devnum); + + if (IS_ENABLED(CONFIG_SPL_FS_EXT4)) { + switch (uclass_id) { + case UCLASS_NVME: + part = CONFIG_SYS_NVME_EXT_BOOT_PARTITION; + break; + default: + return ret; + } + ret = spl_load_image_ext(spl_image, bootdev, blk_desc, part, + CONFIG_SPL_PAYLOAD); + if (!ret) + return ret; + } + + if (IS_ENABLED(CONFIG_SPL_FS_FAT)) { + switch (uclass_id) { + case UCLASS_NVME: + part = CONFIG_SYS_NVME_FAT_BOOT_PARTITION; + break; + default: + return ret; + } + ret = spl_load_image_fat(spl_image, bootdev, blk_desc, part, + CONFIG_SPL_PAYLOAD); + if (!ret) + return ret; + } + + return ret; +} diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 5a1aeb3d2b..6baaa6f071 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -107,6 +107,13 @@ config EFI_MEDIA For sandbox there is a test driver. +config SPL_BLK_FS + bool "Load images from filesystems on block devices" + depends on SPL_BLK + help + Use generic support to load images from fat/ext filesystems on + different types of block devices such as NVMe. + if EFI_MEDIA config EFI_MEDIA_SANDBOX diff --git a/include/spl.h b/include/spl.h index 7e0f5ac63b..4546648394 100644 --- a/include/spl.h +++ b/include/spl.h @@ -672,6 +672,9 @@ int spl_load_image_ext(struct spl_image_info *spl_image, int spl_load_image_ext_os(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, struct blk_desc *block_dev, int partition); +int spl_blk_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, + enum uclass_id uclass_id, int devnum); /** * spl_early_init() - Set up device tree and driver model in SPL if enabled -- 2.34.1