From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 01 Jun 2023 12:34:34 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4fdc-005fov-5e for lore@lore.pengutronix.de; Thu, 01 Jun 2023 12:34:34 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4fdZ-00084J-9m for lore@pengutronix.de; Thu, 01 Jun 2023 12:34:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:References:Cc:To:From:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/22XrGN2buD93+SlkNaJWFnVOo/YrYWjcN/i5Ov2g0M=; b=FmVAvcnv8fjc00mAYCMyvOeLN7 CrDaFGNLOuln2U6DXUah3LExcOrNwU6c7HyyzLKzA2dwOy99sssL/52Zs8hlIvCdc4QicgknUtReW aeYcXomVT6tKTTJw6yiQeeEVjmUjtWaTzrY5yF/ngj3Es+cawUtFq0vn2GMc4H240Vap/oHKa4goz hgJgasd4FGEAtNPhJZm5tUGDVJ6A03rg9bxW1ZN1/YKFAgA0WgpRD9BEA7DH72AA2OHq70z4lkKA6 iX1s+1x8T6OMrEMtw22rmSbtI1UoQDIVfBWtHccCKgbLOHQRJzHIaK684fv2Sm6i4fSlg1mTnc/LA 5cyb/uxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4fcO-00347C-1D; Thu, 01 Jun 2023 10:33:20 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4fcL-00344L-25 for barebox@lists.infradead.org; Thu, 01 Jun 2023 10:33:19 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q4fcK-0007vc-5N; Thu, 01 Jun 2023 12:33:16 +0200 Message-ID: <32d84037-7af6-9453-9b51-ead44715ef5b@pengutronix.de> Date: Thu, 1 Jun 2023 12:33:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US From: Ahmad Fatoum To: =?UTF-8?Q?Ulrich_=c3=96lmann?= Cc: barebox@lists.infradead.org References: <20230531145927.1399282-1-a.fatoum@pengutronix.de> <20230531145927.1399282-12-a.fatoum@pengutronix.de> <6r4jnr4mie.fsf@pengutronix.de> <16c4cd3f-102b-9c3d-223c-03ab1325cf66@pengutronix.de> In-Reply-To: <16c4cd3f-102b-9c3d-223c-03ab1325cf66@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230601_033317_682258_AD1AF662 X-CRM114-Status: GOOD ( 24.23 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 11/18] block: parse partition table on block device registration X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 01.06.23 10:31, Ahmad Fatoum wrote: > On 01.06.23 10:24, Ulrich Ölmann wrote: >> Hi Ahmad, >> >> again a small typo: >> >> On Wed, May 31 2023 at 16:59 +0200, Ahmad Fatoum wrote: >>> Every instance where we register a block device, it's followed by an >> >> s/device, it's/device is/ > > I don't think that's correct. Should I change it to be On every instance [...]? I see what you mean now. "Every instance [ ... ] is" is what I meant to say. I will change it and add a comma before, where. Thanks! Ahmad > > Thanks, > Ahmad > >> >> Best regards >> Ulrich >> >> >>> attempt to parse the partition table, most often with a warning when >>> it fails. Thus let's move partition table parsing into >>> blockdevice_register. >>> >>> Signed-off-by: Ahmad Fatoum >>> --- >>> arch/sandbox/board/hostfile.c | 4 ---- >>> common/block.c | 6 ++++++ >>> drivers/ata/disk_ata_drive.c | 5 ----- >>> drivers/block/efi-block-io.c | 9 +-------- >>> drivers/block/virtio_blk.c | 8 +------- >>> drivers/mci/mci-core.c | 6 ------ >>> drivers/nvme/host/core.c | 5 ----- >>> drivers/usb/storage/usb.c | 5 ----- >>> 8 files changed, 8 insertions(+), 40 deletions(-) >>> >>> diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c >>> index d0f400787d7a..a1ab06b87770 100644 >>> --- a/arch/sandbox/board/hostfile.c >>> +++ b/arch/sandbox/board/hostfile.c >>> @@ -166,10 +166,6 @@ static int hf_probe(struct device *dev) >>> if (err) >>> return err; >>> >>> - err = parse_partition_table(&priv->blk); >>> - if (err) >>> - dev_warn(dev, "No partition table found\n"); >>> - >>> dev_info(dev, "registered as block device\n"); >>> } else { >>> cdev->name = np->name; >>> diff --git a/common/block.c b/common/block.c >>> index c39269d3a692..98adcfdf3dab 100644 >>> --- a/common/block.c >>> +++ b/common/block.c >>> @@ -6,6 +6,7 @@ >>> */ >>> #include >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -408,6 +409,11 @@ int blockdevice_register(struct block_device *blk) >>> >>> cdev_create_default_automount(&blk->cdev); >>> >>> + /* Lack of partition table is unusual, but not a failure */ >>> + ret = parse_partition_table(blk); >>> + if (ret) >>> + dev_warn(blk->dev, "No partition table found\n"); >>> + >>> return 0; >>> } >>> >>> diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c >>> index c1c736a0a88a..2d97710b827a 100644 >>> --- a/drivers/ata/disk_ata_drive.c >>> +++ b/drivers/ata/disk_ata_drive.c >>> @@ -254,11 +254,6 @@ static int ata_port_init(struct ata_port *port) >>> >>> dev_info(dev, "registered /dev/%s\n", port->blk.cdev.name); >>> >>> - /* create partitions on demand */ >>> - rc = parse_partition_table(&port->blk); >>> - if (rc != 0) >>> - dev_warn(dev, "No partition table found\n"); >>> - >>> return 0; >>> >>> on_error: >>> diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c >>> index eb4981e86298..7162106ab8ea 100644 >>> --- a/drivers/block/efi-block-io.c >>> +++ b/drivers/block/efi-block-io.c >>> @@ -12,7 +12,6 @@ >>> #include >>> #include >>> #include >>> -#include >>> #include >>> #include >>> #include >>> @@ -184,16 +183,10 @@ static int efi_bio_probe(struct efi_device *efidev) >>> >>> priv->media_id = media->media_id; >>> >>> - ret = blockdevice_register(&priv->blk); >>> - if (ret) >>> - return ret; >>> - >>> if (efi_get_bootsource() == efidev) >>> bootsource_set_raw_instance(instance); >>> >>> - parse_partition_table(&priv->blk); >>> - >>> - return 0; >>> + return blockdevice_register(&priv->blk); >>> } >>> >>> static struct efi_driver efi_bio_driver = { >>> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c >>> index 660f3a7b6b9b..11e52d9e6457 100644 >>> --- a/drivers/block/virtio_blk.c >>> +++ b/drivers/block/virtio_blk.c >>> @@ -105,13 +105,7 @@ static int virtio_blk_probe(struct virtio_device *vdev) >>> priv->blk.num_blocks = cap; >>> priv->blk.ops = &virtio_blk_ops; >>> >>> - ret = blockdevice_register(&priv->blk); >>> - if (ret) >>> - return ret; >>> - >>> - parse_partition_table(&priv->blk); >>> - >>> - return 0; >>> + return blockdevice_register(&priv->blk); >>> } >>> >>> static void virtio_blk_remove(struct virtio_device *vdev) >>> diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c >>> index 6d0d6473770c..32edd5382386 100644 >>> --- a/drivers/mci/mci-core.c >>> +++ b/drivers/mci/mci-core.c >>> @@ -1900,12 +1900,6 @@ static int mci_register_partition(struct mci_part *part) >>> return 0; >>> } >>> >>> - rc = parse_partition_table(&part->blk); >>> - if (rc != 0) { >>> - /* Lack of partition table is unusual, but not a failure */ >>> - dev_warn(&mci->dev, "No partition table found\n"); >>> - } >>> - >>> if (np) { >>> of_parse_partitions(&part->blk.cdev, np); >>> >>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c >>> index bf9176ce0922..79a5f9325ef8 100644 >>> --- a/drivers/nvme/host/core.c >>> +++ b/drivers/nvme/host/core.c >>> @@ -1,6 +1,5 @@ >>> // SPDX-License-Identifier: GPL-2.0-only >>> #include >>> -#include >>> >>> #include "nvme.h" >>> >>> @@ -373,10 +372,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) >>> goto out_free_id; >>> } >>> >>> - ret = parse_partition_table(&ns->blk); >>> - if (ret) >>> - dev_warn(ctrl->dev, "No partition table found\n"); >>> - >>> return; >>> out_free_id: >>> kfree(id); >>> diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c >>> index 103ae293a3a4..dda713196071 100644 >>> --- a/drivers/usb/storage/usb.c >>> +++ b/drivers/usb/storage/usb.c >>> @@ -420,11 +420,6 @@ static int usb_stor_add_blkdev(struct us_data *us, unsigned char lun) >>> goto BadDevice; >>> } >>> >>> - /* create partitions on demand */ >>> - result = parse_partition_table(&pblk_dev->blk); >>> - if (result != 0) >>> - dev_warn(dev, "No partition table found\n"); >>> - >>> list_add_tail(&pblk_dev->list, &us->blk_dev_list); >>> dev_dbg(dev, "USB disk device successfully added\n"); > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |