From patchwork Mon Oct 16 04:23:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 734009 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1045:b0:32d:baff:b0ca with SMTP id c5csp34395wrx; Sun, 15 Oct 2023 21:27:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5IPgu6Z/2C/sVS3WH7tr8+0MnLk4StHEN9c7Ytok0IR7HdoWBatoLV8vDgypei6KS8sGl X-Received: by 2002:adf:e808:0:b0:32d:aabf:1db3 with SMTP id o8-20020adfe808000000b0032daabf1db3mr2314444wrm.24.1697430451746; Sun, 15 Oct 2023 21:27:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697430451; cv=none; d=google.com; s=arc-20160816; b=L8zbEiKtFuiv4GTvo18szuCO6oQN/sVCm3269GE0zIt67Op+T2u0YnpTvmz3U9XXVQ rTcJ1O0E/xCYPr7pkKMq0+mMgPezwYHdBsA7V+PLh0qmATA8o8hi9gtRVB8wOt5HiS3K yz88PqQXPOUQCMDXBRmKr8I0BxeXEcQQElvDx2t00np2syhjT9C2usSR4NpHo5pqUOI7 Twkguy5dsn+rCBnTIeogCP36dlWHzMfqN1nm/ju14zgXAVyTQQTMoQ7bW1o9nvbbyDSu jbrQt2PY33vImItOesH4FKhDLGbfKKYmPZhRIG9Q8cQFVhLTH6LkfnXweaVIW71Le5C+ 2UWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h+uhty0GdC8R49rdJSut4WnZ0t+PDDOC92B5xrfeuT0=; fh=nGxKOXCACQSu1eN/ZPnZQwsIMUpKToCCLMDjTFnWWa4=; b=UA9aOUfytc/cpIWnlSwFpWikPy9GHOvq6mff3duLGBeET9HN+RXv5oUg3+37N3TgUC V4qhM3DiVndeBddLaSOFPYNEpWiSkV5dTe1S6bZw3Nn2z96W4jWZu6ARZnzw9eJUUPVl drrtVQGX/jozW3vCTFpmSi/HkwI0pBMiuYtMeet7eoFZntHPCZr1unHFs9EslA91Ryhj guNFqxqfEPKWGbP1x59okCixayBt3afFjRDERQnILtHTQpAm1fWRAUR9XQsBJD9OlZ3Z oaMeCZn0rB3THMJUVC5dUU9ZOiND9JpbxEWjfam8ftci+UCv2CM85ncSqZ+wpYX2fatA ArEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WtkLRp9u; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id dl6-20020a0560000b8600b0031f85d91bc0si2155821wrb.834.2023.10.15.21.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 21:27:31 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WtkLRp9u; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5ABA86DDE; Mon, 16 Oct 2023 06:25:38 +0200 (CEST) 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="WtkLRp9u"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E44086DCB; Mon, 16 Oct 2023 06:24:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oo1-xc2d.google.com (mail-oo1-xc2d.google.com [IPv6:2607:f8b0:4864:20::c2d]) (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 35ACC86B97 for ; Mon, 16 Oct 2023 06:24:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masahisa.kojima@linaro.org Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-57b5f0d658dso2487078eaf.0 for ; Sun, 15 Oct 2023 21:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697430267; x=1698035067; darn=lists.denx.de; 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=h+uhty0GdC8R49rdJSut4WnZ0t+PDDOC92B5xrfeuT0=; b=WtkLRp9uvJlTiYK9pk2SFm9Hh0aKNinoodwwP/ouRwA+j0aUPAhN5lFTAilgJs7XPV WVIle7aNxm484Ja1H4YpQJM36bAYZaWZwCJCQ4abbU1bJkAsGOeLN+5F29PVoJ2hkIr4 YhVgKulNa5tNQSKSsZv2YymJJmeR2K/QeQ9SiamjdW8cuFaAxFFfhjsAcj0iyQeXg99O IY0ome+GqsHBL8mmGzbVOWUpqcr6MR5TCYy0xwabjFvuhUzxIXGBjNqfp8rOyi07HMUK fsv0WEiZgNVAF+n3g9ELes7DNxKAM3QbPe6932iN6bBc84xC4jB714LrKnkuvknuBUCE zdDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697430267; x=1698035067; 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=h+uhty0GdC8R49rdJSut4WnZ0t+PDDOC92B5xrfeuT0=; b=bCuTRpq49JpVFZCjFKYeyczrdO6GDjwPgV/YrkwzAqMS1oM6tiQ6yAYBRuc9M7wZ7w QtOqvuLFEINSu3QP+US51QL9H4q1iYn01/VhcxxaJnQCSV7jghZQ5zXrLyn4h90BPl5B uTAuSIsUTJUyd2kI1Ur79ktMyWCf/CVzz6wO7CSz1/hGsNftoTi7U4RJyM2TigBz+t59 7Sh6isZmwOAL4H+v5lPjCCtVElxXh7NMEoMzCq6uWvNhF5MBIU8QQk+R1vlrclX53QUX rmPyU+WSct0+VrJ/o0CA9ZIr/KK2Hhv89/815DW8mAlWd8qIUlaNRSgduT3P6TQWCSFi 15xQ== X-Gm-Message-State: AOJu0Yy8zOcQ8PN+Js1SrAHcSmXzakZOd4Ff8KxRnFTe6BKOBWkHQuTh 6Dim8DK16TRgTu+RZ7eoF2FfisoCzJRZm/Vob4s= X-Received: by 2002:a05:6358:99a8:b0:141:d2d:6da7 with SMTP id j40-20020a05635899a800b001410d2d6da7mr36421816rwb.17.1697430267537; Sun, 15 Oct 2023 21:24:27 -0700 (PDT) Received: from localhost ([164.70.16.189]) by smtp.gmail.com with ESMTPSA id b17-20020aa78ed1000000b006bae6eea9d0sm3046763pfr.49.2023.10.15.21.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 21:24:26 -0700 (PDT) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Michal Simek , Masahisa Kojima , Tobias Waldekranz , Jaehoon Chung Subject: [RESEND PATCH v6 3/9] blk: blkmap: add ramdisk creation utility function Date: Mon, 16 Oct 2023 13:23:02 +0900 Message-Id: <20231016042309.2386387-4-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231016042309.2386387-1-masahisa.kojima@linaro.org> References: <20231016042309.2386387-1-masahisa.kojima@linaro.org> MIME-Version: 1.0 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 User needs to call several functions to create the ramdisk with blkmap. This adds the utility function to create blkmap device and mount the ramdisk. Signed-off-by: Masahisa Kojima Reviewed-by: Simon Glass Reviewed-by: Ilias Apalodimas --- drivers/block/Makefile | 3 +- drivers/block/blkmap.c | 15 ---------- drivers/block/blkmap_helper.c | 53 +++++++++++++++++++++++++++++++++++ include/blkmap.h | 29 +++++++++++++++++++ 4 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 drivers/block/blkmap_helper.c diff --git a/drivers/block/Makefile b/drivers/block/Makefile index a161d145fd..ec0575d135 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -14,7 +14,8 @@ obj-$(CONFIG_IDE) += ide.o endif obj-$(CONFIG_SANDBOX) += sandbox.o host-uclass.o host_dev.o obj-$(CONFIG_$(SPL_TPL_)BLOCK_CACHE) += blkcache.o -obj-$(CONFIG_BLKMAP) += blkmap.o +obj-$(CONFIG_$(SPL_TPL_)BLKMAP) += blkmap.o +obj-$(CONFIG_$(SPL_TPL_)BLKMAP) += blkmap_helper.o obj-$(CONFIG_EFI_MEDIA) += efi-media-uclass.o obj-$(CONFIG_EFI_MEDIA_SANDBOX) += sb_efi_media.o diff --git a/drivers/block/blkmap.c b/drivers/block/blkmap.c index 149a4cac3e..21201409ed 100644 --- a/drivers/block/blkmap.c +++ b/drivers/block/blkmap.c @@ -66,21 +66,6 @@ struct blkmap_slice { void (*destroy)(struct blkmap *bm, struct blkmap_slice *bms); }; -/** - * struct blkmap - Block map - * - * Data associated with a blkmap. - * - * @label: Human readable name of this blkmap - * @blk: Underlying block device - * @slices: List of slices associated with this blkmap - */ -struct blkmap { - char *label; - struct udevice *blk; - struct list_head slices; -}; - static bool blkmap_slice_contains(struct blkmap_slice *bms, lbaint_t blknr) { return (blknr >= bms->blknr) && (blknr < (bms->blknr + bms->blkcnt)); diff --git a/drivers/block/blkmap_helper.c b/drivers/block/blkmap_helper.c new file mode 100644 index 0000000000..0f80035f57 --- /dev/null +++ b/drivers/block/blkmap_helper.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * blkmap helper function + * + * Copyright (c) 2023, Linaro Limited + */ + +#include +#include +#include +#include + +int blkmap_create_ramdisk(const char *label, ulong image_addr, int image_size, + struct udevice **devp) +{ + int ret; + lbaint_t blknum; + struct blkmap *bm; + struct blk_desc *desc; + struct udevice *bm_dev; + + ret = blkmap_create(label, &bm_dev); + if (ret) { + log_err("failed to create blkmap\n"); + return ret; + } + + bm = dev_get_plat(bm_dev); + desc = dev_get_uclass_plat(bm->blk); + blknum = image_size >> desc->log2blksz; + ret = blkmap_map_pmem(bm_dev, 0, blknum, image_addr); + if (ret) { + log_err("Unable to map %#llx at block %d : %d\n", + (unsigned long long)image_addr, 0, ret); + goto err; + } + log_info("Block %d+0x" LBAF " mapped to %#llx\n", 0, blknum, + (unsigned long long)image_addr); + + ret = device_probe(bm->blk); + if (ret) + goto err; + + if (devp) + *devp = bm_dev; + + return 0; + +err: + blkmap_destroy(bm_dev); + + return ret; +} diff --git a/include/blkmap.h b/include/blkmap.h index af54583c7d..0d87e6db6b 100644 --- a/include/blkmap.h +++ b/include/blkmap.h @@ -7,6 +7,23 @@ #ifndef _BLKMAP_H #define _BLKMAP_H +#include + +/** + * struct blkmap - Block map + * + * Data associated with a blkmap. + * + * @label: Human readable name of this blkmap + * @blk: Underlying block device + * @slices: List of slices associated with this blkmap + */ +struct blkmap { + char *label; + struct udevice *blk; + struct list_head slices; +}; + /** * blkmap_map_linear() - Map region of other block device * @@ -74,4 +91,16 @@ int blkmap_create(const char *label, struct udevice **devp); */ int blkmap_destroy(struct udevice *dev); +/** + * blkmap_create_ramdisk() - Create new ramdisk with blkmap + * + * @label: Label of the new blkmap + * @image_addr: Target memory start address of this mapping + * @image_size: Target memory size of this mapping + * @devp: Updated with the address of the created blkmap device + * Returns: 0 on success, negative error code on failure + */ +int blkmap_create_ramdisk(const char *label, ulong image_addr, int image_size, + struct udevice **devp); + #endif /* _BLKMAP_H */