lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 10 Jul 2018 20:25:08 +0200 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Tokunori Ikegami <ikegami@...ied-telesis.co.jp>, Joakim Tjernlund <Joakim.Tjernlund@...inera.com>, Chris Packham <chris.packham@...iedtelesis.co.nz>, Brian Norris <computersforpeace@...il.com>, David Woodhouse <dwmw2@...radead.org>, Boris Brezillon <boris.brezillon@...e-electrons.com>, Marek Vasut <marek.vasut@...il.com>, Richard Weinberger <richard@....at>, Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>, linux-mtd@...ts.infradead.org, Boris Brezillon <boris.brezillon@...tlin.com> Subject: [PATCH 4.4 44/47] mtd: cfi_cmdset_0002: Change erase functions to retry for error 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tokunori Ikegami <ikegami@...ied-telesis.co.jp> commit 45f75b8a919a4255f52df454f1ffdee0e42443b2 upstream. For the word write functions it is retried for error. But it is not implemented to retry for the erase functions. To make sure for the erase functions change to retry as same. This is needed to prevent the flash erase error caused only once. It was caused by the error case of chip_good() in the do_erase_oneblock(). Also it was confirmed on the MACRONIX flash device MX29GL512FHT2I-11G. But the error issue behavior is not able to reproduce at this moment. The flash controller is parallel Flash interface integrated on BCM53003. Signed-off-by: Tokunori Ikegami <ikegami@...ied-telesis.co.jp> Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@...inera.com> Cc: Chris Packham <chris.packham@...iedtelesis.co.nz> Cc: Brian Norris <computersforpeace@...il.com> Cc: David Woodhouse <dwmw2@...radead.org> Cc: Boris Brezillon <boris.brezillon@...e-electrons.com> Cc: Marek Vasut <marek.vasut@...il.com> Cc: Richard Weinberger <richard@....at> Cc: Cyrille Pitchen <cyrille.pitchen@...ev4u.fr> Cc: linux-mtd@...ts.infradead.org Cc: stable@...r.kernel.org Signed-off-by: Boris Brezillon <boris.brezillon@...tlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- drivers/mtd/chips/cfi_cmdset_0002.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -2239,6 +2239,7 @@ static int __xipram do_erase_chip(struct unsigned long int adr; DECLARE_WAITQUEUE(wait, current); int ret = 0; + int retry_cnt = 0; adr = cfi->addr_unlock1; @@ -2256,6 +2257,7 @@ static int __xipram do_erase_chip(struct 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(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL); @@ -2310,6 +2312,9 @@ static int __xipram do_erase_chip(struct map_write( map, CMD(0xF0), chip->start ); /* FIXME - should have reset delay before continuing */ + if (++retry_cnt <= MAX_RETRIES) + goto retry; + ret = -EIO; } @@ -2329,6 +2334,7 @@ static int __xipram do_erase_oneblock(st unsigned long timeo = jiffies + HZ; DECLARE_WAITQUEUE(wait, current); int ret = 0; + int retry_cnt = 0; adr += chip->start; @@ -2346,6 +2352,7 @@ static int __xipram do_erase_oneblock(st 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(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL); @@ -2403,6 +2410,9 @@ static int __xipram do_erase_oneblock(st map_write( map, CMD(0xF0), chip->start ); /* FIXME - should have reset delay before continuing */ + if (++retry_cnt <= MAX_RETRIES) + goto retry; + ret = -EIO; }
Powered by blists - more mailing lists