From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 01 Jun 2023 08:00:13 +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 1q4bM7-005P5h-3C for lore@lore.pengutronix.de; Thu, 01 Jun 2023 08:00:13 +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 1q4bM4-0006Yh-Jk for lore@pengutronix.de; Thu, 01 Jun 2023 08:00:13 +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=R6vCObibU3TerwFmrIRUf9CxIMdw0Vy8efe4teiqaAE=; b=mBPGpGl+pML2O7qGRRLN4DnzCm d6UXVK4mQzpLiWpSwdk71EuAV9BE6Hf5nWRS3o4udw1t8nPdIe4Nvtdg+Y4NENfr/ad8vwokyyf4r j2k6agVt6n1hLh2Hjr90mUioedEnIW5UMmtEu87UDkSmCJbQ/nWDy3WqTPb7Y/0J+jlQo+6UpsGHd FaHJtVUHzjvXPBCIvmngM/NUMeMscr9hjk1r8gigZJvNDIAv2vlQ5jFpQ3lKNzKD33rQ2jmcwSo84 GmbifMrhbBopZ6EAgEcV/RW0ypr2zXobIEWpacwlQA5pI4elw98T3qposTBkI+04XNCge81WpgLMl aXDsw0Ug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4bKt-0026FS-1u; Thu, 01 Jun 2023 05:58:59 +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 1q4bKo-0026Ef-1a for barebox@lists.infradead.org; Thu, 01 Jun 2023 05:58:57 +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 1q4bKj-0006J2-WD; Thu, 01 Jun 2023 07:58:50 +0200 Message-ID: <2641ca65-8ca0-b177-ec20-f467f18662f3@pengutronix.de> Date: Thu, 1 Jun 2023 07:58:49 +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: Marco Felsch Cc: barebox@lists.infradead.org References: <20230531145927.1399282-1-a.fatoum@pengutronix.de> <20230531145927.1399282-13-a.fatoum@pengutronix.de> <20230531173320.24m7mucy6kzhj5wq@pengutronix.de> <1b1fc8e7-d74b-2fa6-8e53-c4c256d7e7a5@pengutronix.de> In-Reply-To: <1b1fc8e7-d74b-2fa6-8e53-c4c256d7e7a5@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230531_225854_554804_63C6804C X-CRM114-Status: GOOD ( 23.15 ) 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 12/18] common: partitions: record whether disk is GPT or MBR partitioned 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 07:08, Ahmad Fatoum wrote: > On 31.05.23 19:33, Marco Felsch wrote: >> On 23-05-31, Ahmad Fatoum wrote: >>> Currently, the only way to differentiate between a GPT disk and a MBR >>> one is to check whether the cdev's device has a guid (=> GPT) or a >>> nt_signature (=> MBR) device parameter. We already have a flag parameter >>> though, so let's record this info there for easy retrieval. >>> >>> We intentionally don't use the struct cdev::filetype member, because >>> we don't want to change behavior of file_detect_type(). >>> >>> Signed-off-by: Ahmad Fatoum >>> --- >>> common/partitions/dos.c | 2 ++ >>> common/partitions/efi.c | 2 ++ >>> fs/fs.c | 4 ++++ >>> include/driver.h | 20 +++++++++++++++++--- >>> 4 files changed, 25 insertions(+), 3 deletions(-) >>> >>> diff --git a/common/partitions/dos.c b/common/partitions/dos.c >>> index ad60c0b27b46..7472824b00b9 100644 >>> --- a/common/partitions/dos.c >>> +++ b/common/partitions/dos.c >>> @@ -185,6 +185,8 @@ static void dos_partition(void *buf, struct block_device *blk, >>> if (signature) >>> sprintf(blk->cdev.diskuuid, "%08x", signature); >>> >>> + blk->cdev.flags |= DEVFS_IS_MBR_PARTITIONED; >>> + >>> table = (struct partition_entry *)&buffer[446]; >>> >>> for (i = 0; i < 4; i++) { >>> diff --git a/common/partitions/efi.c b/common/partitions/efi.c >>> index 780a8695e8a8..df63b82afe24 100644 >>> --- a/common/partitions/efi.c >>> +++ b/common/partitions/efi.c >>> @@ -449,6 +449,8 @@ static void efi_partition(void *buf, struct block_device *blk, >>> snprintf(blk->cdev.diskuuid, sizeof(blk->cdev.diskuuid), "%pUl", &gpt->disk_guid); >>> dev_add_param_string_fixed(blk->dev, "guid", blk->cdev.diskuuid); >>> >>> + blk->cdev.flags |= DEVFS_IS_GPT_PARTITIONED; >>> + >>> nb_part = le32_to_cpu(gpt->num_partition_entries); >>> >>> if (nb_part > MAX_PARTITION) { >>> diff --git a/fs/fs.c b/fs/fs.c >>> index 9d8aab268ca4..2d2d327c5fbc 100644 >>> --- a/fs/fs.c >>> +++ b/fs/fs.c >>> @@ -94,6 +94,10 @@ void cdev_print(const struct cdev *cdev) >>> printf(" table-partition"); >>> if (cdev->flags & DEVFS_IS_MCI_MAIN_PART_DEV) >>> printf(" mci-main-partition"); >>> + if (cdev->flags & DEVFS_IS_GPT_PARTITIONED) >>> + printf(" gpt-partitioned"); >>> + if (cdev->flags & DEVFS_IS_MBR_PARTITIONED) >>> + printf(" mbr-partitioned"); >>> if (cdev->mtd) >>> printf(" mtd"); >>> printf(" )"); >>> diff --git a/include/driver.h b/include/driver.h >>> index 118d2adb6750..5f2eae65466f 100644 >>> --- a/include/driver.h >>> +++ b/include/driver.h >>> @@ -584,9 +584,23 @@ extern struct list_head cdev_list; >>> #define DEVFS_PARTITION_FIXED (1U << 0) >>> #define DEVFS_PARTITION_READONLY (1U << 1) >>> #define DEVFS_IS_CHARACTER_DEV (1U << 3) >>> -#define DEVFS_IS_MCI_MAIN_PART_DEV (1U << 4) >>> -#define DEVFS_PARTITION_FROM_OF (1U << 5) >>> -#define DEVFS_PARTITION_FROM_TABLE (1U << 6) >>> +#define DEVFS_PARTITION_FROM_OF (1U << 4) >>> +#define DEVFS_PARTITION_FROM_TABLE (1U << 5) >>> +#define DEVFS_IS_GPT_PARTITIONED (1U << 6) >>> +#define DEVFS_IS_MBR_PARTITIONED (1U << 7) >>> +#define DEVFS_IS_MCI_MAIN_PART_DEV (1U << 8) >> >> Why do you reorder the bits here again? > > I wanted the partition bits to be together. I see what you mean now. I'll leave MCI_MAIN_PART as bit 4 and add everything after that. Thanks. > >>> + >>> +static inline bool cdev_is_gpt_partitioned(const struct cdev *master) >>> +{ >>> + return master && (master->flags & DEVFS_IS_GPT_PARTITIONED) >>> + == DEVFS_IS_GPT_PARTITIONED; >> >> Why not just: 'return !!(master->flags & DEVFS_IS_GPT_PARTITIONED)' ? > > Left over from when this was more than one bit. I will change to: > > return master && (master->flags & DEVFS_IS_GPT_PARTITIONED) > > I want to keep the NULL check, as we only set this for the master device. > > Cheers, > Ahmad > > >> >> Regards, >> Marco >> >>> +} >>> + >>> +static inline bool cdev_is_mbr_partitioned(const struct cdev *master) >>> +{ >>> + return master && (master->flags & DEVFS_IS_MBR_PARTITIONED) >>> + == DEVFS_IS_MBR_PARTITIONED; >>> +} >>> >>> struct cdev *devfs_add_partition(const char *devname, loff_t offset, >>> loff_t size, unsigned int flags, const char *name); >>> -- >>> 2.39.2 >>> >>> >>> >> > -- 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 |