2022-11-08 23:43:02

by Daniel Golle

Subject: [PATCH v4 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 <[email protected]>
---
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 2ed77b7b3fcb..491330e42ab2 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 75eaecc8639f..d9baa99ca093 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -430,7 +430,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.38.1

2022-11-10 19:57:51

by Richard Weinberger

Subject: Re: [PATCH v4 5/5] mtd: ubi: block: add option to enable scanning for partitions

Daniel,

----- Ursprüngliche Mail -----
> Von: "Daniel Golle" <[email protected]>
>
> Add Kconfig option CONFIG_MTD_UBI_BLOCK_PARTITIONS and enable block
> partition parsers on ubiblock devices in case it is selected.

I think we should stick with one Kconfig at most.
Not both CONFIG_MTD_UBI_BLOCK_PARTITIONS and CONFIG_MTD_BLOCK_PARTITION.

Thanks,
//richard