diff options
| author | Hector Palacios <hector.palacios@digi.com> | 2016-07-18 09:37:41 +0200 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-07-24 20:36:29 -0500 |
| commit | ebb7febc92fc628d1f37b96616a1bb21b646d072 (patch) | |
| tree | 8ba36cc251180dff8aacbc762354539397b14c5d /drivers/mtd/nand | |
| parent | c1aa7d629eb9f0ed7836061170461abb04d34111 (diff) | |
| download | u-boot-midas-ebb7febc92fc628d1f37b96616a1bb21b646d072.tar.gz u-boot-midas-ebb7febc92fc628d1f37b96616a1bb21b646d072.tar.bz2 u-boot-midas-ebb7febc92fc628d1f37b96616a1bb21b646d072.zip | |
mtd: nand: fix bug writing 1 byte less than page size
nand_do_write_ops() determines if it is writing a partial page with the
formula:
part_pagewr = (column || writelen < (mtd->writesize - 1))
When 'writelen' is exactly 1 byte less than the NAND page size the formula
equates to zero, so the code doesn't process it as a partial write, although
it should.
As a consequence the function remains in the while(1) loop with 'writelen'
becoming 0xffffffff and iterating until the watchdog timeout triggers.
To reproduce the issue on a NAND with 2K page (0x800):
=> nand erase.part <partition>
=> nand write $loadaddr <partition> 7ff
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 4cf4518989..d1287bc3be 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2414,7 +2414,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, int cached = writelen > bytes && page != blockmask; uint8_t *wbuf = buf; int use_bufpoi; - int part_pagewr = (column || writelen < (mtd->writesize - 1)); + int part_pagewr = (column || writelen < mtd->writesize); if (part_pagewr) use_bufpoi = 1; |