Fix issues and add new commands for onenand.
PATCH 1/1 Fix issues and add new commands for onenand.
This patch has been generated against the tip of u-boot-arm git - origin/omap3 branch.
This patch provides for a few more commands for onenand in tune with what is avaiable for NAND chips and also debugging functions like scrub and markbad. The bad block checking has been fixed for errors since the new framework was failing in reading OOB data.
--- common/cmd_onenand.c | 101 +++++++++++++++++----- drivers/mtd/onenand/onenand_base.c | 168 +++++++++++++++++++++++++++++++++--- drivers/mtd/onenand/onenand_bbt.c | 24 +++--- include/onenand_uboot.h | 7 ++ 4 files changed, 253 insertions(+), 47 deletions(-)
common/cmd_onenand.c +79 -22
@@ -24,6 +24,7 @@ extern struct onenand_chip onenand_chip;int do_onenand (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[]) {int ret =0 ; +loff_t ofs =0 ;switch (argc) {case 0 :
@@ -36,23 +37,53 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])onenand_init ();return 0 ; } +if (strncmp (argv[1 ],"info" ,4 ) !=0 ) +printf ("OneNAND: Incorrect command/number of args\n" );printf ("%s\n" , onenand_mtd.name);return 0 ; +case 3 : +if ((strncmp (argv[1 ],"markbad" ,7 ) ==0 ) && (argc ==3 )) { +int ret ; + ofs =simple_strtoul (argv[2 ],NULL ,16 ); +if (ofs >= onenand_mtd.size) { +printf ("Error : offset exceeds size\n" ); +return 0 ; + }else + ret =onenand_block_markbad (&onenand_mtd, ofs); + +if (ret) +printf ("Error marking bad-block\n" ); +else +printf ("Done\n" ); +return 0 ; + } +printf ("OneNAND : wrong number of arguments\n" ); +onenand_print_device_info (onenand_chip.device_id); +printf ("Usage:\n%s\n" , cmdtp->usage); +return 0 ; +default :/* At least 4 args */ -if (strncmp (argv[1 ],"erase" ,5 ) ==0 ) { +if (((strncmp (argv[1 ],"erase" ,5 ) ==0 ) || + (strncmp (argv[1 ],"scrub" ,5 ) ==0 )) && + (argc ==4 )) {struct erase_info instr = { .callback =NULL , }; -ulong start, end; -ulong block; +ulong start =0 , end =0 ; +ulong block =0 ;char *endtail;if (strncmp (argv[2 ],"block" ,5 ) ==0 ) { start =simple_strtoul (argv[3 ],NULL ,10 ); endtail =strchr (argv[3 ],'-' ); end =simple_strtoul (endtail +1 ,NULL ,10 ); +if (end < start) { +printf ("Error : erase failed - " ); +printf ("end block incorrect\n" ); +break ; + } }else { start =simple_strtoul (argv[2 ],NULL ,10 ); end =simple_strtoul (argv[3 ],NULL ,10 );
@@ -63,14 +94,21 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) end--; } -if (!end || end <0 ) - end = start; +if (!end || (end < start)) { +printf ("Error : erase failed " ); +printf ("end address incorrect\n" ); +break ; + }printf ("Erase block from %lu to %lu\n" , start, end);for (block = start; block <= end; block++) { instr.addr = block << onenand_chip.erase_shift; instr.len =1 << onenand_chip.erase_shift; +if (strncmp (argv[1 ],"scrub" ,5 ) ==0 ) + instr.priv =ONENAND_SCRUB ; +else + instr.priv =0 ; ret =onenand_erase (&onenand_mtd, &instr);if (ret) {printf ("erase failed %lu\n" , block);
@@ -79,9 +117,8 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }return 0 ; - } - -if (strncmp (argv[1 ],"read" ,4 ) ==0 ) { + }else if ((strncmp (argv[1 ],"read" ,4 ) ==0 ) && + (argc ==5 )) {ulong addr =simple_strtoul (argv[2 ],NULL ,16 );ulong ofs =simple_strtoul (argv[3 ],NULL ,16 );size_t len =simple_strtoul (argv[4 ],NULL ,16 );
@@ -95,6 +132,7 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ops.datbuf =NULL ; ops.ooblen = len; ops.oobbuf = (u_char *) addr; + ops.ooboffs =0 ; }else { ops.len = len; ops.datbuf = (u_char *) addr;
@@ -103,37 +141,44 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } ops.retlen = ops.oobretlen =0 ; - onenand_mtd.read_oob (&onenand_mtd, ofs, &ops); -printf ("Done\n" ); + ret = onenand_mtd.read_oob (&onenand_mtd, ofs, &ops); +if (ret) +printf ("Error reading from device\n" ); +else +printf ("Done\n" );return 0 ; - } -if (strncmp (argv[1 ],"write" ,5 ) ==0 ) { + }else if ((strncmp (argv[1 ],"write" ,5 ) ==0 ) && + (argc ==5 )) {ulong addr =simple_strtoul (argv[2 ],NULL ,16 );ulong ofs =simple_strtoul (argv[3 ],NULL ,16 );size_t len =simple_strtoul (argv[4 ],NULL ,16 );size_t retlen =0 ; -onenand_write (&onenand_mtd, ofs, len, &retlen, + ret =onenand_write (&onenand_mtd, ofs, len, &retlen, (u_char *) addr); -printf ("Done\n" ); +if (ret) +printf ("Error writing to device\n" ); +else +printf ("Done\n" );return 0 ; - } - -if (strncmp (argv[1 ],"block" ,5 ) ==0 ) { + }else if (strncmp (argv[1 ],"block" ,5 ) ==0 ) {ulong addr =simple_strtoul (argv[2 ],NULL ,16 );ulong block =simple_strtoul (argv[3 ],NULL ,10 ); -ulong page =simple_strtoul (argv[4 ],NULL ,10 ); -size_t len =simple_strtol (argv[5 ],NULL ,10 ); +ulong page; +size_t len;ulong ofs;int oob =strncmp (argv[1 ],"block.oob" ,9 ) ?0 :1 ;struct mtd_oob_ops ops; ops.mode =MTD_OOB_PLACE ; - +if (argc >=5 ) + page =simple_strtoul (argv[4 ],NULL ,10 ); +if (argc >=6 ) + len =simple_strtol (argv[5 ],NULL ,10 ); ofs = block << onenand_chip.erase_shift;if (page) ofs += page << onenand_chip.page_shift;
@@ -156,6 +201,10 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])onenand_read_oob (&onenand_mtd, ofs, &ops);return 0 ; + }else { +printf ("OneNAND : wrong number of arguments\n" ); +onenand_print_device_info (onenand_chip.device_id); +printf ("Usage:\n%s\n" , cmdtp->usage); }break ;
@@ -169,8 +218,16 @@ U_BOOT_CMD("onenand - OneNAND sub-system\n" ,"info - show available OneNAND devices\n" "onenand read[.oob] addr ofs len - read data at ofs with len to addr\n" +" ---ofs and len(not for oob) have to be page aligned\n" "onenand write addr ofs len - write data at ofs with len from addr\n" -"onenand erase saddr eaddr - erase block start addr to end addr\n" +" ---ofs and len have to be page aligned\n" +"onenand erase sofs eofs - erase block start addr ofs to end addr ofs\n" +"onenand erase block sblk-endblk - erase blocks sblk to endblk\n" +" ---erase command does not erase bad blocks\n" +"onenand scrub block start-end - erase block from start to end\n" +"onenand scrub sofs eofs - erase blocks start ofs to end ofs\n" +" ---CAUTION :scrub command erases bad blocks also\n" "onenand block[.oob] addr block [page] [len] - " -"read data with (block [, page]) to addr" +"read data with (block [, page]) to addr\n" +"onenand markbad ofs - mark bad-block at ofs\n" );
drivers/mtd/onenand/onenand_base.c +155 -13
261 lines not on this page · raw message
drivers/mtd/onenand/onenand_bbt.c +12 -12
@@ -69,14 +69,16 @@ static int create_bbt(struct mtd_info *mtd, uint8_t * buf,loff_t from;size_t readlen, ooblen;struct mtd_oob_ops ops; +uint8_t oobbuf[16 ];printk (KERN_INFO "Scanning device for bad blocks\n" ); - len =1 ; + len =2 ;/* We need only read few bytes from the OOB area */ scanlen = ooblen =0 ; readlen = bd->len; + scanlen = bd->len;/* chip == -1 case only */ /* Note that numblocks is 2 * (real numblocks) here;
@@ -88,29 +90,27 @@ static int create_bbt(struct mtd_info *mtd, uint8_t * buf, ops.mode =MTD_OOB_PLACE ; ops.ooblen = readlen; - ops.oobbuf = buf; - ops.len = ops.ooboffs = ops.retlen = ops.oobretlen =0 ; + ops.oobbuf = &oobbuf[0 ] ; + ops.datbuf =NULL ; + ops.len = ops.retlen = ops.oobretlen =0 ; + ops.ooboffs =2 ;for (i = startblock; i < numblocks;) {int ret; -for (j =0 ; j < len; j++) {/* No need to read pages fully, -* just read required OOB bytes */ - ret =onenand_bbt_read_oob (mtd, - from + j * mtd->writesize + - bd->offs, &ops); - +* just read required OOB bytes */ + ret =onenand_read_oob (mtd, from, &ops);/* If it is a initial bad block, just ignore it */ if (ret ==ONENAND_BBT_READ_FATAL_ERROR )return -EIO ;if (ret ||check_short_pattern - (&buf[j * scanlen], scanlen, mtd->writesize, bd)) { + (ops.oobbuf, scanlen, mtd->writesize, bd)) { bbm->bbt[i >>3 ] |=0x03 << (i &0x6 );printk (KERN_WARNING -"Bad eraseblock %d@0x%08x\n" , i >>1 , - (unsigned int )from); +"Bad eraseblock %d at 0x%08x\n" , i >>1 , + (unsigned int )from);break ; } }
include/onenand_uboot.h +7 -0
@@ -20,6 +20,8 @@struct mtd_info ;struct erase_info ; +#define ONENAND_SCRUB 0x10 +extern struct mtd_info onenand_mtd;/* Functions */
@@ -30,10 +32,15 @@ extern int onenand_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops);extern int onenand_write (struct mtd_info *mtd,loff_t from,size_t len,size_t * retlen,const u_char * buf); +extern int onenand_write_oob (struct mtd_info *mtd,loff_t to, +struct mtd_oob_ops *oob_ops);extern int onenand_erase (struct mtd_info *mtd,struct erase_info *instr);extern int onenand_unlock (struct mtd_info *mtd,loff_t ofs,size_t len);extern char *onenand_print_device_info (int device); +extern int onenand_block_markbad (struct mtd_info *mtd,loff_t ofs); +extern int onenand_block_isbad (struct mtd_info *mtd,loff_t ofs); +#endif /* __UBOOT_ONENAND_H */
Signature · 1 line
1.5.6
PATCH 1/1 Fix issues and add new commands for onenand.
Quoted 6 lines · Manikandan Pillai
This patch has been generated against the tip of u-boot-arm git - origin/omap3 branch.
This patch provides for a few more commands for onenand in tune with what is avaiable for NAND chips and also debugging functions like scrub and markbad. The bad block checking has been fixed for errors since the new framework was failing in reading OOB data.
At least some of your changes are already integrated in the u-boot-nand-flash "next" branch. Please take at look at it and submit you next patch based on this branch.
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH 1/1 Fix issues and add new commands for onenand.
In reply to Manikandan PillaiQuoted 2 lines · Manikandan Pillai
This patch has been generated against the tip of u-boot-arm git - origin/omap3 branch.
Please make sure that any patch applies on top of the "next" branch of u-boot-nand-flash (or rebase during the merge window).
Quoted 4 lines
This patch provides for a few more commands for onenand in tune with what is avaiable for NAND chips and also debugging functions like scrub and markbad. The bad block checking has been fixed for errors since the new framework was failing in reading OOB data.
Another way to have the same functionality available on NAND and OneNAND is to merge the code. :-)
Could you separate the bugfixes, or at least indicate specifically what the bug is?
common/cmd_onenand.c int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 46
Quoted 2 lines
common/cmd_onenand.c +2
-0+case 3 : +if ((strncmp (argv[1 ],"markbad" ,7 ) ==0 ) && (argc ==3 )) {
You can only get here if argc == 3, so the extra check is redundant.
common/cmd_onenand.c int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 54
Quoted 8 lines
common/cmd_onenand.c +8
-0+int ret ; + ofs =simple_strtoul (argv[2 ],NULL ,16 ); +if (ofs >= onenand_mtd.size) { +printf ("Error : offset exceeds size\n" ); +return 0 ; + }else + ret =onenand_block_markbad (&onenand_mtd, ofs); +
Unnecessary else.
Quoted 7 lines
common/cmd_onenand.c +7
-0+if (ret) +printf ("Error marking bad-block\n" ); +else +printf ("Done\n" ); +return 0 ; + } +printf ("OneNAND : wrong number of arguments\n" );
common/cmd_onenand.c int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 70
Quoted 10 lines
common/cmd_onenand.c +7
-1+onenand_print_device_info (onenand_chip.device_id); +printf ("Usage:\n%s\n" , cmdtp->usage); +return 0 ; +default :/* At least 4 args */ -if (strncmp (argv[1 ],"erase" ,5 ) ==0 ) { +if (((strncmp (argv[1 ],"erase" ,5 ) ==0 ) || + (strncmp (argv[1 ],"scrub" ,5 ) ==0 )) && + (argc ==4 )) {
Please align continuation lines with the beginning of the condition; just hitting tab once makes it hard to distinguish them from the if-body.
Quoted 7 lines
common/cmd_onenand.c +2
-2struct erase_info instr = { .callback =NULL , }; -ulong start, end; -ulong block; +ulong start =0 , end =0 ; +ulong block =0 ;
common/cmd_onenand.c int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 85
Quoted 10 lines
common/cmd_onenand.c +4
-0char *endtail;if (strncmp (argv[2 ],"block" ,5 ) ==0 ) { start =simple_strtoul (argv[3 ],NULL ,10 ); endtail =strchr (argv[3 ],'-' ); end =simple_strtoul (endtail +1 ,NULL ,10 ); +if (end < start) { +printf ("Error : erase failed - " ); +printf ("end block incorrect\n" ); +break ;
Just use one printf() with a continuation line -- or better yet, factor the code out into its own function so it's not so heavily indented.
Quoted 12 lines
common/cmd_onenand.c +3
-3-if (strncmp (argv[1 ],"write" ,5 ) ==0 ) { + }else if ((strncmp (argv[1 ],"write" ,5 ) ==0 ) && + (argc ==5 )) {ulong addr =simple_strtoul (argv[2 ],NULL ,16 );ulong ofs =simple_strtoul (argv[3 ],NULL ,16 );size_t len =simple_strtoul (argv[4 ],NULL ,16 );size_t retlen =0 ; -onenand_write (&onenand_mtd, ofs, len, &retlen, + ret =onenand_write (&onenand_mtd, ofs, len, &retlen, (u_char *) addr); -printf ("Done\n" );
common/cmd_onenand.c int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 167
Quoted 10 lines
common/cmd_onenand.c +5
-3+if (ret) +printf ("Error writing to device\n" ); +else +printf ("Done\n" );return 0 ; - } - -if (strncmp (argv[1 ],"block" ,5 ) ==0 ) { + }else if (strncmp (argv[1 ],"block" ,5 ) ==0 ) {
The else is not necessary.
Quoted 15 lines
drivers/mtd/onenand/onenand_base.c +0
-2@@ -790,13 +868,11 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from, } ops->oobretlen = read; -if (ret)return ret;if (mtd->ecc_stats.failed - stats.failed)return -EBADMSG ; -return 0 ; }
drivers/mtd/onenand/onenand_base.c static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to, · line 1331
Quoted 7 lines
drivers/mtd/onenand/onenand_base.c +0
-1@@ -1250,7 +1326,6 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,/* Initialize retlen, in case of early exit */ ops->oobretlen =0 ; -if (mode ==MTD_OOB_AUTO ) oobsize = this->ecclayout->oobavail;else
Please don't make unrelated (and IMHO undesireable) whitespace changes.
drivers/mtd/onenand/onenand_base.c int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) · line 1559
Quoted 2 lines
drivers/mtd/onenand/onenand_base.c +2
-0+printf ("onenand_erase: not erasing\ +factory bad blk @0x%x\n" , (int )addr);
That's going to insert a bunch of tabs into the output.
Do this instead:
printf("a really long line"
"and the continuation");
drivers/mtd/onenand/onenand_base.c int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) · line 1568
Quoted 4 lines
drivers/mtd/onenand/onenand_base.c +4
-0+if (onenand_block_isbad (mtd, addr) ==0 ) { +/* block is not a known bad block. Erase it */ + this->command (mtd,ONENAND_CMD_ERASE ,\ + addr, block_size);
Unnecessary backslash.
-Scott