Commit ce447f34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi 

Pull UBI changes from Artem Bityutskiy:
 "Change the default amount of eraseblocks which UBI reserves for bad
  block handling from 1% to 2%, because 1% does not meet most modern
  flash requirements.  1% was good enough in the past for old
  high-quality SLCs, but nowadays 2% is much more appropriate.:

Other changes are clean-ups.

* tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi:
  UBI: harmonize the update of ubi->beb_rsvd_pebs
  UBI: trivial: fix comment of ubi_calculate_reserved function
  UBI: fix spelling of detach in debug output
  UBI: Change the default percentage of reserved PEB
parents 93912fe6 87e773c9

drivers/mtd/ubi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config MTD_UBI_WL_THRESHOLD 


config MTD_UBI_BEB_RESERVE

	int "Percentage of reserved eraseblocks for bad eraseblocks handling"

	default 1

	default 2

	range 0 25

	help

	  If the MTD device admits of bad eraseblocks (e.g. NAND flash), UBI

drivers/mtd/ubi/cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd, 
	{

		int ubi_num;



		dbg_gen("dettach MTD device");

		dbg_gen("detach MTD device");

		err = get_user(ubi_num, (__user int32_t *)argp);

		if (err) {

			err = -EFAULT;

drivers/mtd/ubi/misc.c

+24 −1
Original line number Diff line number Diff line
@@ -92,7 +92,30 @@ int ubi_check_volume(struct ubi_device *ubi, int vol_id) 
}



/**

 * ubi_calculate_rsvd_pool - calculate how many PEBs must be reserved for bad

 * ubi_update_reserved - update bad eraseblock handling accounting data.

 * @ubi: UBI device description object

 *

 * This function calculates the gap between current number of PEBs reserved for

 * bad eraseblock handling and the required level of PEBs that must be

 * reserved, and if necessary, reserves more PEBs to fill that gap, according

 * to availability. Should be called with ubi->volumes_lock held.

 */

void ubi_update_reserved(struct ubi_device *ubi)

{

	int need = ubi->beb_rsvd_level - ubi->beb_rsvd_pebs;



	if (need <= 0 || ubi->avail_pebs == 0)

		return;



	need = min_t(int, need, ubi->avail_pebs);

	ubi->avail_pebs -= need;

	ubi->rsvd_pebs += need;

	ubi->beb_rsvd_pebs += need;

	ubi_msg("reserved more %d PEBs for bad PEB handling", need);

}



/**

 * ubi_calculate_reserved - calculate how many PEBs must be reserved for bad

 * eraseblock handling.

 * @ubi: UBI device description object

 */

drivers/mtd/ubi/ubi.h

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ int ubi_more_leb_change_data(struct ubi_device *ubi, struct ubi_volume *vol, 
int ubi_calc_data_len(const struct ubi_device *ubi, const void *buf,

		      int length);

int ubi_check_volume(struct ubi_device *ubi, int vol_id);

void ubi_update_reserved(struct ubi_device *ubi);

void ubi_calculate_reserved(struct ubi_device *ubi);

int ubi_check_pattern(const void *buf, uint8_t patt, int size);

drivers/mtd/ubi/vmt.c

+2 −18
Original line number Diff line number Diff line
@@ -443,15 +443,7 @@ int ubi_remove_volume(struct ubi_volume_desc *desc, int no_vtbl) 
	spin_lock(&ubi->volumes_lock);

	ubi->rsvd_pebs -= reserved_pebs;

	ubi->avail_pebs += reserved_pebs;

	i = ubi->beb_rsvd_level - ubi->beb_rsvd_pebs;

	if (i > 0) {

		i = ubi->avail_pebs >= i ? i : ubi->avail_pebs;

		ubi->avail_pebs -= i;

		ubi->rsvd_pebs += i;

		ubi->beb_rsvd_pebs += i;

		if (i > 0)

			ubi_msg("reserve more %d PEBs", i);

	}

	ubi_update_reserved(ubi);

	ubi->vol_count -= 1;

	spin_unlock(&ubi->volumes_lock);
@@ -558,15 +550,7 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) 
		spin_lock(&ubi->volumes_lock);

		ubi->rsvd_pebs += pebs;

		ubi->avail_pebs -= pebs;

		pebs = ubi->beb_rsvd_level - ubi->beb_rsvd_pebs;

		if (pebs > 0) {

			pebs = ubi->avail_pebs >= pebs ? pebs : ubi->avail_pebs;

			ubi->avail_pebs -= pebs;

			ubi->rsvd_pebs += pebs;

			ubi->beb_rsvd_pebs += pebs;

			if (pebs > 0)

				ubi_msg("reserve more %d PEBs", pebs);

		}

		ubi_update_reserved(ubi);

		for (i = 0; i < reserved_pebs; i++)

			new_mapping[i] = vol->eba_tbl[i];

		kfree(vol->eba_tbl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE