mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/3] mtd: Add subpagesize to mtd_info_user
Date: Fri, 20 Dec 2013 15:10:20 +0100	[thread overview]
Message-ID: <1387548620-26893-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1387548620-26893-1-git-send-email-s.hauer@pengutronix.de>

ubiformat needs the subpagesize to work correctly. The kernel uses
sysfs to pass the subpagesize, but in barebox we have the possibility
to extend struct mtd_info_user. Add a corresponding field and use it
in ubiformat.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/core.c          | 1 +
 fs/devfs-core.c             | 1 +
 include/linux/mtd/mtd-abi.h | 1 +
 lib/libmtd.c                | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index fc2ac00..6db1c6d 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -236,6 +236,7 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf)
 		user->erasesize	= mtd->erasesize;
 		user->writesize	= mtd->writesize;
 		user->oobsize	= mtd->oobsize;
+		user->subpagesize = mtd->writesize >> mtd->subpage_sft;
 		user->mtd	= mtd;
 		/* The below fields are obsolete */
 		user->ecctype	= -1;
diff --git a/fs/devfs-core.c b/fs/devfs-core.c
index a92d434..44f0169 100644
--- a/fs/devfs-core.c
+++ b/fs/devfs-core.c
@@ -171,6 +171,7 @@ static int partition_ioctl(struct cdev *cdev, int request, void *buf)
 			user->erasesize	= cdev->mtd->erasesize;
 			user->writesize	= cdev->mtd->writesize;
 			user->oobsize	= cdev->mtd->oobsize;
+			user->subpagesize = cdev->mtd->writesize >> cdev->mtd->subpage_sft;
 			user->mtd	= cdev->mtd;
 			/* The below fields are obsolete */
 			user->ecctype	= -1;
diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h
index fa8e36f..11d51e2 100644
--- a/include/linux/mtd/mtd-abi.h
+++ b/include/linux/mtd/mtd-abi.h
@@ -82,6 +82,7 @@ struct mtd_info_user {
 	uint32_t ecctype;
 	uint32_t eccsize;
 	struct mtd_info *mtd;
+	uint32_t subpagesize;
 };
 
 struct region_info_user {
diff --git a/lib/libmtd.c b/lib/libmtd.c
index eecc760..1606b87 100644
--- a/lib/libmtd.c
+++ b/lib/libmtd.c
@@ -308,6 +308,7 @@ int mtd_get_dev_info(const char *node, struct mtd_dev_info *mtd)
 	mtd->eb_size = ui.erasesize;
 	mtd->min_io_size = ui.writesize;
 	mtd->oob_size = ui.oobsize;
+	mtd->subpage_size = ui.subpagesize;
 
 	if (mtd->min_io_size <= 0) {
 		errmsg("%s has insane min. I/O unit size %d",
@@ -356,7 +357,6 @@ int mtd_get_dev_info(const char *node, struct mtd_dev_info *mtd)
 
 	if (ui.flags & MTD_WRITEABLE)
 		mtd->writable = 1;
-	mtd->subpage_size = mtd->min_io_size;
 
 	close(fd);
 
-- 
1.8.5.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-12-20 14:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-20 14:10 mtd/UBI fixes Sascha Hauer
2013-12-20 14:10 ` [PATCH 1/3] mtd: fix wrong return values in cdev read Sascha Hauer
2013-12-20 14:10 ` [PATCH 2/3] mtd: fix mtd_read return value Sascha Hauer
2013-12-20 14:10 ` Sascha Hauer [this message]

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=1387548620-26893-4-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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