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 AF7BEC433F5 for ; Thu, 14 Apr 2022 06:17:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36D5783E8E; Thu, 14 Apr 2022 08:17:51 +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="akKm/hR/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 03AB983E86; Thu, 14 Apr 2022 08:17:49 +0200 (CEST) Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 AE23183E8A for ; Thu, 14 Apr 2022 08:17:45 +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-pj1-x1031.google.com with SMTP id a16-20020a17090a6d9000b001c7d6c1bb13so4738746pjk.4 for ; Wed, 13 Apr 2022 23:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=mnBHko/0F/hPEnO1XtVFPDdPa9VWECpZEq4AG1mNb/s=; b=akKm/hR/tB28cWUvAYFSR2nQ1m2Rr9eiCGIOMa03zVNehi9o1c1CMk924qFE3mua3Y KRSwwwkwtidSz9pJjv5dMkcSCSoS7STJUjSGOaaJvWkqSyd4qDCNtKK7yiYXAMQsa29q QjCkRYvLwcJh9mg+z/aKVsI+oXl6RXzv/zFM2BZFa0SMWNmVaT8SH/T9dgTHh1oGDaS/ 6/ggPrmaMNYDq+hCEvPdfRLGboPxnCTsegG9EAzl1oXCsC/5sN4IwakAfcCw1XiNFLeR z/OCIe/E474Vuo58i5NogoS3urYMaxIqxP6/4HZ1WCt2DArr2lLlZutaYupO/JT22ENq CNHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=mnBHko/0F/hPEnO1XtVFPDdPa9VWECpZEq4AG1mNb/s=; b=6s34GkU9xMk4uwknLnk7gubUrufMQiQPskNSuOcByKntqyuVN5+zSXRDApEV82EY/J zsh+DinbWJ6wU4VETdW5ql06V+XAk417sjSV0UcGhxqx0GqP4Bq8HuYpwxC+rNDmLQM1 uUo3ju4TsjKbijmiaNZkLE921m/oFbozgEcLFHVScNYQtjc0yp0Qf041SazS8P6A4yhG 9TEFEq1ZzTwliDRjp6P6gHEJbL4DPAJ1RqhpE14A5UU0lQwYRX7KqjpYnUDgsLZUe6D7 pAv4nV/Gx+5nJ3ioYgbGGXItIUGygRYlOqbGAjYUewICUcFuAS6d2sCHQTY5HuL88REK VpFQ== X-Gm-Message-State: AOAM532+BdCn3C9atgjPgTWiGme5f0S9eSHtqIjf1cBDU0jujScxZiZv uWq+1J/fwaGCsYB4wvUidPEMdQ== X-Google-Smtp-Source: ABdhPJzKNfNigzkxOcfU0lAWfg22RCbiwdAG60n4aWq76CYTtz2aAxVg85bSBbEbmSm8aG2FtfCaAg== X-Received: by 2002:a17:90a:fac:b0:1ca:5eb8:f3b2 with SMTP id 41-20020a17090a0fac00b001ca5eb8f3b2mr2109485pjz.37.1649917063964; Wed, 13 Apr 2022 23:17:43 -0700 (PDT) Received: from laputa ([2400:4050:c3e1:100:71b6:233e:407:5693]) by smtp.gmail.com with ESMTPSA id o1-20020a637e41000000b003804d0e2c9esm919246pgn.35.2022.04.13.23.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 23:17:43 -0700 (PDT) Date: Thu, 14 Apr 2022 15:17:38 +0900 From: AKASHI Takahiro To: Heinrich Schuchardt , sjg@chromium.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de, lukma@denx.de, peng.fan@nxp.com, jh80.chung@samsung.com, bmeng.cn@gmail.com, sr@denx.de, ilias.apalodimas@linaro.org Subject: Re: [PATCH v3 11/19] dm: disk: add UCLASS_PARTITION Message-ID: <20220414061738.GC32435@laputa> Mail-Followup-To: AKASHI Takahiro , Heinrich Schuchardt , sjg@chromium.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de, lukma@denx.de, peng.fan@nxp.com, jh80.chung@samsung.com, bmeng.cn@gmail.com, sr@denx.de, ilias.apalodimas@linaro.org References: <20220308113657.221101-1-takahiro.akashi@linaro.org> <20220308113657.221101-12-takahiro.akashi@linaro.org> <20220413031600.GA74827@laputa> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220413031600.GA74827@laputa> 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 Wed, Apr 13, 2022 at 12:16:00PM +0900, AKASHI Takahiro wrote: > Heinrich, > (and Simon) > > On Sat, Apr 09, 2022 at 09:05:07PM +0200, Heinrich Schuchardt wrote: > > On 3/8/22 12:36, AKASHI Takahiro wrote: > > > With this new function, UCLASS_PARTITION devices will be created as > > > child nodes of UCLASS_BLK device. > > > > > > Signed-off-by: AKASHI Takahiro > > > --- > > > disk/Makefile | 3 + > > > disk/disk-uclass.c | 153 +++++++++++++++++++++++++++++++++++++++++ > > > include/dm/uclass-id.h | 1 + > > > include/part.h | 11 +++ > > > 4 files changed, 168 insertions(+) > > > create mode 100644 disk/disk-uclass.c > > > > > > diff --git a/disk/Makefile b/disk/Makefile > > > index 6ce5a687b36c..ec37b74f5f40 100644 > > > --- a/disk/Makefile > > > +++ b/disk/Makefile > > > @@ -6,6 +6,9 @@ > > > #ccflags-y += -DET_DEBUG -DDEBUG > > > > > > obj-$(CONFIG_PARTITIONS) += part.o > > > +ifdef CONFIG_$(SPL_)BLK > > > +obj-$(CONFIG_PARTITIONS) += disk-uclass.o > > > > phycore-rk3288_defconfig has CONFIG_SPL_LIBDISK_SUPPORT=n ("Support disk > > partitions"). > > I think that SPL_LIBDISK_SUPPORT no longer make any sense and is obsolete. > > > But spl/disk/disk-uclass is built. > > Right, but what is strange is: > - SPL_PARTITION is enabled by "default y if PARTITONS", while > - none of any particular partition types is enabled for spl > due to *explicit* disablement of > # CONFIG_SPL_DOS_PARTITION is not set > # CONFIG_SPL_EFI_PARTITION is not set > in phycore-rk3288_defconfig. > > I think that disk/Kconfig should be revised. I still believe so, but we can also fix the issue specifically on rk3288 by adding # CONFIG_SPL_PARTITIONS is not set # CONFIG_TPL_PARTITIONS is not set to phycore-rk3288_defconfig. Are you satisfied with this solution? -Takahiro Akashi > -Takahiro Akashi > > > This leads to an unnecessary size increase of the SPL image. > > With this size increase building fails. > > > > Best regards > > > > Heinrich > > > > > +endif > > > obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o > > > obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o > > > obj-$(CONFIG_$(SPL_)ISO_PARTITION) += part_iso.o > > > diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c > > > new file mode 100644 > > > index 000000000000..4918a2f72d1e > > > --- /dev/null > > > +++ b/disk/disk-uclass.c > > > @@ -0,0 +1,153 @@ > > > +// SPDX-License-Identifier: GPL-2.0+ > > > +/* > > > + * Software partition device (UCLASS_PARTITION) > > > + * > > > + * Copyright (c) 2021 Linaro Limited > > > + * Author: AKASHI Takahiro > > > + */ > > > + > > > +#define LOG_CATEGORY UCLASS_PARTITION > > > + > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > + > > > +int part_create_block_devices(struct udevice *blk_dev) > > > +{ > > > + int part, count; > > > + struct blk_desc *desc = dev_get_uclass_plat(blk_dev); > > > + struct disk_partition info; > > > + struct disk_part *part_data; > > > + char devname[32]; > > > + struct udevice *dev; > > > + int ret; > > > + > > > + if (!CONFIG_IS_ENABLED(PARTITIONS) || > > > + !CONFIG_IS_ENABLED(HAVE_BLOCK_DEVICE)) > > > + return 0; > > > + > > > + if (device_get_uclass_id(blk_dev) != UCLASS_BLK) > > > + return 0; > > > + > > > + /* Add devices for each partition */ > > > + for (count = 0, part = 1; part <= MAX_SEARCH_PARTITIONS; part++) { > > > + if (part_get_info(desc, part, &info)) > > > + continue; > > > + snprintf(devname, sizeof(devname), "%s:%d", blk_dev->name, > > > + part); > > > + > > > + ret = device_bind_driver(blk_dev, "blk_partition", > > > + strdup(devname), &dev); > > > + if (ret) > > > + return ret; > > > + > > > + part_data = dev_get_uclass_plat(dev); > > > + part_data->partnum = part; > > > + part_data->gpt_part_info = info; > > > + count++; > > > + > > > + ret = device_probe(dev); > > > + if (ret) { > > > + debug("Can't probe\n"); > > > + count--; > > > + device_unbind(dev); > > > + > > > + continue; > > > + } > > > + } > > > + debug("%s: %d partitions found in %s\n", __func__, count, > > > + blk_dev->name); > > > + > > > + return 0; > > > +} > > > + > > > +static ulong blk_part_read(struct udevice *dev, lbaint_t start, > > > + lbaint_t blkcnt, void *buffer) > > > +{ > > > + struct udevice *parent; > > > + struct disk_part *part; > > > + const struct blk_ops *ops; > > > + > > > + parent = dev_get_parent(dev); > > > + ops = blk_get_ops(parent); > > > + if (!ops->read) > > > + return -ENOSYS; > > > + > > > + part = dev_get_uclass_plat(dev); > > > + if (start >= part->gpt_part_info.size) > > > + return 0; > > > + > > > + if ((start + blkcnt) > part->gpt_part_info.size) > > > + blkcnt = part->gpt_part_info.size - start; > > > + start += part->gpt_part_info.start; > > > + > > > + return ops->read(parent, start, blkcnt, buffer); > > > +} > > > + > > > +static ulong blk_part_write(struct udevice *dev, lbaint_t start, > > > + lbaint_t blkcnt, const void *buffer) > > > +{ > > > + struct udevice *parent; > > > + struct disk_part *part; > > > + const struct blk_ops *ops; > > > + > > > + parent = dev_get_parent(dev); > > > + ops = blk_get_ops(parent); > > > + if (!ops->write) > > > + return -ENOSYS; > > > + > > > + part = dev_get_uclass_plat(dev); > > > + if (start >= part->gpt_part_info.size) > > > + return 0; > > > + > > > + if ((start + blkcnt) > part->gpt_part_info.size) > > > + blkcnt = part->gpt_part_info.size - start; > > > + start += part->gpt_part_info.start; > > > + > > > + return ops->write(parent, start, blkcnt, buffer); > > > +} > > > + > > > +static ulong blk_part_erase(struct udevice *dev, lbaint_t start, > > > + lbaint_t blkcnt) > > > +{ > > > + struct udevice *parent; > > > + struct disk_part *part; > > > + const struct blk_ops *ops; > > > + > > > + parent = dev_get_parent(dev); > > > + ops = blk_get_ops(parent); > > > + if (!ops->erase) > > > + return -ENOSYS; > > > + > > > + part = dev_get_uclass_plat(dev); > > > + if (start >= part->gpt_part_info.size) > > > + return 0; > > > + > > > + if ((start + blkcnt) > part->gpt_part_info.size) > > > + blkcnt = part->gpt_part_info.size - start; > > > + start += part->gpt_part_info.start; > > > + > > > + return ops->erase(parent, start, blkcnt); > > > +} > > > + > > > +static const struct blk_ops blk_part_ops = { > > > + .read = blk_part_read, > > > + .write = blk_part_write, > > > + .erase = blk_part_erase, > > > +}; > > > + > > > +U_BOOT_DRIVER(blk_partition) = { > > > + .name = "blk_partition", > > > + .id = UCLASS_PARTITION, > > > + .ops = &blk_part_ops, > > > +}; > > > + > > > +UCLASS_DRIVER(partition) = { > > > + .id = UCLASS_PARTITION, > > > + .per_device_plat_auto = sizeof(struct disk_part), > > > + .name = "partition", > > > +}; > > > diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h > > > index 0e26e1d13824..230b1ea528cf 100644 > > > --- a/include/dm/uclass-id.h > > > +++ b/include/dm/uclass-id.h > > > @@ -83,6 +83,7 @@ enum uclass_id { > > > UCLASS_P2SB, /* (x86) Primary-to-Sideband Bus */ > > > UCLASS_PANEL, /* Display panel, such as an LCD */ > > > UCLASS_PANEL_BACKLIGHT, /* Backlight controller for panel */ > > > + UCLASS_PARTITION, /* Logical disk partition device */ > > > UCLASS_PCH, /* x86 platform controller hub */ > > > UCLASS_PCI, /* PCI bus */ > > > UCLASS_PCI_EP, /* PCI endpoint device */ > > > diff --git a/include/part.h b/include/part.h > > > index 53cfbdd87671..95e30e60af10 100644 > > > --- a/include/part.h > > > +++ b/include/part.h > > > @@ -253,6 +253,17 @@ void part_set_generic_name(const struct blk_desc *dev_desc, > > > int part_num, char *name); > > > > > > extern const struct block_drvr block_drvr[]; > > > + > > > +struct udevice; > > > +/** > > > + * part_create_block_devices - Create block devices for disk partitions > > > + * > > > + * Create UCLASS_PARTITION udevices for each of disk partitions in @parent > > > + * > > > + * @blk_dev: Whole disk device > > > + */ > > > +int part_create_block_devices(struct udevice *blk_dev); > > > + > > > #else > > > static inline struct blk_desc *blk_get_dev(const char *ifname, int dev) > > > { return NULL; } > >