nand: adjust erase/read/write partition/chip size for bad blocks
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
--- common/cmd_nand.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
common/cmd_nand.c +51 -0
@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) { +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size); +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;
@@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n"
@@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }
@@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* The size for erase.part and erase.chip has been calculated +* for us as the remainder of the chip/partition from offset. +* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));
@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + } rwsize = size; }
Signature · 1 line
1.7.10.4
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
[Slightly off-topic, but I can't find the answer with google]
I changed the From: line in this patch e-mail to the address I use for this list rather than the address I committed with. Will this affect the author line once accepted upstream? That is, should I have left the From: address as it was created by format-patch?
Thanks,
Harvey
Quoted 108 lines · Harvey Chapman
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
Signed-off-by Harvey Chapman <[email protected]>---
common/cmd_nand.c| 51 +++++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 51 insertions(+)common/cmd_nand.c +51
-0@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) { +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size); +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;@@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n" @@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }@@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* The size for erase.part and erase.chip has been calculated +* for us as the remainder of the chip/partition from offset. +* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + } rwsize = size; }Signature · 6 lines
1.7.10.4 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
Quoted 2 lines · Harvey Chapman
[Slightly off-topic, but I can't find the answer with google]
I changed the From: line in this patch e-mail to the address I use for this list rather than the address I committed with. Will this affect the author line once accepted upstream? That is, should I have left the From: address as it was created by format-patch?
I got an answer via StackOverflow. Re-submitting the patch as a reply (hopefully).
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
From: Harvey Chapman <[email protected]>
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
--- common/cmd_nand.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
common/cmd_nand.c +51 -0
@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) { +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size); +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;
@@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n"
@@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }
@@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* The size for erase.part and erase.chip has been calculated +* for us as the remainder of the chip/partition from offset. +* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));
@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + } rwsize = size; }
Signature · 1 line
1.7.10.4
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
In reply to Harvey ChapmanAdjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
--- common/cmd_nand.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
common/cmd_nand.c +51 -0
@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) { +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size); +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;
@@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n"
@@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }
@@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* The size for erase.part and erase.chip has been calculated +* for us as the remainder of the chip/partition from offset. +* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));
@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + } rwsize = size; }
Signature · 1 line
1.7.10.4
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
Sorry for all of the e-mails while I fumble with git send-email.
Quoted 108 lines · Harvey Chapman
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
Signed-off-by Harvey Chapman <[email protected]>---
common/cmd_nand.c| 51 +++++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 51 insertions(+)common/cmd_nand.c +51
-0@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) { +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size); +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;@@ -524,6 +550,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n" @@ -540,8 +567,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }@@ -560,6 +589,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* The size for erase.part and erase.chip has been calculated +* for us as the remainder of the chip/partition from offset. +* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + } rwsize = size; }Signature · 6 lines
1.7.10.4 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
In reply to Harvey ChapmanQuoted 9 lines · Harvey Chapman
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
Signed-off-by Harvey Chapman <[email protected]>--- common/cmd_nand.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
Looks OK except for style issues:
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong · line 433
Quoted 12 lines
common/cmd_nand.c +1
-0@@ -428,6 +428,32 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, return ret; } +static int adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) {
Braces go on their own line for function definitions.
common/cmd_nand.c
Quoted 5 lines
common/cmd_nand.c +1
-0+/* We grab the nand info object here fresh because this is usually
common/cmd_nand.c +1
-0+* called after arg_off_size() which can change the value of dev.
common/cmd_nand.c +1
-0+*/
/*
* U-Boot multiline
* brace style is like this
*/
...in general, U-Boot follows Linux code style.
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, · line 444
Quoted 10 lines
common/cmd_nand.c +10
-0+nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + }
Need braces around multi-line statements.
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, · line 454
Quoted 10 lines
common/cmd_nand.c +10
-0+/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size);
Unnecessary parens.
Do we have any callers that care about the return code? If not, don't bother with it. This is an internal static function, not a public API. It's easy to change later if we need to.
common/cmd_nand.c static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 600
Quoted 11 lines
common/cmd_nand.c +1
-0+/* The size for erase.part and erase.chip has been calculated
common/cmd_nand.c +1
-0+* for us as the remainder of the chip/partition from offset.
common/cmd_nand.c +7
-0+* Adjust down for bad blocks, if necessary, so we don't +* erase past the end of the chip/partition by accident. +*/ +if (adjust_size && !scrub) { +adjust_size_for_badblocks (&size, off, dev); + } +
No braces around single-line if-bodies.
Quoted 26 lines
common/cmd_nand.c +1
-0nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0) return 1; +/* If no size was given, it has been calculated for us as
common/cmd_nand.c +1
-0+* the remainder of the chip/partition from offset. Adjust
common/cmd_nand.c +1
-0+* down for bad blocks, if necessary, so we don't
common/cmd_nand.c +1
-0+* read/write past the end of the partition by accident.
common/cmd_nand.c +5
-0+* +* nand read addr part size "size" is arg 5 +*/ +if (argc <5 ) { +/* Don't try to use rwsize here, it's not the
common/cmd_nand.c +3
-0+* right type +*/ + adjust_size_for_badblocks(&size, off,dev);
common/cmd_nand.c
Quoted 1 line
common/cmd_nand.c +1
-0+ }
No need to be quite so verbose in the comments. If someone tries to change "size" to "rwsize" the compiler will complain about the type mismatch.
As for the other comment, the function name "adjust_size_for_badblocks" explains what's going on well enough IMHO. At most a single comment of /* size is unspecified */ to describe the if block. At least put the explanation on the adjust_size_for_badblocks() function rather than repeat it for read/write and erase.
-Scott
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
Quoted 3 lines · Scott Wood
On 02/25/2013 11:43:48 PM, Harvey Chapman wrote:
Looks OK except for style issues:
Will do.
Quoted 10 lines
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, · line 434
Quoted 3 lines
common/cmd_nand.c +3
-0+/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ /*
* U-Boot multiline
* brace style is like this
*/...in general, U-Boot follows Linux code style.
I was trying to match the file. Every other multi-line comment in that file has the asterisks aligned.
Quoted 4 lines
Quoted 4 lines
common/cmd_nand.c +4
-0+nand_info_t *nand = &nand_info[dev]; +loff_t original_size = *size; +loff_t maxoffset = offset + *size; +int badblocks =0 ;
Quoted 8 lines
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, · line 444
Quoted 6 lines
common/cmd_nand.c +6
-0+ +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) +if (nand_block_isbad (nand, offset)) { + badblocks++; + }Need braces around multi-line statements.
I misunderstood you before. I thought you wanted them around the if body. Got it.
Quoted 13 lines
common/cmd_nand.c static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, · line 454
Quoted 10 lines
common/cmd_nand.c +10
-0+/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +/* return size adjusted as a positive value so callers +* can use the return code to determine if anything happened +*/ +return (original_size - *size);Unnecessary parens.
Quoted 1 line
Do we have any callers that care about the return code? If not, don't bother with it. This is an internal static function, not a public API. It's easy to change later if we need to.
Ok.
Quoted 12 lines
Quoted 12 lines
nand = &nand_info[dev]; memset(&opts, 0, sizeof(opts));common/cmd_nand.c +7
-0@@ -644,6 +682,19 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* If no size was given, it has been calculated for us as +* the remainder of the chip/partition from offset. Adjust +* down for bad blocks, if necessary, so we don't +* read/write past the end of the partition by accident. +* +* nand read addr part size "size" is arg 5 +*/
Quoted 8 lines
common/cmd_nand.c static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 697
Quoted 6 lines
common/cmd_nand.c +6
-0+if (argc <5 ) { +/* Don't try to use rwsize here, it's not the +* right type +*/ +adjust_size_for_badblocks (&size, off, dev); + }No need to be quite so verbose in the comments. If someone tries to change "size" to "rwsize" the compiler will complain about the type mismatch.
Actually, it does give a warning that flies by and is buried inside the compile log. Then, it'll let you run and walk on memory. Ask me how I know. :)
I don't have a special love for that comment; I'm ok to remove it.
Quoted 1 line
As for the other comment, the function name "
adjust_size_for_badblocks" explains what's going on well enough IMHO. At most a single comment of /* size is unspecified */ to describe the if block. At least put the explanation on theadjust_size_for_badblocks()function rather than repeat it for read/write and erase.
will do.
Thanks,
Harvey
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1089 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130226/2b592bfa/attachment.bin>
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
--- common/cmd_nand.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
common/cmd_nand.c +35 -0
@@ -428,6 +428,31 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,return ret; } +/* Adjust a chip/partition size down for bad blocks so we don't +* read/write/erase past the end of a chip/partition by accident. +*/ +static void adjust_size_for_badblocks (loff_t *size,loff_t offset,int dev) +{ +/* We grab the nand info object here fresh because this is usually +* called after arg_off_size() which can change the value of dev. +*/ +nand_info_t *nand = &nand_info[dev]; +loff_t maxoffset = offset + *size; +int badblocks =0 ; + +/* count badblocks in NAND from offset to offset + size */ +for (; offset < maxoffset; offset += nand->erasesize) { +if (nand_block_isbad (nand, offset)) + badblocks++; + } +/* adjust size if any bad blocks found */ +if (badblocks) { + *size -= badblocks * nand->erasesize; +printf ("size adjusted to 0x%llx (%d bad blocks)\n" , + (unsigned long long )*size, badblocks); + } +} +static int do_nand (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i, ret =0 ;
@@ -524,6 +549,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int scrub = !strncmp (cmd,"scrub" ,5 );int spread =0 ;int args =2 ; +int adjust_size =0 ;const char *scrub_warn ="Warning: " "scrub option will erase all factory set bad blocks!\n"
@@ -540,8 +566,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread =1 ; }else if (!strcmp (&cmd[5 ],".part" )) { args =1 ; + adjust_size =1 ; }else if (!strcmp (&cmd[5 ],".chip" )) { args =0 ; + adjust_size =1 ; }else { goto usage; }
@@ -560,6 +588,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 )return 1 ; +/* size is unspecified */ +if (adjust_size && !scrub) +adjust_size_for_badblocks (&size, off, dev); + nand = &nand_info[dev];memset (&opts,0 ,sizeof (opts));
@@ -644,6 +676,9 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &off, &size) != 0)return 1 ; +/* size is unspecified */ +if (argc <5 ) +adjust_size_for_badblocks (&rwsize, off, dev); rwsize = size; }
Signature · 1 line
1.7.10.4
Quoted 9 lines · Harvey Chapman
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
Signed-off-by Harvey Chapman <[email protected]>---
common/cmd_nand.c| 35 +++++++++++++++++++++++++++++++++++1 file changed, 35 insertions(+)
Applied to u-boot-nand-flash...
common/cmd_nand.c static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 681
Quoted 3 lines
common/cmd_nand.c +3
-0+/* size is unspecified */ +if (argc <5 ) +adjust_size_for_badblocks (&rwsize, off, dev);
...after fixing this to be &size rather than &rwsize.
-Scott
Quoted 11 lines · Scott Wood
Quoted 9 lines · Harvey Chapman
Adjust the sizes calculated for whole partition/chip operations by removing the size of bad blocks so we don't try to erase/read/write past a partition/chip boundary.
Signed-off-by Harvey Chapman <[email protected]>---
common/cmd_nand.c| 35 +++++++++++++++++++++++++++++++++++1 file changed, 35 insertions(+)
Quoted 8 lines
Applied to u-boot-nand-flash...
common/cmd_nand.c static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
Quoted 3 lines
common/cmd_nand.c +3
-0+/* size is unspecified */ +if (argc <5 ) + adjust_size_for_badblocks(&rwsize, off,dev);
...after fixing this to be &size rather than &rwsize.
...and then noticed that the next patch in my queue was a resent version of this with that fixed. :-P
-Scott
PATCH 1/1 nand: adjust erase/read/write partition/chip size for bad blocks
In reply to Harvey ChapmanQuoted 9 lines · Harvey Chapman
Quoted 1 line · Scott Wood
No need to be quite so verbose in the comments. If someone tries
to change "size" to "rwsize" the compiler will complain about the type mismatch.
Actually, it does give a warning that flies by and is buried inside the compile log. Then, it'll let you run and walk on memory. Ask me how I know. :)
Warnings are easier to spot if you pass "-s" to make (or use MAKEALL which does this).
-Scott