mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project
Subsystems (2)
v7 cover mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project
The change is based on the fix for flash erase to use chip_good() done in the past. And it is fixed as same way in the OpenWrt Project as below.
<https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=ddc11c3932>
Also includes some refactoring changes.
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
Tokunori Ikegami (9):
mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
mtd: cfi_cmdset_0002: Remove goto statement from do_write_buffer()
mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce function size
mtd: cfi_cmdset_0002: Split do_write_oneword() op_done goto statement
mtd: cfi_cmdset_0002: Remove op_done goto statement from
do_write_oneword()
mtd: cfi_cmdset_0002: Split write-to-buffer-reset sequence
mtd: cfi_cmdset_0002: Split to wait write buffer to check if completed
mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce exit paths
mtd: cfi_cmdset_0002: Disable write buffer functions if
FORCE_WORD_WRITE is 1
drivers/mtd/chips/cfi_cmdset_0002.c | 290 ++++++++++++++++++++++-------------- 1 file changed, 182 insertions(+), 108 deletions(-)
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 1/9 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
As reported by the OpenWRT team, write requests sometimes fail on some platforms.
Currently to check the state chip_ready() is used correctly as described by the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error checking").
But actually the write failure is caused on some platforms and also it can be fixed by using chip_good() to check the state and retry instead. Also it seems that it is caused after repeated about 1,000 times to retry the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the retry with reset.
It is depended on the actual flash chip behavior so the root cause is unknown.
---
Changes since v6:
- Change the tag of Hauke Mehrtens to Signed-off-by as confirmed with him.
- Removed the tag of Koen Vandeputte as confirmed with him.
- Address the ./scripts/checkpatch.pl issues.
- Fix to remain the file type as 100644.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change to follow Liu Jian's fixes in master for the write buffer.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Update the commit message for the comments.
- Drop the addition of blanks lines around xip_enable().
- Delete unnecessary setting the ret variable to -EIO.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- Just update the commit message for the comment.
Changes since v1:
- Just update the commit message.
Background:
This is required for OpenWrt Project to result the flash write issue as below patche.
<https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=ddc11c3932c7b7b7df7d5fbd48f207e77619eaa7>
Also the original patch in OpenWRT is below.
<https://github.com/openwrt/openwrt/blob/v18.06.0/target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch>
The reason to use chip_good() is that just actually fix the issue. And also in the past I had fixed the erase function also as same way by the patch below.
<https://patchwork.ozlabs.org/patch/922656/>
Note: The reason for the patch for erase is same.
In my understanding the chip_ready() is just checked the value twice from flash.
So I think that sometimes incorrect value is read twice and it is depended on the flash device behavior but not sure..
So change to use chip_good() instead of chip_ready().
drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +12 -6
@@ -1628,29 +1628,35 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,continue ; } -if (time_after (jiffies, timeo) && !chip_ready (map, adr)){ +/* +* We check "time_after" and "!chip_good" before checking +* "chip_good" to avoid the failure due to scheduling. +*/ +if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) {xip_enable (map, chip, adr);printk (KERN_WARNING "MTD %s(): software timeout\n" , __func__);xip_disable (map, chip, adr); + ret = -EIO ;break ; } -if (chip_ready (map, adr)) +if (chip_good (map, adr, datum))break ;/* Latency issues. Drop the lock, wait a while and retry */ UDELAY (map, chip, adr,1 ); } +/* Did we succeed? */ -if (!chip_good (map, adr, datum)) { +if (ret) {/* reset on all failures. */ map_write (map,CMD (0xF0 ), chip->start);/* FIXME - should have reset delay before continuing */ -if (++retry_cnt <=MAX_RETRIES ) +if (++retry_cnt <=MAX_RETRIES ) { + ret =0 ; goto retry; - - ret = -EIO ; + } }xip_enable (map, chip, adr); op_done:
Signature · 1 line
2.11.0
PATCH v7 2/9 mtd: cfi_cmdset_0002: Remove goto statement from do_write_buffer()
In reply to Tokunori IkegamiFor a maintainability by reducing the goto statement remove it from do_write_buffer().
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issue.
- Convert to use pr_err() instead of printk(KERN_WARNING).
- Squash the v6 03/11 patch into this patch.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Just change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- None.
Changes since v1:
- Split the patch v1 3/3.
drivers/mtd/chips/cfi_cmdset_0002.c | 51 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 25 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +26 -25
@@ -1887,40 +1887,41 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,* We check "time_after" and "!chip_good" before checking "chip_good" to avoid * the failure due to scheduling. */ -if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) +if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) { + ret = -EIO ;break ; - -if (chip_good (map, adr, datum)) { -xip_enable (map, chip, adr); - goto op_done; } +if (chip_good (map, adr, datum)) +break ; +/* Latency issues. Drop the lock, wait a while and retry */ UDELAY (map, chip, adr,1 ); } -/* -* Recovery from write-buffer programming failures requires -* the write-to-buffer-reset sequence. Since the last part -* of the sequence also works as a normal reset, we can run -* the same commands regardless of why we are here. -* See e.g. -* http://www.spansion.com/Support/Application%20Notes/MirrorBit_Write_Buffer_Prog_Page_Buffer_Read_AN.pdf -*/ -cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, - cfi->device_type,NULL ); -cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, - cfi->device_type,NULL ); -cfi_send_gen_cmd (0xF0 , cfi->addr_unlock1, chip->start, map, cfi, - cfi->device_type,NULL ); -xip_enable (map, chip, adr); -/* FIXME - should have reset delay before continuing */ +if (ret) { +/* +* Recovery from write-buffer programming failures requires +* the write-to-buffer-reset sequence. Since the last part +* of the sequence also works as a normal reset, we can run +* the same commands regardless of why we are here. +* See e.g. +* http://www.spansion.com/Support/Application%20Notes/MirrorBit_Write_Buffer_Prog_Page_Buffer_Read_AN.pdf +*/ +cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, + cfi->device_type,NULL ); +cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, + cfi->device_type,NULL ); +cfi_send_gen_cmd (0xF0 , cfi->addr_unlock1, chip->start, map, cfi, + cfi->device_type,NULL ); +/* FIXME - should have reset delay before continuing */ -printk (KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n" , - __func__, adr); +pr_err ("MTD %s(): software timeout, address:0x%.8lx.\n" , + __func__, adr); + } + +xip_enable (map, chip, adr); - ret = -EIO ; - op_done: chip->state =FL_READY ;DISABLE_VPP (map);put_chip (map, chip, adr);
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 3/9 mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce function size
In reply to Tokunori IkegamiReduce the size of do_write_oneword() by extracting a helper function for the hardware access.
Co: Hauke Mehrtens <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issues.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Drop the unnecessary comment and blank line.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- Just update the commit message for the comment
- Add Reviewed-by tag.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 90 ++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 40 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +50 -40
@@ -1548,11 +1548,11 @@ static int cfi_amdstd_lock_user_prot_reg(struct mtd_info *mtd, loff_t from, do_otp_lock, 1); } -static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, -unsigned long adr,map_word datum, -int mode) +static int __xipram do_write_oneword_once(struct map_info *map, +struct flchip *chip, +unsigned long adr,map_word datum, +int mode,struct cfi_private *cfi) { -struct cfi_private *cfi = map->fldrv_priv;unsigned long timeo = jiffies +HZ ;/* * We use a 1ms + 1 jiffies generic timeout for writes (most devices
@@ -1565,42 +1565,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,*/ unsigned long uWriteTimeout = (HZ /1000 ) +1 ;int ret =0 ; -map_word oldd; -int retry_cnt =0 ; - - adr += chip->start; - -mutex_lock (&chip->mutex); - ret =get_chip (map, chip, adr, mode); -if (ret) { -mutex_unlock (&chip->mutex); -return ret; - } - -pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , - __func__, adr, datum.x[0 ]); - -if (mode ==FL_OTP_WRITE ) -otp_enter (map, chip, adr,map_bankwidth (map)); -/* -* Check for a NOP for the case when the datum to write is already -* present - it saves time and works around buggy chips that corrupt -* data at other locations when 0xff is written to a location that -* already contains 0xff. -*/ - oldd =map_read (map, adr); -if (map_word_equal (map, oldd, datum)) { -pr_debug ("MTD %s(): NOP\n" , - __func__); - goto op_done; - } - -XIP_INVAL_CACHED_RANGE (map, adr,map_bankwidth (map)); -ENABLE_VPP (map); -xip_disable (map, chip, adr); - - retry:cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0xA0 , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );
@@ -1647,7 +1612,52 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,UDELAY (map, chip, adr,1 ); } -/* Did we succeed? */ +return ret; +} + +static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, +unsigned long adr,map_word datum, +int mode) +{ +struct cfi_private *cfi = map->fldrv_priv; +int ret =0 ; +map_word oldd; +int retry_cnt =0 ; + + adr += chip->start; + +mutex_lock (&chip->mutex); + ret =get_chip (map, chip, adr, mode); +if (ret) { +mutex_unlock (&chip->mutex); +return ret; + } + +pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , + __func__, adr, datum.x[0 ]); + +if (mode ==FL_OTP_WRITE ) +otp_enter (map, chip, adr,map_bankwidth (map)); + +/* +* Check for a NOP for the case when the datum to write is already +* present - it saves time and works around buggy chips that corrupt +* data at other locations when 0xff is written to a location that +* already contains 0xff. +*/ + oldd =map_read (map, adr); +if (map_word_equal (map, oldd, datum)) { +pr_debug ("MTD %s(): NOP\n" , + __func__); + goto op_done; + } + +XIP_INVAL_CACHED_RANGE (map, adr,map_bankwidth (map)); +ENABLE_VPP (map); +xip_disable (map, chip, adr); + + retry: + ret =do_write_oneword_once (map, chip, adr, datum, mode, cfi);if (ret) {/* reset on all failures. */ map_write (map,CMD (0xF0 ), chip->start);
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 4/9 mtd: cfi_cmdset_0002: Split do_write_oneword() op_done goto statement
In reply to Tokunori IkegamiTo reduce function size and remove the goto statement split the op_done goto statement part into do_write_oneword_done() created a function. Also split the start part into do_write_oneword_start() to find easier pairs.
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issue.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Rebased on the patch v4 01/11.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- Change to split the start part of do_write_oneword() additionally.
- Fix indentation to call pr_debug().
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 57 ++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 17 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +40 -17
@@ -1615,6 +1615,40 @@ static int __xipram do_write_oneword_once(struct map_info *map,return ret; } +static int __xipram do_write_oneword_start(struct map_info *map, +struct flchip *chip, +unsigned long adr,int mode) +{ +int ret =0 ; + +mutex_lock (&chip->mutex); + + ret =get_chip (map, chip, adr, mode); +if (ret) { +mutex_unlock (&chip->mutex); +return ret; + } + +if (mode ==FL_OTP_WRITE ) +otp_enter (map, chip, adr,map_bankwidth (map)); + +return ret; +} + +static void __xipram do_write_oneword_done(struct map_info *map, +struct flchip *chip, +unsigned long adr,int mode) +{ +if (mode ==FL_OTP_WRITE ) +otp_exit (map, chip, adr,map_bankwidth (map)); + + chip->state =FL_READY ; +DISABLE_VPP (map); +put_chip (map, chip, adr); + +mutex_unlock (&chip->mutex); +} + static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,unsigned long adr,map_word datum,int mode)
@@ -1626,19 +1660,14 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, adr += chip->start; -mutex_lock (&chip->mutex); - ret =get_chip (map, chip, adr, mode); +pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , __func__, adr, + datum.x[0 ]); + + ret =do_write_oneword_start (map, chip, adr, mode);if (ret) { -mutex_unlock (&chip->mutex);return ret; } -pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , - __func__, adr, datum.x[0 ]); - -if (mode ==FL_OTP_WRITE ) -otp_enter (map, chip, adr,map_bankwidth (map)); -/* * Check for a NOP for the case when the datum to write is already * present - it saves time and works around buggy chips that corrupt
@@ -1647,8 +1676,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,*/ oldd =map_read (map, adr);if (map_word_equal (map, oldd, datum)) { -pr_debug ("MTD %s(): NOP\n" , - __func__); +pr_debug ("MTD %s(): NOP\n" , __func__); goto op_done; }
@@ -1670,12 +1698,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, }xip_enable (map, chip, adr); op_done: -if (mode ==FL_OTP_WRITE ) -otp_exit (map, chip, adr,map_bankwidth (map)); - chip->state =FL_READY ; -DISABLE_VPP (map); -put_chip (map, chip, adr); -mutex_unlock (&chip->mutex); +do_write_oneword_done (map, chip, adr, mode);return ret; }
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 5/9 mtd: cfi_cmdset_0002: Remove op_done goto statement from do_write_oneword()
In reply to Tokunori IkegamiThis is just to refactor the function by removing the goto statement.
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Rebased on the patch v4 01/11.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- Just rebased.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +3 -2
@@ -1677,7 +1677,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, oldd =map_read (map, adr);if (map_word_equal (map, oldd, datum)) {pr_debug ("MTD %s(): NOP\n" , __func__); - goto op_done; +do_write_oneword_done (map, chip, adr, mode); +return ret; }XIP_INVAL_CACHED_RANGE (map, adr,map_bankwidth (map));
@@ -1697,7 +1698,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, } }xip_enable (map, chip, adr); - op_done: +do_write_oneword_done (map, chip, adr, mode);return ret;
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 6/9 mtd: cfi_cmdset_0002: Split write-to-buffer-reset sequence
In reply to Tokunori IkegamiJust refactor to split the sequence from do_write_buffer().
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Just change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- None.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 38 +++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +22 -16
@@ -1828,6 +1828,27 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,return 0 ; } +static void __xipram do_write_buffer_reset(struct map_info *map, +struct flchip *chip, +struct cfi_private *cfi) +{ +/* +* Recovery from write-buffer programming failures requires +* the write-to-buffer-reset sequence. Since the last part +* of the sequence also works as a normal reset, we can run +* the same commands regardless of why we are here. +* See e.g. +* http://www.spansion.com/Support/Application%20Notes/MirrorBit_Write_Buffer_Prog_Page_Buffer_Read_AN.pdf +*/ +cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, + cfi->device_type,NULL ); +cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, + cfi->device_type,NULL ); +cfi_send_gen_cmd (0xF0 , cfi->addr_unlock1, chip->start, map, cfi, + cfi->device_type,NULL ); + +/* FIXME - should have reset delay before continuing */ +}/* * FIXME: interleaved mode not tested, and probably not supported!
@@ -1934,22 +1955,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, }if (ret) { -/* -* Recovery from write-buffer programming failures requires -* the write-to-buffer-reset sequence. Since the last part -* of the sequence also works as a normal reset, we can run -* the same commands regardless of why we are here. -* See e.g. -* http://www.spansion.com/Support/Application%20Notes/MirrorBit_Write_Buffer_Prog_Page_Buffer_Read_AN.pdf -*/ -cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, - cfi->device_type,NULL ); -cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, - cfi->device_type,NULL ); -cfi_send_gen_cmd (0xF0 , cfi->addr_unlock1, chip->start, map, cfi, - cfi->device_type,NULL ); -/* FIXME - should have reset delay before continuing */ - +do_write_buffer_reset (map, chip, cfi);pr_err ("MTD %s(): software timeout, address:0x%.8lx.\n" , __func__, adr); }
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 7/9 mtd: cfi_cmdset_0002: Split to wait write buffer to check if completed
In reply to Tokunori IkegamiJust refactor to split the wait from do_write_buffer().
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issues.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Just change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- None.
Changes since v1:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 89 +++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 39 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +50 -39
@@ -1828,6 +1828,55 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,return 0 ; } +static int __xipram do_write_buffer_wait(struct map_info *map, +struct flchip *chip,unsigned long adr, +map_word datum) +{ +unsigned long timeo; +unsigned long u_write_timeout; +int ret =0 ; + +/* +* Timeout is calculated according to CFI data, if available. +* See more comments in cfi_cmdset_0002(). +*/ + u_write_timeout =usecs_to_jiffies (chip->buffer_write_time_max); + timeo = jiffies + u_write_timeout; + +for (;;) { +if (chip->state !=FL_WRITING ) { +/* Someone's suspended the write. Sleep */ +DECLARE_WAITQUEUE (wait, current); + +set_current_state (TASK_UNINTERRUPTIBLE ); +add_wait_queue (&chip->wq, &wait); +mutex_unlock (&chip->mutex); +schedule (); +remove_wait_queue (&chip->wq, &wait); + timeo = jiffies + (HZ /2 );/* FIXME */ +mutex_lock (&chip->mutex); +continue ; + } + +/* +* We check "time_after" and "!chip_good" before checking +* "chip_good" to avoid the failure due to scheduling. +*/ +if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) { + ret = -EIO ; +break ; + } + +if (chip_good (map, adr, datum)) +break ; + +/* Latency issues. Drop the lock, wait a while and retry */ +UDELAY (map, chip, adr,1 ); + } + +return ret; +} + static void __xipram do_write_buffer_reset(struct map_info *map,struct flchip *chip,struct cfi_private *cfi)
@@ -1858,13 +1907,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, int len) {struct cfi_private *cfi = map->fldrv_priv; -unsigned long timeo = jiffies +HZ ; -/* -* Timeout is calculated according to CFI data, if available. -* See more comments in cfi_cmdset_0002(). -*/ -unsigned long uWriteTimeout = -usecs_to_jiffies (chip->buffer_write_time_max);int ret = -EIO ;unsigned long cmd_adr;int z, words;
@@ -1921,38 +1963,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, adr,map_bankwidth (map), chip->word_write_time); - timeo = jiffies + uWriteTimeout; - -for (;;) { -if (chip->state !=FL_WRITING ) { -/* Someone's suspended the write. Sleep */ -DECLARE_WAITQUEUE (wait, current); - -set_current_state (TASK_UNINTERRUPTIBLE ); -add_wait_queue (&chip->wq, &wait); -mutex_unlock (&chip->mutex); -schedule (); -remove_wait_queue (&chip->wq, &wait); - timeo = jiffies + (HZ /2 );/* FIXME */ -mutex_lock (&chip->mutex); -continue ; - } - -/* -* We check "time_after" and "!chip_good" before checking "chip_good" to avoid -* the failure due to scheduling. -*/ -if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) { - ret = -EIO ; -break ; - } - -if (chip_good (map, adr, datum)) -break ; - -/* Latency issues. Drop the lock, wait a while and retry */ -UDELAY (map, chip, adr,1 ); - } + ret =do_write_buffer_wait (map, chip, adr, datum);if (ret) {do_write_buffer_reset (map, chip, cfi);
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 8/9 mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce exit paths
In reply to Tokunori IkegamiThe do_write_oneword_done() is called twice at the exit paths. By splitting the retry functionality it can be reduced to call once.
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issue.
Changes since v5:
- Rebased on top of Liu Jian's fixes in master.
- Change the email address of Tokunori Ikegami to [email protected].
Changes since v4:
- None.
Changes since v3:
- Just change the email address of Tokunori Ikegami to [email protected].
Changes since v2:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 38 +++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +24 -14
@@ -1649,25 +1649,16 @@ static void __xipram do_write_oneword_done(struct map_info *map,mutex_unlock (&chip->mutex); } -static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, -unsigned long adr,map_word datum, -int mode) +static int __xipram do_write_oneword_retry(struct map_info *map, +struct flchip *chip, +unsigned long adr,map_word datum, +int mode) {struct cfi_private *cfi = map->fldrv_priv;int ret =0 ;map_word oldd;int retry_cnt =0 ; - adr += chip->start; - -pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , __func__, adr, - datum.x[0 ]); - - ret =do_write_oneword_start (map, chip, adr, mode); -if (ret) { -return ret; - } -/* * Check for a NOP for the case when the datum to write is already * present - it saves time and works around buggy chips that corrupt
@@ -1677,7 +1668,6 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, oldd =map_read (map, adr);if (map_word_equal (map, oldd, datum)) {pr_debug ("MTD %s(): NOP\n" , __func__); -do_write_oneword_done (map, chip, adr, mode);return ret; }
@@ -1699,6 +1689,26 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, }xip_enable (map, chip, adr); +return ret; +} + +static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, +unsigned long adr,map_word datum, +int mode) +{ +int ret =0 ; + + adr += chip->start; + +pr_debug ("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n" , __func__, adr, + datum.x[0 ]); + + ret =do_write_oneword_start (map, chip, adr, mode); +if (ret) +return ret; + + ret =do_write_oneword_retry (map, chip, adr, datum, mode); +do_write_oneword_done (map, chip, adr, mode);return ret;
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v7 9/9 mtd: cfi_cmdset_0002: Disable write buffer functions if FORCE_WORD_WRITE is 1
In reply to Tokunori IkegamiSome write buffer functions are not used when FORCE_WORD_WRITE is set to 1. So the compile warning messages are output if FORCE_WORD_WRITE is 1. To resolve this disable the write buffer functions if FORCE_WORD_WRITE is 1.
Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]
---
Changes since v6:
- Removed the tag of Koen Vandeputte as same with the v7 1/9 patch.
- Address the ./scripts/checkpatch.pl issue.
Changes since v5:
- Add the patch.
drivers/mtd/chips/cfi_cmdset_0002.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mtd/chips/cfi_cmdset_0002.c +6 -0
@@ -51,7 +51,9 @@static int cfi_amdstd_read (struct mtd_info *,loff_t ,size_t ,size_t *,u_char *);static int cfi_amdstd_write_words (struct mtd_info *,loff_t ,size_t ,size_t *,const u_char *); +#if !FORCE_WORD_WRITE static int cfi_amdstd_write_buffers (struct mtd_info *,loff_t ,size_t ,size_t *,const u_char *); +#endif static int cfi_amdstd_erase_chip (struct mtd_info *,struct erase_info *);static int cfi_amdstd_erase_varsize (struct mtd_info *,struct erase_info *);static void cfi_amdstd_sync (struct mtd_info *);
@@ -202,6 +204,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd) }#endif +#if !FORCE_WORD_WRITE static void fixup_use_write_buffers (struct mtd_info *mtd) {struct map_info *map = mtd->priv;
@@ -211,6 +214,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) mtd->_write = cfi_amdstd_write_buffers; } } +#endif /* !FORCE_WORD_WRITE */ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri (struct mtd_info *mtd)
@@ -1838,6 +1842,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,return 0 ; } +#if !FORCE_WORD_WRITE static int __xipram do_write_buffer_wait(struct map_info *map,struct flchip *chip,unsigned long adr,map_word datum)
@@ -2066,6 +2071,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, return 0; } +#endif /* !FORCE_WORD_WRITE */ /* * Wait for the flash chip to become ready to write data
Signature · 6 lines
2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 8 lines · Tokunori Ikegami
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.
The change is based on the fix for flash erase to use
chip_good()done in the past. And it is fixed as same way in the OpenWrt Project as below.
<https://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.openwrt.org%2F%3Fp%3Dopenwrt%2Fopenwrt.git%3Ba%3Dcommitdiff%3Bh%3Dddc11c3932&data=02%7C01%7CJoakim.Tjernlund%40infinera.com%7Cc576b3ddad2d4f3c09f008d6f4d635b2%7C285643de5f5b4b03a1530ae2dc8aaf77%7C1%7C0%7C636965598194534713&sdata=1XV5w3jD6tbfP%2B2Q2eBqfeHp07kHLDxpiJhW4ZA5Ea8%3D&reserved=0>
Also includes some refactoring changes.
Did this go anywhere?
Jocke
Quoted 20 lines
Signed-off-by Tokunori Ikegami <[email protected]>Cc Fabio Bettoni <[email protected]>Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]Tokunori Ikegami (9):
mtd:cfi_cmdset_0002: Usechip_good()to retry indo_write_oneword()
mtd:cfi_cmdset_0002: Remove goto statement fromdo_write_buffer()
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce function size
mtd:cfi_cmdset_0002: Splitdo_write_oneword()op_donegoto statement
mtd:cfi_cmdset_0002: Removeop_donegoto statement from
do_write_oneword()
mtd:cfi_cmdset_0002: Split write-to-buffer-reset sequence
mtd:cfi_cmdset_0002: Split to wait write buffer to check if completed
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce exit paths
mtd:cfi_cmdset_0002: Disable write buffer functions if
FORCE_WORD_WRITEis 1
Quoted 6 lines
drivers/mtd/chips/cfi_cmdset_0002.c | 290 ++++++++++++++++++++++-------------- 1 file changed, 182 insertions(+), 108 deletions(-)--
2.11.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 10 lines · Joakim Tjernlund
Quoted 8 lines · Tokunori Ikegami
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.
The change is based on the fix for flash erase to use
chip_good()done in the past. And it is fixed as same way in the OpenWrt Project as below.
<https://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.openwrt.org%2F%3Fp%3Dopenwrt%2Fopenwrt.git%3Ba%3Dcommitdiff%3Bh%3Dddc11c3932&data=02%7C01%7CJoakim.Tjernlund%40infinera.com%7Cc576b3ddad2d4f3c09f008d6f4d635b2%7C285643de5f5b4b03a1530ae2dc8aaf77%7C1%7C0%7C636965598194534713&sdata=1XV5w3jD6tbfP%2B2Q2eBqfeHp07kHLDxpiJhW4ZA5Ea8%3D&reserved=0>
Also includes some refactoring changes.Did this go anywhere?
Sorry I missed to reply by the previous mail so let me reply again.
The patch series are still waiting to be reviewed and applied into the linux mtd repository so did not go anywhere.
Regards,
Ikegami
Quoted 26 lines
Jocke
Quoted 23 lines
Signed-off-by Tokunori Ikegami <[email protected]>Cc Fabio Bettoni <[email protected]>Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]Tokunori Ikegami (9):
mtd:cfi_cmdset_0002: Usechip_good()to retry indo_write_oneword()
mtd:cfi_cmdset_0002: Remove goto statement fromdo_write_buffer()
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce function size
mtd:cfi_cmdset_0002: Splitdo_write_oneword()op_donegoto statement
mtd:cfi_cmdset_0002: Removeop_donegoto statement from
do_write_oneword()
mtd:cfi_cmdset_0002: Split write-to-buffer-reset sequence
mtd:cfi_cmdset_0002: Split to wait write buffer to check if completed
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce exit paths
mtd:cfi_cmdset_0002: Disable write buffer functions if
FORCE_WORD_WRITEis 1drivers/mtd/chips/cfi_cmdset_0002.c | 290 ++++++++++++++++++++++-------------- 1 file changed, 182 insertions(+), 108 deletions(-)
Quoted 7 lines
Quoted 3 lines
--
2.11.0______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Vignesh Raghavendra
maintainerQuoted 4 lines · Joakim Tjernlund
Quoted 3 lines · Tokunori Ikegami
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.
Quoted 8 lines
Quoted 5 lines
The change is based on the fix for flash erase to use
chip_good()done in the past. And it is fixed as same way in the OpenWrt Project as below.
<https://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.openwrt.org%2F%3Fp%3Dopenwrt%2Fopenwrt.git%3Ba%3Dcommitdiff%3Bh%3Dddc11c3932&data=02%7C01%7CJoakim.Tjernlund%40infinera.com%7Cc576b3ddad2d4f3c09f008d6f4d635b2%7C285643de5f5b4b03a1530ae2dc8aaf77%7C1%7C0%7C636965598194534713&sdata=1XV5w3jD6tbfP%2B2Q2eBqfeHp07kHLDxpiJhW4ZA5Ea8%3D&reserved=0>
Also includes some refactoring changes.Did this go anywhere?
I have this series in my queue and will consider for 5.4-rc1.
Regards
Vignesh
Quoted 29 lines
Jocke
Quoted 26 lines
Signed-off-by Tokunori Ikegami <[email protected]>Cc Fabio Bettoni <[email protected]>Co: Hauke Mehrtens <[email protected]>
Cc: Chris Packham <[email protected]>
Cc: Joakim Tjernlund <[email protected]>
Cc: [email protected]Tokunori Ikegami (9):
mtd:cfi_cmdset_0002: Usechip_good()to retry indo_write_oneword()
mtd:cfi_cmdset_0002: Remove goto statement fromdo_write_buffer()
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce function size
mtd:cfi_cmdset_0002: Splitdo_write_oneword()op_donegoto statement
mtd:cfi_cmdset_0002: Removeop_donegoto statement from
do_write_oneword()
mtd:cfi_cmdset_0002: Split write-to-buffer-reset sequence
mtd:cfi_cmdset_0002: Split to wait write buffer to check if completed
mtd:cfi_cmdset_0002: Splitdo_write_oneword()to reduce exit paths
mtd:cfi_cmdset_0002: Disable write buffer functions if
FORCE_WORD_WRITEis 1drivers/mtd/chips/cfi_cmdset_0002.c | 290 ++++++++++++++++++++++-------------- 1 file changed, 182 insertions(+), 108 deletions(-)--
2.11.0
Signature · 6 lines
Regards Vignesh ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/