Messages in this thread Patch in this message | | | From | Bean Huo <> | Subject | [PATCH v2 13/17] drivers:mtd:ubi:add bakvol init while attach ubi | Date | Tue, 2 Feb 2016 02:30:48 +0000 |
| |
From: Bean Huo <beanhuo@micron.com>
This file is to initial bakvol moduel and scan PEB to find bakvol PEB while attach ubi device.
Signed-off-by: BeanHuo <beanhuo@micron.com> --- drivers/mtd/ubi/attach.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index 68eea5b..5c38854 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -919,6 +919,15 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai, err = ubi_io_read_vid_hdr(ubi, pnum, vidh, 0); if (err < 0) return err; + +#ifdef CONFIG_MTD_UBI_MLC_NAND_BAKVOL + /* + * Before analyze VID header, call ubi_bakvol_peb_scan to + * find out backup block and build the backup log volume first. + */ + ubi_bakvol_peb_scan(ubi, vidh, pnum); +#endif + switch (err) { case 0: break; @@ -995,7 +1004,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai, *vid = vol_id; if (sqnum) *sqnum = be64_to_cpu(vidh->sqnum); - if (vol_id > UBI_MAX_VOLUMES && vol_id != UBI_LAYOUT_VOLUME_ID) { + if ((vol_id > UBI_MAX_VOLUMES && vol_id != UBI_LAYOUT_VOLUME_ID) + && vol_id != UBI_BACKUP_VOLUME_ID) { int lnum = be32_to_cpu(vidh->lnum); /* Unsupported internal volume */ @@ -1408,6 +1418,12 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (!ai) return -ENOMEM; +#ifdef CONFIG_MTD_UBI_MLC_NAND_BAKVOL + err = ubi_bakvol_module_init(ubi); + if (err) + goto out_ai; +#endif + #ifdef CONFIG_MTD_UBI_FASTMAP /* On small flash devices we disable fastmap in any case. */ if ((int)mtd_div_by_eb(ubi->mtd->size, ubi->mtd) <= UBI_FM_MAX_START) { @@ -1449,6 +1465,12 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (err) goto out_ai; +#ifdef CONFIG_MTD_UBI_MLC_NAND_BAKVOL + err = ubi_bakvol_module_init_tail(ubi, ai); + if (err) + goto out_ai; +#endif + err = ubi_wl_init(ubi, ai); if (err) goto out_vtbl; -- 1.9.1
| |