From patchwork Tue Apr 19 01:05:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 563304 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp2861124map; Mon, 18 Apr 2022 18:07:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqX8bGpXFabsSh/gQHDwlJC6rIenXNGFznXvPo6P2q20qBHS0IYbmlQYouxvSJVCljmMXE X-Received: by 2002:a17:906:c10b:b0:6e8:b306:f9d2 with SMTP id do11-20020a170906c10b00b006e8b306f9d2mr11111717ejc.498.1650330469684; Mon, 18 Apr 2022 18:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650330469; cv=none; d=google.com; s=arc-20160816; b=hqbGJ2flOLMuAFiw3KK5NN3tfKQmHjRbmzO5CKYAe5IKZlud5e5m0khwiQhUDFanWR 9UoFQNBxZrBk+9MnHu3emfFe3+lD62qTPJDpyDoP1td2+Y2OKCTk5v5eI7CU2xGAIzfm KR8HsIJB6IdsO9bHWCRIUsHC4xShhlzxN/ByFlPC5BOZohFtMHmtSzC05ViApw3UysMd GAxxKUYIBaa8iwuM6uwaAlKzVscS64BgiT1FzXaxgCUE7r0SMRdGSQtSRqKXzi65eoCn KrzGR/k/BFoSIkMxmnFa4mwh+LTxoxI11PCDgRSs5OqfpfGZlGV+KipvQIkHawnXI580 RvQw== 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=4wYb7tEoKo57lYnVDu9KLBr+sDHPj+ghJWaUwTkHj10=; b=b5zneY1dZkFEBDhX+KL4iPUGHZdgtA7oVc7kla04K6XAH/0v3UJY7WymjPfJB/6K5W n/T+7++BIqsdx6bnDzKEavgJCeIpqCNA19jj9jU0Sr6F1Mxhu+L0EFowOwX+mfpAdFs4 Y6R67h37t+/ubqqcDiK1e86YknJFwwnM0MguyFtNVPahpiyoi/mHx8Wmp9zuw4nShAsC Fjcrn6nGD5D9BtnwXDF47LiuiamnKpiL6xcDCJiHzTF3KEoc0tv9sDfUhczhtidaA//Q BEwAW6QaOgxyFZyDaHU4GJGbfipMrwivBwV8ZIFy8zOmBDD4l1/WAv7bl7w6rbP3u6Kp f+Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mmjy1TL3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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. [85.214.62.61]) by mx.google.com with ESMTPS id a8-20020aa7d748000000b0041f9bcdc712si7547314eds.472.2022.04.18.18.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 18:07:49 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mmjy1TL3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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 F17EB83DEB; Tue, 19 Apr 2022 03:07:17 +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="Mmjy1TL3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B201883D7A; Tue, 19 Apr 2022 03:06:12 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) (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 866E583D87 for ; Tue, 19 Apr 2022 03:06:06 +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=takahiro.akashi@linaro.org Received: by mail-pg1-x52a.google.com with SMTP id bg9so21961151pgb.9 for ; Mon, 18 Apr 2022 18:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4wYb7tEoKo57lYnVDu9KLBr+sDHPj+ghJWaUwTkHj10=; b=Mmjy1TL3yqLVYyTSpA/jRmyqDUYuVOphz8XFYb8kEzbrciR8APwr/femo6Vc8RS2UO ElfDdq4Pae4X73eMQwsiwF0Xrl0e1/a9mY3WDw85qEXjnCXQg6gqyKho5fkKx6S/9Iz1 0Cl06QD4jHyA7eETVaBJBugutP3SWy6VB3eYb/ZKJdH7ZmF/gblQDcVN6CAenQCStB/B KtC/+AAD91WyhLWOgjoqA+wLjF598XbaBrb88sutR9ubpXRtpN6boiO3tLrhFv2Utol8 s8ni4+PReS/WFyyaAbu2FRA/Lx5HvhudZQCiUUcEjqr8xVo0JRHiwcl6v1Hp6IHnmUmg Uaiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4wYb7tEoKo57lYnVDu9KLBr+sDHPj+ghJWaUwTkHj10=; b=P7jGrmIWqhQ473IJK85y980P5d2Ad5HtOcOc4hyNVibfL28rDjVJstxlm22l1lWP0/ B/+vT4p9X4VCaRFo5DV0R/ggfzTG2e6Ya/n7rOR+sRSeIsO7wa2gtYZ7Cjo7up42HSvc syKem0azUu4W303PntqNn600BqXlxFY/6/vQSUOxn9Vkh7/HQ3aGQ6DWpl6E76X0nhEF 5Y1Q5INkyGYbXel1D1E3fDFYJJTnFnN/xOxr/Fg3wFPzzD7UK6lBSDDYlQ3ixXkUHrcf sO2Ah4e9Kt8eY7U5/Z9oSzZDLNK4Qaf0Y0NHpsRs2ygk9dEg8195r279ZjPH4SsXUQDw 2aSA== X-Gm-Message-State: AOAM532T/u2eQVUIn6X9QdaSz/1hxi+LzviHLy1+u8gcfuK1FR1u3kIW BnJbl9WT6oOVJvS76fsPTfXNVA== X-Received: by 2002:a65:4381:0:b0:3a2:ca0a:7ed8 with SMTP id m1-20020a654381000000b003a2ca0a7ed8mr12188238pgp.15.1650330364361; Mon, 18 Apr 2022 18:06:04 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c3e1:100:5858:d3a6:5cad:ceeb]) by smtp.gmail.com with ESMTPSA id k137-20020a633d8f000000b0039800918b00sm14043756pga.77.2022.04.18.18.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 18:06:04 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, sjg@chromium.org, ilias.apalodimas@linaro.org Cc: masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v5 11/12] dm: disk: add read/write interfaces with udevice Date: Tue, 19 Apr 2022 10:05:16 +0900 Message-Id: <20220419010517.47175-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220419010517.47175-1-takahiro.akashi@linaro.org> References: <20220419010517.47175-1-takahiro.akashi@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.5 at phobos.denx.de X-Virus-Status: Clean In include/blk.h, Simon suggested: ===> /* * These functions should take struct udevice instead of struct blk_desc, * but this is convenient for migration to driver model. Add a 'd' prefix * to the function operations, so that blk_read(), etc. can be reserved for * functions with the correct arguments. */ unsigned long blk_dread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, void *buffer); unsigned long blk_dwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, const void *buffer); unsigned long blk_derase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt); <=== So new interfaces are provided with this patch. They are expected to be used everywhere in U-Boot at the end. The exceptions are block device drivers, partition drivers and efi_disk which should know details of blk_desc structure. Signed-off-by: AKASHI Takahiro --- disk/disk-uclass.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 7 ++++ 2 files changed, 101 insertions(+) diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index 4918a2f72d1e..72ff62ebf581 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -146,6 +146,100 @@ U_BOOT_DRIVER(blk_partition) = { .ops = &blk_part_ops, }; +/* + * BLOCK IO APIs + */ +static struct blk_desc *dev_get_blk(struct udevice *dev) +{ + struct blk_desc *block_dev; + + switch (device_get_uclass_id(dev)) { + /* + * We won't support UCLASS_BLK with dev_* interfaces. + */ + case UCLASS_PARTITION: + block_dev = dev_get_uclass_plat(dev_get_parent(dev)); + break; + default: + block_dev = NULL; + break; + } + + return block_dev; +} + +unsigned long dev_read(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, void *buffer) +{ + struct blk_desc *block_dev; + const struct blk_ops *ops; + struct disk_part *part; + lbaint_t start_in_disk; + ulong blks_read; + + block_dev = dev_get_blk(dev); + if (!block_dev) + return -ENOSYS; + + ops = blk_get_ops(dev); + if (!ops->read) + return -ENOSYS; + + start_in_disk = start; + if (device_get_uclass_id(dev) == UCLASS_PARTITION) { + part = dev_get_uclass_plat(dev); + start_in_disk += part->gpt_part_info.start; + } + + if (blkcache_read(block_dev->if_type, block_dev->devnum, + start_in_disk, blkcnt, block_dev->blksz, buffer)) + return blkcnt; + blks_read = ops->read(dev, start, blkcnt, buffer); + if (blks_read == blkcnt) + blkcache_fill(block_dev->if_type, block_dev->devnum, + start_in_disk, blkcnt, block_dev->blksz, buffer); + + return blks_read; +} + +unsigned long dev_write(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, const void *buffer) +{ + struct blk_desc *block_dev; + const struct blk_ops *ops; + + block_dev = dev_get_blk(dev); + if (!block_dev) + return -ENOSYS; + + ops = blk_get_ops(dev); + if (!ops->write) + return -ENOSYS; + + blkcache_invalidate(block_dev->if_type, block_dev->devnum); + + return ops->write(dev, start, blkcnt, buffer); +} + +unsigned long dev_erase(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt) +{ + struct blk_desc *block_dev; + const struct blk_ops *ops; + + block_dev = dev_get_blk(dev); + if (!block_dev) + return -ENOSYS; + + ops = blk_get_ops(dev); + if (!ops->erase) + return -ENOSYS; + + blkcache_invalidate(block_dev->if_type, block_dev->devnum); + + return ops->erase(dev, start, blkcnt); +} + UCLASS_DRIVER(partition) = { .id = UCLASS_PARTITION, .per_device_plat_auto = sizeof(struct disk_part), diff --git a/include/part.h b/include/part.h index c4e0bef7749d..4956cec314ed 100644 --- a/include/part.h +++ b/include/part.h @@ -306,6 +306,13 @@ struct udevice; */ int part_create_block_devices(struct udevice *blk_dev); +unsigned long dev_read(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, void *buffer); +unsigned long dev_write(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, const void *buffer); +unsigned long dev_erase(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt); + /* * We don't support printing partition information in SPL and only support * getting partition information in a few cases.