Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c6c7fa1 authored by Adrian Hunter's avatar Adrian Hunter Committed by Artem Bityutskiy
Browse files

UBI: add image sequence number to EC header 



An image sequence number is added to the UBI erase-counter header
to be able determine if the root file system contains a mixture
of old and new images (because the flashing failed to complete).

A change to nolo is also needed for this to take effect.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 1398788f

drivers/mtd/ubi/build.c

+1 −0
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) 
	ubi_msg("number of PEBs reserved for bad PEB handling: %d",

		ubi->beb_rsvd_pebs);

	ubi_msg("max/mean erase counter: %d/%d", ubi->max_ec, ubi->mean_ec);

	ubi_msg("image sequence number: %d", ubi->image_seq);



	/*

	 * The below lock makes sure we do not race with 'ubi_thread()' which

drivers/mtd/ubi/debug.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr) 
	       be32_to_cpu(ec_hdr->vid_hdr_offset));

	printk(KERN_DEBUG "\tdata_offset    %d\n",

	       be32_to_cpu(ec_hdr->data_offset));

	printk(KERN_DEBUG "\timage_seq      %d\n",

	       be32_to_cpu(ec_hdr->image_seq));

	printk(KERN_DEBUG "\thdr_crc        %#08x\n",

	       be32_to_cpu(ec_hdr->hdr_crc));

	printk(KERN_DEBUG "erase counter header hexdump:\n");

drivers/mtd/ubi/io.c

+13 −2
Original line number Diff line number Diff line
@@ -563,15 +563,16 @@ int ubi_io_mark_bad(const struct ubi_device *ubi, int pnum) 
 * This function returns zero if the erase counter header is OK, and %1 if

 * not.

 */

static int validate_ec_hdr(const struct ubi_device *ubi,

static int validate_ec_hdr(struct ubi_device *ubi,

			   const struct ubi_ec_hdr *ec_hdr)

{

	long long ec;

	int vid_hdr_offset, leb_start;

	int vid_hdr_offset, leb_start, image_seq;



	ec = be64_to_cpu(ec_hdr->ec);

	vid_hdr_offset = be32_to_cpu(ec_hdr->vid_hdr_offset);

	leb_start = be32_to_cpu(ec_hdr->data_offset);

	image_seq = be32_to_cpu(ec_hdr->image_seq);



	if (ec_hdr->version != UBI_VERSION) {

		ubi_err("node with incompatible UBI version found: "
@@ -597,6 +598,15 @@ static int validate_ec_hdr(const struct ubi_device *ubi, 
		goto bad;

	}



	if (!ubi->image_seq_set) {

		ubi->image_seq = image_seq;

		ubi->image_seq_set = 1;

	} else if (ubi->image_seq != image_seq) {

		ubi_err("bad image sequence number %d, expected %d",

			image_seq, ubi->image_seq);

		goto bad;

	}



	return 0;



bad:
@@ -742,6 +752,7 @@ int ubi_io_write_ec_hdr(struct ubi_device *ubi, int pnum, 
	ec_hdr->version = UBI_VERSION;

	ec_hdr->vid_hdr_offset = cpu_to_be32(ubi->vid_hdr_offset);

	ec_hdr->data_offset = cpu_to_be32(ubi->leb_start);

	ec_hdr->image_seq = cpu_to_be32(ubi->image_seq);

	crc = crc32(UBI_CRC32_INIT, ec_hdr, UBI_EC_HDR_SIZE_CRC);

	ec_hdr->hdr_crc = cpu_to_be32(crc);

drivers/mtd/ubi/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -910,6 +910,8 @@ struct ubi_scan_info *ubi_scan(struct ubi_device *ubi) 
	if (si->is_empty)

		ubi_msg("empty MTD device detected");



	ubi->image_seq_set = 1;



	/*

	 * In case of unknown erase counter we use the mean erase counter

	 * value.

drivers/mtd/ubi/ubi-media.h

+11 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ enum { 
 * @ec: the erase counter

 * @vid_hdr_offset: where the VID header starts

 * @data_offset: where the user data start

 * @image_seq: image sequence number

 * @padding2: reserved for future, zeroes

 * @hdr_crc: erase counter header CRC checksum

 *
@@ -144,6 +145,14 @@ enum { 
 * volume identifier header and user data, relative to the beginning of the

 * physical eraseblock. These values have to be the same for all physical

 * eraseblocks.

 *

 * The @image_seq field is used to validate a UBI image that has been prepared

 * for a UBI device. The @image_seq value can be any value, but it must be the

 * same on all eraseblocks. UBI will ensure that all new erase counter headers

 * also contain this value, and will check the value when scanning at start-up.

 * One way to make use of @image_seq is to increase its value by one every time

 * an image is flashed over an existing image, then, if the flashing does not

 * complete, UBI will detect the error when scanning.

 */

struct ubi_ec_hdr {

	__be32  magic;
@@ -152,7 +161,8 @@ struct ubi_ec_hdr { 
	__be64  ec; /* Warning: the current limit is 31-bit anyway! */

	__be32  vid_hdr_offset;

	__be32  data_offset;

	__u8    padding2[36];

	__be32  image_seq;

	__u8    padding2[32];

	__be32  hdr_crc;

} __attribute__ ((packed));