Hi Heiko,
Heiko Schocher hs@denx.de wrote on Mon, 19 Nov 2018 07:16:53 +0100:
Hello Boris,
Am 17.11.2018 um 10:19 schrieb Boris Brezillon:
On Fri, 16 Nov 2018 15:40:25 +0100 Boris Brezillon boris.brezillon@bootlin.com wrote:
If we don't do that, partitions might still be exposed while the
underlying device is gone.
Fixes: 2a74930da57f ("mtd: mtdpart: implement proper partition handling") Signed-off-by: Boris Brezillon boris.brezillon@bootlin.com
drivers/mtd/mtdcore.c | 1 + include/linux/mtd/mtd.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 7a15ded8c883..46657fe7c949 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -528,6 +528,7 @@ int del_mtd_device(struct mtd_info *mtd) struct mtd_notifier *not; #endif
- del_mtd_partitions(mtd);
mutex_lock(&mtd_table_mutex);
if (idr_find(&mtd_idr, mtd->index) != mtd) {
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index d20ebd820289..c5b58dd3f0f7 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -562,8 +562,22 @@ unsigned mtd_mmap_capabilities(struct mtd_info *mtd); /* drivers/mtd/mtdcore.h */ int add_mtd_device(struct mtd_info *mtd); int del_mtd_device(struct mtd_info *mtd);
+#ifdef CONFIG_MTD_PARTITIONS int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); int del_mtd_partitions(struct mtd_info *); +#else +static inline int add_mtd_partitions(struct mtd_info *,
const struct mtd_partition *, int)Args should have names.
+{
- return 0;
+}
+static int del_mtd_partitions(struct mtd_info *) Missing inline here. I'll send a v2 fixing those 2 bugs.
Thanks!
I tried your patchset, with them "ubi part ubi" does now work, also after a "sf probe" ...
There is one problem, see log [1].
If you have an ubi partition attached (In my example on the NAND), and issue "sf probe", the following "mtd list" shows not anymore the SPI NOR MTD partitions. (It prints an error message "Partition "ubi" already in use, aborting")
If I detach UBI from the NAND MTD partition, the MTD Partitions on the SPI NOR are again found after a "sf probe" before "mtd list" [2]
I will have just a little time to look into this issue today, so there is a quick fix, please tell me if it works for you, otherwise I'll try to find more time during this week to look into it.
Thanks, Miquèl
---
From 55421b43e624e3db51c1d80350be2cf576cf6356 Mon Sep 17 00:00:00 2001 From: Miquel Raynal miquel.raynal@bootlin.com Date: Mon, 19 Nov 2018 10:22:02 +0100 Subject: [PATCH] FIX: mtd: avoid erroring-out once mtd_dev_list_updated() has been called
Signed-off-by: Miquel Raynal miquel.raynal@bootlin.com --- drivers/mtd/mtd_uboot.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index 6a3e64395d..89bf856bcc 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -161,6 +161,15 @@ int mtd_probe_devices(void)
mtd_probe_uclass_mtd_devs();
+ /* If at least one partition is still in use, do not delete anything */ + mtd_for_each_device(mtd) { + if (mtd->usecount) { + printf("Partition "%s" already in use, aborting\n", + mtd->name); + return -EACCES; + } + } + /* * Check if mtdparts/mtdids changed or if the MTD dev list was updated * since last call, otherwise: exit @@ -178,15 +187,6 @@ int mtd_probe_devices(void) old_mtdparts = strdup(mtdparts); old_mtdids = strdup(mtdids);
- /* If at least one partition is still in use, do not delete anything */ - mtd_for_each_device(mtd) { - if (mtd->usecount) { - printf("Partition "%s" already in use, aborting\n", - mtd->name); - return -EACCES; - } - } - /* * Everything looks clear, remove all partitions. It is not safe to * remove entries from the mtd_for_each_device loop as it uses idr