NAND: fixes
Subsystems (2)
This is part of my patcheset that touches the nand subsystem
Stanley, patch #2 should now cover attempts to write outside the oob.
Also I did another (don't know if less or more evil) approach to bad block testing. Now check_bad always takes the controller locks and selects the chip. Thus it is possible to use read_oob/write_oob.
This however changes behavier of the nand_erase_nand to deny erases if any block within the range is bad. Also it selects/releases the chip once per erase block. This is done in patch #5. Patch #6 is ported to that change.
Patches 1-3 are pure fixes.
Best regards,
Maxim Levitsky
PATCH 1/7 MTD: nand: make MTD_OOB_PLACE work correctly.
MTD_OOB_PLACE is supposed to read/write raw oob data similiar to MTD_OOB_RAW however due to a bug, currently its not possible to read more data that specified in oob 'free' regions
--- drivers/mtd/nand/nand_base.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/mtd/nand/nand_base.c +5 -1
@@ -1232,6 +1232,9 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,int ret =0 ;uint32_t readlen = ops->len;uint32_t oobreadlen = ops->ooblen; +uint32_t max_oobsize = ops->mode ==MTD_OOB_AUTO ? + mtd->oobavail : mtd->oobsize; +uint8_t *bufpoi, *oob, *buf; stats = mtd->ecc_stats;
@@ -1282,10 +1285,11 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, buf += bytes;if (unlikely (oob)) { +/* Raw mode does data:oob:data:oob */ if (ops->mode !=MTD_OOB_RAW ) {int toread =min (oobreadlen, - chip->ecc.layout->oobavail); + max_oobsize);if (toread) { oob =nand_transfer_oob (chip, oob, ops, toread);
Signature · 1 line
1.6.3.3
PATCH 2/7 MTD: nand: cleanup nand_do_write_ops
In reply to Maxim Levitskynand_do_write_ops have broken in regard to writing several pages each with its own oob Although nand_do_write_ops intends to allow such mode, it fails do do so Probably this was never tested.
Also add missing checks for attemts to write at illegal offsets
--- drivers/mtd/nand/nand_base.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-)
drivers/mtd/nand/nand_base.c +17 -7
@@ -1884,11 +1884,9 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,* @oob: oob data buffer * @ops: oob ops structure */ -static uint8_t *nand_fill_oob (struct nand_chip *chip,uint8_t *oob, -struct mtd_oob_ops *ops) +static uint8_t *nand_fill_oob (struct nand_chip *chip,uint8_t *oob,size_t len, +struct mtd_oob_ops *ops) { -size_t len = ops->ooblen; -switch (ops->mode) {case MTD_OOB_PLACE :
@@ -1943,6 +1941,11 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,int chipnr, realpage, page, blockmask, column;struct nand_chip *chip = mtd->priv;uint32_t writelen = ops->len; + +uint32_t oobwritelen = ops->ooblen; +uint32_t oobmaxlen = ops->mode ==MTD_OOB_AUTO ? + mtd->oobavail : mtd->oobsize; +uint8_t *oob = ops->oobbuf;uint8_t *buf = ops->datbuf;int ret, subpage;
@@ -1984,6 +1987,10 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,if (likely (!oob))memset (chip->oob_poi,0xff , mtd->oobsize); +/* Don't allow multipage oob writes with offset */ +if (ops->ooboffs && (ops->ooboffs + ops->ooblen > oobmaxlen)) +return -EINVAL ; +while (1 ) {int bytes = mtd->writesize;int cached = writelen > bytes && page != blockmask;
@@ -1999,8 +2006,11 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, wbuf = chip->buffers->databuf; } -if (unlikely (oob)) - oob =nand_fill_oob (chip, oob, ops); +if (unlikely (oob)) { +size_t len =min (oobwritelen, oobmaxlen); + oob =nand_fill_oob (chip, oob, len, ops); + oobwritelen -= len; + } ret = chip->write_page (mtd, chip, wbuf, page, cached, (ops->mode ==MTD_OOB_RAW ));
@@ -2174,7 +2184,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, chip->pagebuf =-1 ;memset (chip->oob_poi,0xff , mtd->oobsize); -nand_fill_oob (chip, ops->oobbuf, ops); +nand_fill_oob (chip, ops->oobbuf, ops->ooblen, ops); status = chip->ecc.write_oob (mtd, chip, page & chip->pagemask);memset (chip->oob_poi,0xff , mtd->oobsize);
Signature · 1 line
1.6.3.3
PATCH 3/7 MTD: nand: make suspend work if device is accessed by kernel threads.
In reply to Maxim LevitskySince all userspace threads are frozen at the time the nand_suspend is called, they aren't inside any nand function.
We don't call try_to_freeze in nand ether. Thus the only user that can be insize the nand functions is an non freezeable kernel thread.
Thus we can safely wait for it to finish.
--- drivers/mtd/nand/nand_base.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/mtd/nand/nand_base.c +0 -3
@@ -744,9 +744,6 @@ nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state) chip->state =FL_PM_SUSPENDED ;spin_unlock (lock);return 0 ; - }else { -spin_unlock (lock); -return -EAGAIN ; } }set_current_state (TASK_UNINTERRUPTIBLE );
Signature · 1 line
1.6.3.3
PATCH 4/7 MTD: nand: make reads using MTD_OOB_RAW affect only ECC validation
In reply to Maxim LevitskyThis changes the behavier of MTD_OOB_RAW. It used to read both OOB and data to the data buffer, however you would still need to specify the dummy oob buffer.
This is only used in one place, but makes it hard to read data+oob without ECC test, thus I removed that behavier, and fixed the user.
Now MTD_OOB_RAW behaves like MTD_OOB_PLACE, but doesn't do ECC validation
--- drivers/mtd/nand/nand_base.c | 19 +++++++------------ drivers/mtd/nand/nand_bbt.c | 26 ++++++++++++++++++++++---- include/linux/mtd/mtd.h | 4 +--- 3 files changed, 30 insertions(+), 19 deletions(-)
drivers/mtd/nand/nand_base.c +7 -12
@@ -1283,18 +1283,13 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,if (unlikely (oob)) { -/* Raw mode does data:oob:data:oob */ -if (ops->mode !=MTD_OOB_RAW ) { -int toread =min (oobreadlen, - max_oobsize); -if (toread) { - oob =nand_transfer_oob (chip, - oob, ops, toread); - oobreadlen -= toread; - } - }else - buf =nand_transfer_oob (chip, - buf, ops, mtd->oobsize); +int toread =min (oobreadlen, max_oobsize); + +if (toread) { + oob =nand_transfer_oob (chip, + oob, ops, toread); + oobreadlen -= toread; + } }if (!(chip->options &NAND_NO_READRDY )) {
drivers/mtd/nand/nand_bbt.c +22 -4
@@ -237,15 +237,33 @@ static int scan_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t offs, size_t len) {struct mtd_oob_ops ops; +int res; ops.mode =MTD_OOB_RAW ; ops.ooboffs =0 ; ops.ooblen = mtd->oobsize; - ops.oobbuf = buf; - ops.datbuf = buf; - ops.len = len; -return mtd->read_oob (mtd, offs, &ops); + +while (len >0 ) { +if (len <= mtd->writesize) { + ops.oobbuf = buf + len; + ops.datbuf = buf; + ops.len = len; +return mtd->read_oob (mtd, offs, &ops); + }else { + ops.oobbuf = buf + mtd->writesize; + ops.datbuf = buf; + ops.len = mtd->writesize; + res = mtd->read_oob (mtd, offs, &ops); + +if (res) +return res; + } + + buf += mtd->oobsize + mtd->writesize; + len -= mtd->writesize; + } +return 0 ; }/*
include/linux/mtd/mtd.h +1 -3
@@ -61,9 +61,7 @@ struct mtd_erase_region_info {* MTD_OOB_PLACE: oob data are placed at the given offset * MTD_OOB_AUTO: oob data are automatically placed at the free areas * which are defined by the ecclayout -* MTD_OOB_RAW: mode to read raw data+oob in one chunk. The oob data -* is inserted into the data. Thats a raw image of the -* flash contents. +* MTD_OOB_RAW: mode to read oob and data without doing ECC checking */ typedef enum { MTD_OOB_PLACE,
Signature · 1 line
1.6.3.3
PATCH 5/7 NAND: make ->check_bad more user friendly
In reply to Maxim LevitskyCurrently to implement a custom ->check_bad one need to call nand_get_device, nand_release_device.
Also it not possible to use mtd->read_oob because they call nand_get_device too.
Refactor the code, so check_bad now always has to do nand_get_device Thus it can use plain mtd->read_oob
--- drivers/mtd/nand/cafe_nand.c | 2 +- drivers/mtd/nand/diskonchip.c | 2 +- drivers/mtd/nand/nand_base.c | 74 ++++++++++++++++++++++++++--------------- include/linux/mtd/nand.h | 2 +- 4 files changed, 50 insertions(+), 30 deletions(-)
drivers/mtd/nand/cafe_nand.c +1 -1
@@ -577,7 +577,7 @@ static int cafe_nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,return 0 ; } -static int cafe_nand_block_bad (struct mtd_info *mtd,loff_t ofs,int getchip) +static int cafe_nand_block_bad (struct mtd_info *mtd,loff_t ofs) {return 0 ; }
drivers/mtd/nand/diskonchip.c +1 -1
@@ -854,7 +854,7 @@ static int doc200x_dev_ready(struct mtd_info *mtd) } } -static int doc200x_block_bad (struct mtd_info *mtd,loff_t ofs,int getchip) +static int doc200x_block_bad (struct mtd_info *mtd,loff_t ofs) {/* This is our last resort if we couldn't find or create a BBT. Just pretend all blocks are good. */
drivers/mtd/nand/nand_base.c +47 -27
132 lines not on this page · raw message
include/linux/mtd/nand.h +1 -1
@@ -364,7 +364,7 @@ struct nand_chip {void (*read_buf)(struct mtd_info *mtd,uint8_t *buf,int len);int (*verify_buf)(struct mtd_info *mtd,const uint8_t *buf,int len);void (*select_chip)(struct mtd_info *mtd,int chip); -int (*block_bad)(struct mtd_info *mtd,loff_t ofs,int getchip); +int (*block_bad)(struct mtd_info *mtd,loff_t ofs);int (*block_markbad)(struct mtd_info *mtd,loff_t ofs);void (*cmd_ctrl)(struct mtd_info *mtd,int dat,unsigned int ctrl);
Signature · 1 line
1.6.3.3
PATCH 6/7 MTD: common module for smartmedia/xD support
In reply to Maxim LevitskyThis small module implements few helpers that are usefull for nand drivers for SmartMedia/xD card readers.
--- drivers/mtd/nand/Kconfig | 9 +++ drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/sm_common.c | 114 ++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/sm_common.h | 61 ++++++++++++++++++++++ 4 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 drivers/mtd/nand/sm_common.c create mode 100644 drivers/mtd/nand/sm_common.h
drivers/mtd/nand/Kconfig +9 -0
@@ -18,6 +18,10 @@ config MTD_NAND_VERIFY_WRITE device thinks the write was successful, a bit could have been flipped accidentally due to device wear or something else. +config MTD_NAND_SMARTMEDIA + boolean + default n + config MTD_NAND_ECC_SMC bool "NAND ECC Smart Media byte order" default n
@@ -25,6 +29,11 @@ config MTD_NAND_ECC_SMC Software ECC according to the Smart Media Specification. The original Linux implementation had byte 0 and 1 swapped. +config MTD_SM_COMMON + select MTD_NAND_SMARTMEDIA + tristate + default n + config MTD_NAND_MUSEUM_IDS bool "Enable chip ids for obsolete ancient NAND devices" depends on MTD_NAND
drivers/mtd/nand/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o +obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
drivers/mtd/nand/sm_common.c new file +114 -0
114 lines not on this page · raw message
drivers/mtd/nand/sm_common.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 7/7 MTD: add few workarounds to nand system for SmartMedia/xD chips.
In reply to Maxim Levitsky* Add an option NAND_SMARTMEDIA that can be set by nand driver If set, it will cause separate ID table to be used, which includes mask rom devices and new xD cards
* Workaround for wrong write protect status on some xD cards
--- drivers/mtd/nand/nand_base.c | 30 ++++++++++++++++++++++-------- drivers/mtd/nand/nand_ids.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/mtd/nand.h | 11 +++++++++++ 3 files changed, 72 insertions(+), 8 deletions(-)
drivers/mtd/nand/nand_base.c +22 -8
@@ -395,9 +395,18 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)static int nand_check_wp (struct mtd_info *mtd) {struct nand_chip *chip = mtd->priv; +int wp; + +/* broken xD cards report WP despite beeing writable */ +if (chip->options &NAND_BROKEN_XD ) +return 0 ; +/* Check the WP bit */ chip->cmdfunc (mtd,NAND_CMD_STATUS ,-1 ,-1 ); -return (chip->read_byte (mtd) &NAND_STATUS_WP ) ?0 :1 ; + wp = (chip->read_byte (mtd) &NAND_STATUS_WP ) ?0 :1 ; + + +return wp; }/**
@@ -2651,14 +2660,18 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, }/* Lookup the flash id */ -for (i =0 ; nand_flash_ids[i].name !=NULL ; i++) { -if (dev_id == nand_flash_ids[i].id) { - type = &nand_flash_ids[i]; +#ifdef CONFIG_MTD_NAND_SMARTMEDIA +if (chip->options &NAND_SMARTMEDIA ) + type = nand_smartmedia_flash_ids; + else +#endif + type = nand_flash_ids; + +for (i =0 ; type->name !=NULL ; type++) +if (dev_id == type->id)break ; - } - } -if (!type) +if (!type->name)return ERR_PTR (-ENODEV );if (!mtd->name)
@@ -3015,7 +3028,8 @@ int nand_scan_tail(struct mtd_info *mtd)/* Fill in remaining MTD driver data */ mtd->type =MTD_NANDFLASH ; - mtd->flags =MTD_CAP_NANDFLASH ; + mtd->flags = chip->options &NAND_ROM ?MTD_CAP_ROM : +MTD_CAP_NANDFLASH ; mtd->erase = nand_erase; mtd->point =NULL ; mtd->unpoint =NULL ;
drivers/mtd/nand/nand_ids.c +39 -0
@@ -127,6 +127,45 @@ struct nand_flash_dev nand_flash_ids[] = { {NULL,} }; +#ifdef CONFIG_MTD_NAND_SMARTMEDIA +struct nand_flash_dev nand_smartmedia_flash_ids[] = { + +/* SmartMedia */ + {"SmartMedia 1MiB 5V" ,0x6e ,256 ,1 ,0x1000 ,0 }, + {"SmartMedia 1MiB 3,3V" ,0xe8 ,256 ,1 ,0x1000 ,0 }, + {"SmartMedia 1MiB 3,3V" ,0xec ,256 ,1 ,0x1000 ,0 }, + {"SmartMedia 2MiB 3,3V" ,0xea ,256 ,2 ,0x1000 ,0 }, + {"SmartMedia 2MiB 5V" ,0x64 ,256 ,2 ,0x1000 ,0 }, + {"SmartMedia 2MiB 3,3V ROM" ,0x5d ,512 ,2 ,0x2000 ,NAND_ROM }, + {"SmartMedia 4MiB 3,3V" ,0xe3 ,512 ,4 ,0x2000 ,0 }, + {"SmartMedia 4MiB 3,3/5V" ,0xe5 ,512 ,4 ,0x2000 ,0 }, + {"SmartMedia 4MiB 5V" ,0x6b ,512 ,4 ,0x2000 ,0 }, + {"SmartMedia 4MiB 3,3V ROM" ,0xd5 ,512 ,4 ,0x2000 ,NAND_ROM }, + {"SmartMedia 8MiB 3,3V" ,0xe6 ,512 ,8 ,0x2000 ,0 }, + {"SmartMedia 8MiB 3,3V ROM" ,0xd6 ,512 ,8 ,0x2000 ,NAND_ROM }, + +#define XD_TYPEM (NAND_NO_AUTOINCR | NAND_BROKEN_XD) +/* xD / SmartMedia */ + {"SmartMedia/xD 16MiB 3,3V" ,0x73 ,512 ,16 ,0x4000 ,0 }, + {"SmartMedia 16MiB 3,3V ROM" ,0x57 ,512 ,16 ,0x4000 ,NAND_ROM }, + {"SmartMedia/xD 32MiB 3,3V" ,0x75 ,512 ,32 ,0x4000 ,0 }, + {"SmartMedia 32MiB 3,3V ROM" ,0x58 ,512 ,32 ,0x4000 ,NAND_ROM }, + {"SmartMedia/xD 64MiB 3,3V" ,0x76 ,512 ,64 ,0x4000 ,0 }, + {"SmartMedia 64MiB 3,3V ROM" ,0xd9 ,512 ,64 ,0x4000 ,NAND_ROM }, + {"SmartMedia/xD 128MiB 3,3V" ,0x79 ,512 ,128 ,0x4000 ,0 }, + {"SmartMedia 128MiB 3,3V ROM" ,0xda ,512 ,128 ,0x4000 ,NAND_ROM }, + {"SmartMedia/xD 256MiB 3,3V" ,0x71 ,512 ,256 ,0x4000 ,XD_TYPEM }, + {"SmartMedia 256MiB 3,3V ROM" ,0x5b ,512 ,256 ,0x4000 ,NAND_ROM }, + +/* xD only */ + {"xD 512MiB 3,3V" ,0xDC ,512 ,512 ,0x4000 ,XD_TYPEM }, + {"xD 1GiB 3,3V" ,0xD3 ,512 ,1024 ,0x4000 ,XD_TYPEM }, + {"xD 2GiB 3,3V" ,0xD5 ,512 ,2048 ,0x4000 ,XD_TYPEM }, + {NULL ,} +}; +EXPORT_SYMBOL (nand_smartmedia_flash_ids); +#endif +/* * Manufacturer ID list */
include/linux/mtd/nand.h +11 -0
@@ -170,6 +170,12 @@ typedef enum {/* Chip does not allow subpage writes */ #define NAND_NO_SUBPAGE_WRITE 0x00000200 +/* Device is one of 'new' xD cards that expose fake nand command set */ +#define NAND_BROKEN_XD 0x00000400 + +/* Device behaves just like nand, but is readonly */ +#define NAND_ROM 0x00000800 +/* Options valid for Samsung large page devices */ #define NAND_SAMSUNG_LP_OPTIONS \ (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK)
@@ -195,9 +201,13 @@ typedef enum {/* This option is defined if the board driver allocates its own buffers (e.g. because it needs them DMA-coherent */ #define NAND_OWN_BUFFERS 0x00040000 +/* Chip may not exist, so silence any errors in scan */ #define NAND_SCAN_SILENT_NODEV 0x00080000 +/* controller supports only xD/SmartMedia cards*/ +#define NAND_SMARTMEDIA 0x00100000 +/* Options set by nand scan */ /* Nand scan has allocated controller struct */ #define NAND_CONTROLLER_ALLOC 0x80000000
@@ -458,6 +468,7 @@ struct nand_manufacturers { };extern struct nand_flash_dev nand_flash_ids[]; +extern struct nand_flash_dev nand_smartmedia_flash_ids[];extern struct nand_manufacturers nand_manuf_ids[];extern int nand_scan_bbt (struct mtd_info *mtd,struct nand_bbt_descr *bd);
Signature · 1 line
1.6.3.3
Quoted 11 lines · Maxim Levitsky
This is part of my patcheset that touches the nand subsystem
Stanley, patch #2 should now cover attempts to write outside the oob.
Also I did another (don't know if less or more evil) approach to bad block testing. Now
check_badalways takes the controller locks and selects the chip. Thus it is possible to use read_oob/write_oob.
This however changes behavier of thenand_erase_nandto deny erases if any block within the range is bad. Also it selects/releases the chip once per erase block. This is done in patch #5. Patch #6 is ported to that change.
Quoted 4 lines
Patches 1-3 are pure fixes.
Best regards,
Maxim Levitsky
Any update?
Best regards,
Maxim Levitsky