[<prev] [next>] [day] [month] [year] [list]
Message-ID: <YnjxsU+UG6J9OCLf@makrotopia.org>
Date: Mon, 9 May 2022 11:49:21 +0100
From: Daniel Golle <daniel@...rotopia.org>
To: linux-block@...r.kernel.org, linux-efi@...r.kernel.org,
linux-mtd@...ts.infradead.org, linux-kernel@...r.kernel.org
Cc: Tom Rini <trini@...sulko.com>, Jens Axboe <axboe@...nel.dk>,
Davidlohr Bueso <dave@...olabs.net>,
Miquel Raynal <miquel.raynal@...tlin.com>,
Richard Weinberger <richard@....at>,
Vignesh Raghavendra <vigneshr@...com>,
Masahiro Yamada <masahiroy@...nel.org>
Subject: [PATCH v2 5/5] mtd: ubi: block: add option to enable scanning for
partitions
Add Kconfig option CONFIG_MTD_UBI_BLOCK_PARTITIONS and enable block
partition parsers on ubiblock devices in case it is selected.
Signed-off-by: Daniel Golle <daniel@...rotopia.org>
---
drivers/mtd/ubi/Kconfig | 10 ++++++++++
drivers/mtd/ubi/block.c | 5 ++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 2ed77b7b3fcb56..491330e42ab201 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -104,4 +104,14 @@ config MTD_UBI_BLOCK
If in doubt, say "N".
+config MTD_UBI_BLOCK_PARTITIONS
+ bool "Scan UBI block devices for partitions"
+ default y if FIT_PARTITION
+ depends on MTD_UBI_BLOCK
+ help
+ Scan UBI block devices for partitions (ie. MBR, GPT, uImage.FIT, ...).
+
+ Unless your UBI volumes contain sub-partitions mapped using a partition
+ table, say no.
+
endif # MTD_UBI
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 18683d1c1bf501..196a95e77a7747 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -431,7 +431,10 @@ int ubiblock_create(struct ubi_volume_info *vi)
ret = -ENODEV;
goto out_cleanup_disk;
}
- gd->flags |= GENHD_FL_NO_PART;
+
+ if (!IS_ENABLED(CONFIG_MTD_UBI_BLOCK_PARTITIONS))
+ gd->flags |= GENHD_FL_NO_PART;
+
gd->private_data = dev;
sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
set_capacity(gd, disk_capacity);
--
2.36.0
Powered by blists - more mailing lists