UBI: remove duplicate IO error codes
The 'UBI_IO_PEB_EMPTY' and 'UBI_IO_PEB_FREE' are essentially the same and mean that there are only 0xFF bytes instead of headers. Simplify UBI a little by turning them into a single 'UBI_IO_FF' error code. Also, stop maintaining commentaries in 'ubi_io_read_vid_hdr()' which are almost identical to commentaries in 'ubi_io_read_ec_hdr()'. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
756e1df1d2
commit
74d82d2660
|
@ -714,7 +714,7 @@ bad:
|
||||||
* o %UBI_IO_BAD_HDR if the erase counter header is corrupted (a CRC error);
|
* o %UBI_IO_BAD_HDR if the erase counter header is corrupted (a CRC error);
|
||||||
* o %UBI_IO_BAD_HDR_EBADMSG is the same as %UBI_IO_BAD_HDR, but there also was
|
* o %UBI_IO_BAD_HDR_EBADMSG is the same as %UBI_IO_BAD_HDR, but there also was
|
||||||
* a data integrity error (uncorrectable ECC error in case of NAND);
|
* a data integrity error (uncorrectable ECC error in case of NAND);
|
||||||
* o %UBI_IO_PEB_EMPTY if the physical eraseblock is empty;
|
* o %UBI_IO_FF if only 0xFF bytes were read (the PEB is supposedly empty)
|
||||||
* o a negative error code in case of failure.
|
* o a negative error code in case of failure.
|
||||||
*/
|
*/
|
||||||
int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
||||||
|
@ -762,7 +762,7 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
||||||
else if (UBI_IO_DEBUG)
|
else if (UBI_IO_DEBUG)
|
||||||
dbg_msg("no EC header found at PEB %d, "
|
dbg_msg("no EC header found at PEB %d, "
|
||||||
"only 0xFF bytes", pnum);
|
"only 0xFF bytes", pnum);
|
||||||
return UBI_IO_PEB_EMPTY;
|
return UBI_IO_FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -977,19 +977,11 @@ bad:
|
||||||
*
|
*
|
||||||
* This function reads the volume identifier header from physical eraseblock
|
* This function reads the volume identifier header from physical eraseblock
|
||||||
* @pnum and stores it in @vid_hdr. It also checks CRC checksum of the read
|
* @pnum and stores it in @vid_hdr. It also checks CRC checksum of the read
|
||||||
* volume identifier header. The following codes may be returned:
|
* volume identifier header. The error codes are the same as in
|
||||||
|
* 'ubi_io_read_ec_hdr()'.
|
||||||
*
|
*
|
||||||
* o %0 if the CRC checksum is correct and the header was successfully read;
|
* Note, the implementation of this function is also very similar to
|
||||||
* o %UBI_IO_BITFLIPS if the CRC is correct, but bit-flips were detected
|
* 'ubi_io_read_ec_hdr()', so refer commentaries in 'ubi_io_read_ec_hdr()'.
|
||||||
* and corrected by the flash driver; this is harmless but may indicate that
|
|
||||||
* this eraseblock may become bad soon;
|
|
||||||
* o %UBI_IO_BAD_HDR if the volume identifier header is corrupted (a CRC
|
|
||||||
* error detected);
|
|
||||||
* o %UBI_IO_BAD_HDR_EBADMSG is the same as %UBI_IO_BAD_HDR, but there also was
|
|
||||||
* a data integrity error (uncorrectable ECC error in case of NAND);
|
|
||||||
* o %UBI_IO_PEB_FREE if the physical eraseblock is free (i.e., there is no VID
|
|
||||||
* header there);
|
|
||||||
* o a negative error code in case of failure.
|
|
||||||
*/
|
*/
|
||||||
int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
||||||
struct ubi_vid_hdr *vid_hdr, int verbose)
|
struct ubi_vid_hdr *vid_hdr, int verbose)
|
||||||
|
@ -1008,15 +1000,6 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
||||||
if (err != UBI_IO_BITFLIPS && err != -EBADMSG)
|
if (err != UBI_IO_BITFLIPS && err != -EBADMSG)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
/*
|
|
||||||
* We read all the data, but either a correctable bit-flip
|
|
||||||
* occurred, or MTD reported a data integrity error
|
|
||||||
* (uncorrectable ECC error in case of NAND). The former is
|
|
||||||
* harmless, the later may mean that the read data is
|
|
||||||
* corrupted. But we have a CRC check-sum and we will detect
|
|
||||||
* this. If the VID header is still OK, we just report this as
|
|
||||||
* there was a bit-flip, to force scrubbing.
|
|
||||||
*/
|
|
||||||
if (err == -EBADMSG)
|
if (err == -EBADMSG)
|
||||||
read_err = UBI_IO_BAD_HDR_EBADMSG;
|
read_err = UBI_IO_BAD_HDR_EBADMSG;
|
||||||
}
|
}
|
||||||
|
@ -1026,25 +1009,16 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
||||||
if (read_err)
|
if (read_err)
|
||||||
return read_err;
|
return read_err;
|
||||||
|
|
||||||
/*
|
|
||||||
* If we have read all 0xFF bytes, the VID header probably does
|
|
||||||
* not exist and the physical eraseblock is assumed to be free.
|
|
||||||
*/
|
|
||||||
if (check_pattern(vid_hdr, 0xFF, UBI_VID_HDR_SIZE)) {
|
if (check_pattern(vid_hdr, 0xFF, UBI_VID_HDR_SIZE)) {
|
||||||
/* The physical eraseblock is supposedly free */
|
|
||||||
if (verbose)
|
if (verbose)
|
||||||
ubi_warn("no VID header found at PEB %d, "
|
ubi_warn("no VID header found at PEB %d, "
|
||||||
"only 0xFF bytes", pnum);
|
"only 0xFF bytes", pnum);
|
||||||
else if (UBI_IO_DEBUG)
|
else if (UBI_IO_DEBUG)
|
||||||
dbg_msg("no VID header found at PEB %d, "
|
dbg_msg("no VID header found at PEB %d, "
|
||||||
"only 0xFF bytes", pnum);
|
"only 0xFF bytes", pnum);
|
||||||
return UBI_IO_PEB_FREE;
|
return UBI_IO_FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* This is not a valid VID header, and these are not 0xFF
|
|
||||||
* bytes. Report that the header is corrupted.
|
|
||||||
*/
|
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
||||||
"%08x", pnum, magic, UBI_VID_HDR_MAGIC);
|
"%08x", pnum, magic, UBI_VID_HDR_MAGIC);
|
||||||
|
@ -1069,17 +1043,12 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
||||||
return read_err ?: UBI_IO_BAD_HDR;
|
return read_err ?: UBI_IO_BAD_HDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Validate the VID header that we have just read */
|
|
||||||
err = validate_vid_hdr(ubi, vid_hdr);
|
err = validate_vid_hdr(ubi, vid_hdr);
|
||||||
if (err) {
|
if (err) {
|
||||||
ubi_err("validation failed for PEB %d", pnum);
|
ubi_err("validation failed for PEB %d", pnum);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* If there was a read error (%-EBADMSG), but the header CRC is still
|
|
||||||
* OK, report about a bit-flip to force scrubbing on this PEB.
|
|
||||||
*/
|
|
||||||
return read_err ? UBI_IO_BITFLIPS : 0;
|
return read_err ? UBI_IO_BITFLIPS : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -748,7 +748,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
|
||||||
return err;
|
return err;
|
||||||
else if (err == UBI_IO_BITFLIPS)
|
else if (err == UBI_IO_BITFLIPS)
|
||||||
bitflips = 1;
|
bitflips = 1;
|
||||||
else if (err == UBI_IO_PEB_EMPTY)
|
else if (err == UBI_IO_FF)
|
||||||
return add_to_list(si, pnum, UBI_SCAN_UNKNOWN_EC, &si->erase);
|
return add_to_list(si, pnum, UBI_SCAN_UNKNOWN_EC, &si->erase);
|
||||||
else if (err == UBI_IO_BAD_HDR_EBADMSG || err == UBI_IO_BAD_HDR) {
|
else if (err == UBI_IO_BAD_HDR_EBADMSG || err == UBI_IO_BAD_HDR) {
|
||||||
/*
|
/*
|
||||||
|
@ -817,7 +817,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
|
||||||
else if (err == UBI_IO_BITFLIPS)
|
else if (err == UBI_IO_BITFLIPS)
|
||||||
bitflips = 1;
|
bitflips = 1;
|
||||||
else if (err == UBI_IO_BAD_HDR_EBADMSG || err == UBI_IO_BAD_HDR ||
|
else if (err == UBI_IO_BAD_HDR_EBADMSG || err == UBI_IO_BAD_HDR ||
|
||||||
(err == UBI_IO_PEB_FREE && ec_corr)) {
|
(err == UBI_IO_FF && ec_corr)) {
|
||||||
/* VID header is corrupted */
|
/* VID header is corrupted */
|
||||||
if (err == UBI_IO_BAD_HDR_EBADMSG ||
|
if (err == UBI_IO_BAD_HDR_EBADMSG ||
|
||||||
ec_corr == UBI_IO_BAD_HDR_EBADMSG)
|
ec_corr == UBI_IO_BAD_HDR_EBADMSG)
|
||||||
|
@ -826,7 +826,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
goto adjust_mean_ec;
|
goto adjust_mean_ec;
|
||||||
} else if (err == UBI_IO_PEB_FREE) {
|
} else if (err == UBI_IO_FF) {
|
||||||
/* No VID header - the physical eraseblock is free */
|
/* No VID header - the physical eraseblock is free */
|
||||||
err = add_to_list(si, pnum, ec, &si->free);
|
err = add_to_list(si, pnum, ec, &si->free);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -85,10 +85,7 @@
|
||||||
/*
|
/*
|
||||||
* Error codes returned by the I/O sub-system.
|
* Error codes returned by the I/O sub-system.
|
||||||
*
|
*
|
||||||
* UBI_IO_PEB_EMPTY: the physical eraseblock is empty, i.e. it contains only
|
* UBI_IO_FF: the read region of flash contains only 0xFFs
|
||||||
* %0xFF bytes
|
|
||||||
* UBI_IO_PEB_FREE: the physical eraseblock is free, i.e. it contains only a
|
|
||||||
* valid erase counter header, and the rest are %0xFF bytes
|
|
||||||
* UBI_IO_BAD_HDR: the EC or VID header is corrupted (bad magic or CRC)
|
* UBI_IO_BAD_HDR: the EC or VID header is corrupted (bad magic or CRC)
|
||||||
* UBI_IO_BAD_HDR_EBADMSG: the same as %UBI_IO_BAD_HDR, but also there was a
|
* UBI_IO_BAD_HDR_EBADMSG: the same as %UBI_IO_BAD_HDR, but also there was a
|
||||||
* data integrity error reported by the MTD driver
|
* data integrity error reported by the MTD driver
|
||||||
|
@ -96,8 +93,7 @@
|
||||||
* UBI_IO_BITFLIPS: bit-flips were detected and corrected
|
* UBI_IO_BITFLIPS: bit-flips were detected and corrected
|
||||||
*/
|
*/
|
||||||
enum {
|
enum {
|
||||||
UBI_IO_PEB_EMPTY = 1,
|
UBI_IO_FF = 1,
|
||||||
UBI_IO_PEB_FREE,
|
|
||||||
UBI_IO_BAD_HDR,
|
UBI_IO_BAD_HDR,
|
||||||
UBI_IO_BAD_HDR_EBADMSG,
|
UBI_IO_BAD_HDR_EBADMSG,
|
||||||
UBI_IO_BITFLIPS
|
UBI_IO_BITFLIPS
|
||||||
|
|
|
@ -745,7 +745,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
|
||||||
|
|
||||||
err = ubi_io_read_vid_hdr(ubi, e1->pnum, vid_hdr, 0);
|
err = ubi_io_read_vid_hdr(ubi, e1->pnum, vid_hdr, 0);
|
||||||
if (err && err != UBI_IO_BITFLIPS) {
|
if (err && err != UBI_IO_BITFLIPS) {
|
||||||
if (err == UBI_IO_PEB_FREE) {
|
if (err == UBI_IO_FF) {
|
||||||
/*
|
/*
|
||||||
* We are trying to move PEB without a VID header. UBI
|
* We are trying to move PEB without a VID header. UBI
|
||||||
* always write VID headers shortly after the PEB was
|
* always write VID headers shortly after the PEB was
|
||||||
|
|
Loading…
Reference in New Issue