mtd: nand: Fix nand write error with bad block addresses above 32-bit

Nand writes should skip the bad blocks with "nand write" command.
In case of bad blocks with above 32-bit address, nand_block_isbad()
returns false due to truncated bad block address.

In below code segment,

	if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1)))

offset is 64-bit and mtd->erasesize is 32-bit, hence the truncation is
happening. Cast 'mtd->erasesize' with loff_t to fix this issue.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 5b74ef0dfdbff908f9869fb83613e4e61d41d0aa..00c3c6c412260476dea75cd151491f02083f976d 100644 (file)
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -635,14 +635,14 @@ int nand_write_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
        }
 
        while (left_to_write > 0) {
+               loff_t block_start = offset & ~(loff_t)(mtd->erasesize - 1);
                size_t block_offset = offset & (mtd->erasesize - 1);
                size_t write_size, truncated_write_size;
 
                WATCHDOG_RESET();
 
-               if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) {
-                       printf("Skip bad block 0x%08llx\n",
-                               offset & ~(mtd->erasesize - 1));
+               if (nand_block_isbad(mtd, block_start)) {
+                       printf("Skip bad block 0x%08llx\n", block_start);
                        offset += mtd->erasesize - block_offset;
                        continue;
                }