From patchwork Wed Feb 1 18:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Waldekranz X-Patchwork-Id: 1735819 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=waldekranz-com.20210112.gappssmtp.com header.i=@waldekranz-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=DJ+l9ziy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P6VcQ5bYFz23gY for ; Thu, 2 Feb 2023 05:21:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43D5E85CA2; Wed, 1 Feb 2023 19:20:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=waldekranz.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=waldekranz-com.20210112.gappssmtp.com header.i=@waldekranz-com.20210112.gappssmtp.com header.b="DJ+l9ziy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0454A85C4E; Wed, 1 Feb 2023 19:10:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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 CDBC785C59 for ; Wed, 1 Feb 2023 19:10:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=waldekranz.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tobias@waldekranz.com Received: by mail-ed1-x52d.google.com with SMTP id fi26so18566073edb.7 for ; Wed, 01 Feb 2023 10:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20210112.gappssmtp.com; s=20210112; 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=jY8Gs29dbRAp3KtHxtIuCy/NNerSZ2Ws5EkpjAyA9fY=; b=DJ+l9ziyLiAC4B6jiv5NgDMFPjhqWTBJdVWPTAMBbu5elEkGCsvrfgFsbrmH2EF5nw SRPjZe1KP7Wlbo6VJKJ/pI0YwWFZiaHxPsB5dwGY9oBXCzrnu61C+RMFig6XANbeYUwi NLlb9eyp13WVYkY6G6MciCVfuf1sei2mrJhB5uE8lzc24wh719I8q9hxi7OM8lbjq0US 1g/+oGq8df2Bd3l1CCU/bHmKfzgXk7uzXyINvNALC9w5Uzl5f5GSDNZ4OnGVR9UjiFbB 5pcbMGZvBUA6oo/T9/K1NW//BuDxtjlK+ieVuOY/SIypmEzFkxO5fiV+u3B4Hfx1r7sD IIag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jY8Gs29dbRAp3KtHxtIuCy/NNerSZ2Ws5EkpjAyA9fY=; b=F3wYIry6R/+7ACXwkQtcSvZAKlN0NQ2/hk6LD6MGJiiCGO2d66Asl5bNxpP/0z4WL2 PhRsI9ZgYH0nXwVqxwDJhH3gZX8tR43X8EkXK7kbJz1eSIy0mYD+Yvr+WLoWeo/tXlvP Pd7yo2nRcoyOOJoQ9tpENxAUC2kc+YHZMgxk/UYdgYxY/0ETYZoc69YAmZ8s5wazq3fG UpAiiP/FaC7q7Zs4nJXlkwZRfDFQ8+y+4H9YBY/UVlj1pnkVE3ZkFkZRTeLftPO6FK76 fl9ypZawOLHygtO+oQ2vNd32jj8KOdA8vhqC9XB6eCdAG8XAWDSVBvWOEpGGV9pSbVZU EC/A== X-Gm-Message-State: AO0yUKVQg2V76cgM4ISu4/yayqImxnOM0F2JigRGUI2OZxRjXJCYb45t a2HwTvyY+5T0owItY1xsOSda0w== X-Google-Smtp-Source: AK7set/yyOr44JvEvuHXME14Lp4YA7FZtijbBVBrCwwc7Xp8c8i5wmqzGn+6KXCregyNbWJ/7kSA0g== X-Received: by 2002:a05:6402:1779:b0:4a2:3bef:e000 with SMTP id da25-20020a056402177900b004a23befe000mr2496109edb.42.1675275043305; Wed, 01 Feb 2023 10:10:43 -0800 (PST) Received: from wkz-x13.addiva.ad (h-98-128-229-186.NA.cust.bahnhof.se. [98.128.229.186]) by smtp.gmail.com with ESMTPSA id n3-20020a05640204c300b004a23609fab4sm5987171edw.70.2023.02.01.10.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:10:42 -0800 (PST) From: Tobias Waldekranz To: sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org Cc: u-boot@lists.denx.de Subject: [PATCH 4/8] blk: blkmap: Add memory mapping support Date: Wed, 1 Feb 2023 19:10:12 +0100 Message-Id: <20230201181016.4145834-5-tobias@waldekranz.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201181016.4145834-1-tobias@waldekranz.com> References: <20230201181016.4145834-1-tobias@waldekranz.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 01 Feb 2023 19:20:41 +0100 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 Allow a slice of RAM to be mapped to a blkmap. This means that RAM can now be accessed as if it was a block device, meaning that existing filesystem drivers can now be used to access ramdisks. Signed-off-by: Tobias Waldekranz --- drivers/block/blkmap.c | 106 +++++++++++++++++++++++++++++++++++++++++ include/blkmap.h | 4 ++ 2 files changed, 110 insertions(+) diff --git a/drivers/block/blkmap.c b/drivers/block/blkmap.c index a6ba07404c..c8c2dcac11 100644 --- a/drivers/block/blkmap.c +++ b/drivers/block/blkmap.c @@ -12,6 +12,7 @@ #include #include #include +#include #include struct blkmap; @@ -93,6 +94,111 @@ static int blkmap_add(struct blkmap *bm, struct blkmap_slice *new) return 0; } +struct blkmap_mem { + struct blkmap_slice slice; + void *addr; + bool remapped; +}; + +static ulong blkmap_mem_read(struct blkmap *bm, struct blkmap_slice *bms, + lbaint_t blknr, lbaint_t blkcnt, void *buffer) +{ + struct blkmap_mem *bmm = container_of(bms, struct blkmap_mem, slice); + struct blk_desc *bd = dev_get_uclass_plat(bm->dev); + char *src; + + src = bmm->addr + (blknr << bd->log2blksz); + memcpy(buffer, src, blkcnt << bd->log2blksz); + return blkcnt; +} + +static ulong blkmap_mem_write(struct blkmap *bm, struct blkmap_slice *bms, + lbaint_t blknr, lbaint_t blkcnt, + const void *buffer) +{ + struct blkmap_mem *bmm = container_of(bms, struct blkmap_mem, slice); + struct blk_desc *bd = dev_get_uclass_plat(bm->dev); + char *dst; + + dst = bmm->addr + (blknr << bd->log2blksz); + memcpy(dst, buffer, blkcnt << bd->log2blksz); + return blkcnt; +} + +static void blkmap_mem_destroy(struct blkmap *bm, struct blkmap_slice *bms) +{ + struct blkmap_mem *bmm = container_of(bms, struct blkmap_mem, slice); + + if (bmm->remapped) + unmap_sysmem(bmm->addr); +} + +int __blkmap_map_mem(int devnum, lbaint_t blknr, lbaint_t blkcnt, void *addr, + bool remapped) +{ + struct blkmap_mem *bmm; + struct blkmap *bm; + int err; + + bm = blkmap_from_devnum(devnum); + if (!bm) + return -ENODEV; + + bmm = malloc(sizeof(*bmm)); + if (!bmm) + return -ENOMEM; + + *bmm = (struct blkmap_mem) { + .slice = { + .blknr = blknr, + .blkcnt = blkcnt, + + .read = blkmap_mem_read, + .write = blkmap_mem_write, + .destroy = blkmap_mem_destroy, + }, + + .addr = addr, + .remapped = remapped, + }; + + err = blkmap_add(bm, &bmm->slice); + if (err) + free(bmm); + + return err; +} + +int blkmap_map_mem(int devnum, lbaint_t blknr, lbaint_t blkcnt, void *addr) +{ + return __blkmap_map_mem(devnum, blknr, blkcnt, addr, false); +} + +int blkmap_map_pmem(int devnum, lbaint_t blknr, lbaint_t blkcnt, + phys_addr_t paddr) +{ + struct blk_desc *bd; + struct blkmap *bm; + void *addr; + int err; + + bm = blkmap_from_devnum(devnum); + if (!bm) + return -ENODEV; + + bd = dev_get_uclass_plat(bm->dev); + + addr = map_sysmem(paddr, blkcnt << bd->log2blksz); + if (!addr) + return -ENOMEM; + + err = __blkmap_map_mem(devnum, blknr, blkcnt, addr, true); + if (err) + unmap_sysmem(addr); + + return err; +} + static struct udevice *blkmap_root(void) { static struct udevice *dev; diff --git a/include/blkmap.h b/include/blkmap.h index 37c0c31c3f..a93611ff62 100644 --- a/include/blkmap.h +++ b/include/blkmap.h @@ -9,6 +9,10 @@ #include +int blkmap_map_mem(int devnum, lbaint_t blknr, lbaint_t blkcnt, void *addr); +int blkmap_map_pmem(int devnum, lbaint_t blknr, lbaint_t blkcnt, + phys_addr_t paddr); + int blkmap_create(int devnum); int blkmap_destroy(int devnum);