| Message ID | 20190526153904.28871-3-ikegami.t@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Vignesh R |
| Headers | show |
| Series | mtd: cfi_cmdset_0002: Fix flash write issue for OpenWrt Project | expand |
On 26-May-19 9:08 PM, Tokunori Ikegami wrote: > For a maintainability by reducing the goto statement remove it from > do_write_buffer(). > > Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com> > Cc: Fabio Bettoni <fbettoni@gmail.com> > Co: Hauke Mehrtens <hauke@hauke-m.de> > Co: Koen Vandeputte <koen.vandeputte@ncentric.com> > Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> > Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com> > Cc: linux-mtd@lists.infradead.org > --- [...] > drivers/mtd/chips/cfi_cmdset_0002.c | 46 +++++++++++++++++++------------------ > 1 file changed, 24 insertions(+), 22 deletions(-) > > diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c > index 348b54820e4c..ca41f47c00c1 100755 > --- a/drivers/mtd/chips/cfi_cmdset_0002.c > +++ b/drivers/mtd/chips/cfi_cmdset_0002.c > @@ -1887,40 +1887,42 @@ 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; > + 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); > + xip_enable(map, chip, adr); > + /* FIXME - should have reset delay before continuing */ > > - printk(KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n", > - __func__, adr); > + printk(KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n", > + __func__, adr); > + } > While at that, could you convert this to pr_err()? > - ret = -EIO; > - op_done: > chip->state = FL_READY; > DISABLE_VPP(map); > put_chip(map, chip, adr); >
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 348b54820e4c..ca41f47c00c1 100755 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1887,40 +1887,42 @@ 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; + 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); + xip_enable(map, chip, adr); + /* FIXME - should have reset delay before continuing */ - printk(KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n", - __func__, adr); + printk(KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n", + __func__, adr); + } - ret = -EIO; - op_done: chip->state = FL_READY; DISABLE_VPP(map); put_chip(map, chip, adr);
For a maintainability by reducing the goto statement remove it from do_write_buffer(). Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com> Cc: Fabio Bettoni <fbettoni@gmail.com> Co: Hauke Mehrtens <hauke@hauke-m.de> Co: Koen Vandeputte <koen.vandeputte@ncentric.com> Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com> Cc: linux-mtd@lists.infradead.org --- Changes since v5: - Rebased on top of Liu Jian's fixes in master. - Change the email address of Tokunori Ikegami to ikegami.t@gmail.com. Changes since v4: - None. Changes since v3: - Just change the email address of Tokunori Ikegami to ikegami_to@yahoo.co.jp. Changes since v2: - None. Changes since v1: - Split the patch v1 3/3. drivers/mtd/chips/cfi_cmdset_0002.c | 46 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-)