From: "Pali Rohár" <pali.rohar@gmail.com>
To: Joern Engel <joern@lazybastard.org>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Cyrille Pitchen <cyrille.pitchen@atmel.com>,
Artem Bityutskiy <dedekind1@gmail.com>
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
"Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH 3/5] mtd: block2mtd: Fallback to read-only mode
Date: Fri, 2 Jun 2017 17:43:40 +0200 [thread overview]
Message-ID: <1496418222-23483-4-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1496418222-23483-1-git-send-email-pali.rohar@gmail.com>
Sometimes block device is readonly (e.g. loopbacks). This patch allows
block2mtd to fallback and create read-only MTD_ROM device instead of
fatal failure.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/mtd/devices/block2mtd.c | 39 ++++++++++++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 5ba5fad..ad96937 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -38,6 +38,7 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
+ bool ro_mode;
};
@@ -212,7 +213,10 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)
if (dev->blkdev) {
invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
0, -1);
- blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
+ if (dev->ro_mode)
+ blkdev_put(dev->blkdev, FMODE_READ);
+ else
+ blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
}
kfree(dev);
@@ -240,6 +244,13 @@ static struct block2mtd_dev *add_device(char *devname, uint32_t erase_size,
/* Get a handle on the device */
bdev = blkdev_get_by_path(devname, mode, dev);
+ /* Try fallback to read only mode */
+ if (IS_ERR(bdev)) {
+ bdev = blkdev_get_by_path(devname, FMODE_READ, dev);
+ if (!IS_ERR(bdev))
+ dev->ro_mode = true;
+ }
+
#ifndef MODULE
/*
* We might not have the root device mounted at this point.
@@ -261,6 +272,13 @@ static struct block2mtd_dev *add_device(char *devname, uint32_t erase_size,
if (!devt)
continue;
bdev = blkdev_get_by_dev(devt, mode, dev);
+
+ /* Try fallback to read only mode */
+ if (IS_ERR(bdev)) {
+ bdev = blkdev_get_by_path(devname, FMODE_READ, dev);
+ if (!IS_ERR(bdev))
+ dev->ro_mode = true;
+ }
}
#endif
@@ -295,16 +313,22 @@ static struct block2mtd_dev *add_device(char *devname, uint32_t erase_size,
dev->mtd.name = name;
+ if (dev->ro_mode) {
+ dev->mtd.type = MTD_ROM;
+ dev->mtd.flags = MTD_CAP_ROM;
+ } else {
+ dev->mtd.type = MTD_RAM;
+ dev->mtd.flags = MTD_CAP_RAM;
+ dev->mtd._erase = block2mtd_erase;
+ dev->mtd._write = block2mtd_write;
+ dev->mtd._sync = block2mtd_sync;
+ }
+
dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = write_size;
dev->mtd.subpage_sft = subpage_sft;
dev->mtd.writebufsize = PAGE_SIZE;
- dev->mtd.type = MTD_RAM;
- dev->mtd.flags = MTD_CAP_RAM;
- dev->mtd._erase = block2mtd_erase;
- dev->mtd._write = block2mtd_write;
- dev->mtd._sync = block2mtd_sync;
dev->mtd._read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -315,9 +339,10 @@ static struct block2mtd_dev *add_device(char *devname, uint32_t erase_size,
}
list_add(&dev->list, &blkmtd_device_list);
- pr_info("mtd%d: [%s] erase_size = %dKiB [%d], write_size = %dKiB [%d], subpage_sft = %d\n",
+ pr_info("mtd%d: [%s] mode = %s, erase_size = %dKiB [%d], write_size = %dKiB [%d], subpage_sft = %d\n",
dev->mtd.index,
dev->mtd.name + strlen("block2mtd: "),
+ (dev->ro_mode ? "RO" : "R/W"),
dev->mtd.erasesize >> 10, dev->mtd.erasesize,
dev->mtd.writesize >> 10, dev->mtd.writesize,
dev->mtd.subpage_sft);
--
1.7.9.5
next prev parent reply other threads:[~2017-06-02 15:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 15:43 [PATCH 0/5] Extends block2mtd and ubi drivers Pali Rohár
2017-06-02 15:43 ` [PATCH 1/5] mtd: block2mtd: Check for valid user supplied erase size Pali Rohár
2017-07-21 19:45 ` Richard Weinberger
2017-06-02 15:43 ` [PATCH 2/5] mtd: block2mtd: Add support for specifying MTD write size and subpage shift Pali Rohár
2017-06-02 16:13 ` Richard Weinberger
2017-06-05 11:21 ` Pali Rohár
2017-06-05 11:23 ` Richard Weinberger
2017-06-05 11:25 ` Pali Rohár
2017-06-05 11:27 ` Richard Weinberger
2017-06-07 8:46 ` Pali Rohár
2017-06-18 10:06 ` Pavel Machek
2017-06-18 10:11 ` Richard Weinberger
2017-07-17 12:34 ` Pali Rohár
2017-06-02 15:43 ` Pali Rohár [this message]
2017-07-21 19:53 ` [PATCH 3/5] mtd: block2mtd: Fallback to read-only mode Richard Weinberger
2017-07-25 14:28 ` Pali Rohár
2017-06-02 15:43 ` [PATCH 4/5] mtd: block2mtd: Add support for deleting block2mtd mapping Pali Rohár
2017-07-21 19:56 ` Richard Weinberger
2017-07-25 14:24 ` Pali Rohár
2017-08-06 9:39 ` Richard Weinberger
2017-06-02 15:43 ` [PATCH 5/5] ubi: Allow to use read-only UBI volume with not enough PEBs Pali Rohár
2017-07-21 20:12 ` Richard Weinberger
2017-07-25 14:27 ` Pali Rohár
2017-08-06 9:43 ` Richard Weinberger
2017-08-06 10:30 ` Pali Rohár
2017-06-02 16:17 ` [PATCH 0/5] Extends block2mtd and ubi drivers Richard Weinberger
2017-06-05 11:18 ` Pali Rohár
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496418222-23483-4-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=cyrille.pitchen@atmel.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=joern@lazybastard.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).