mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
8c1e760ab6
Except for renames and line changes the only conflict was in allocate_partition in handling MTD_WRITEABLE. Hopefully it was handled correctly. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From 6080ef6e7c0a0592cbcca11200d879faf65e27d4 Mon Sep 17 00:00:00 2001
|
|
From: Jeff Westfahl <jeff.westfahl@ni.com>
|
|
Date: Tue, 10 Jan 2017 13:30:17 -0600
|
|
Subject: [PATCH] mtd: introduce function max_bad_blocks
|
|
|
|
If implemented, 'max_bad_blocks' returns the maximum number of bad
|
|
blocks to reserve for a MTD. An implementation for NAND is coming soon.
|
|
|
|
Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
|
|
Signed-off-by: Zach Brown <zach.brown@ni.com>
|
|
Acked-by: Boris Brezillon <boris.brezillon@free-electron.com>
|
|
Acked-by: Brian Norris <computersforpeace@gmail.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
drivers/mtd/mtdpart.c | 10 ++++++++++
|
|
include/linux/mtd/mtd.h | 13 +++++++++++++
|
|
2 files changed, 23 insertions(+)
|
|
|
|
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -349,6 +349,14 @@ static const struct mtd_ooblayout_ops pa
|
|
.free = part_ooblayout_free,
|
|
};
|
|
|
|
+static int part_max_bad_blocks(struct mtd_info *mtd, loff_t ofs, size_t len)
|
|
+{
|
|
+ struct mtd_part *part = mtd_to_part(mtd);
|
|
+
|
|
+ return part->master->_max_bad_blocks(part->master,
|
|
+ ofs + part->offset, len);
|
|
+}
|
|
+
|
|
static inline void free_partition(struct mtd_part *p)
|
|
{
|
|
kfree(p->mtd.name);
|
|
@@ -475,6 +483,8 @@ static struct mtd_part *allocate_partiti
|
|
slave->mtd._block_isbad = part_block_isbad;
|
|
if (master->_block_markbad)
|
|
slave->mtd._block_markbad = part_block_markbad;
|
|
+ if (master->_max_bad_blocks)
|
|
+ slave->mtd._max_bad_blocks = part_max_bad_blocks;
|
|
|
|
if (master->_get_device)
|
|
slave->mtd._get_device = part_get_device;
|
|
--- a/include/linux/mtd/mtd.h
|
|
+++ b/include/linux/mtd/mtd.h
|
|
@@ -322,6 +322,7 @@ struct mtd_info {
|
|
int (*_block_isreserved) (struct mtd_info *mtd, loff_t ofs);
|
|
int (*_block_isbad) (struct mtd_info *mtd, loff_t ofs);
|
|
int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs);
|
|
+ int (*_max_bad_blocks) (struct mtd_info *mtd, loff_t ofs, size_t len);
|
|
int (*_suspend) (struct mtd_info *mtd);
|
|
void (*_resume) (struct mtd_info *mtd);
|
|
void (*_reboot) (struct mtd_info *mtd);
|
|
@@ -397,6 +398,18 @@ static inline int mtd_oobavail(struct mt
|
|
return ops->mode == MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize;
|
|
}
|
|
|
|
+static inline int mtd_max_bad_blocks(struct mtd_info *mtd,
|
|
+ loff_t ofs, size_t len)
|
|
+{
|
|
+ if (!mtd->_max_bad_blocks)
|
|
+ return -ENOTSUPP;
|
|
+
|
|
+ if (mtd->size < (len + ofs) || ofs < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ return mtd->_max_bad_blocks(mtd, ofs, len);
|
|
+}
|
|
+
|
|
int mtd_wunit_to_pairing_info(struct mtd_info *mtd, int wunit,
|
|
struct mtd_pairing_info *info);
|
|
int mtd_pairing_info_to_wunit(struct mtd_info *mtd,
|