On Mon, Jun 25, 2012 at 03:56:10PM +0200, Jan Luebbe wrote:
> In some cases with unaligned addresses the loop would not abort.
> Instead, use the calculated sector numbers in a for-loop.
>
> Based on a patch by Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>.
>
> Signed-off-by: Jan Luebbe <jlu@xxxxxxxxxxxxxx>
> ---
> drivers/nor/m25p80.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/nor/m25p80.c b/drivers/nor/m25p80.c
> index 1440227..b4dfbfa 100644
> --- a/drivers/nor/m25p80.c
> +++ b/drivers/nor/m25p80.c
> @@ -200,7 +200,7 @@ static ssize_t m25p80_erase(struct cdev *cdev, size_t count, loff_t offset)
> u32 addr, len;
> u32 start_sector;
> u32 end_sector;
> - u32 progress = 0;
> + u32 cur_sector;
> int eraseshift = ffs(flash->erasesize) - 1;
eraseshift does only exist in the 64bit branch. can you rebase this onto
master?
Sascha
>
> dev_dbg(&flash->spi->dev, "%s %s 0x%llx, len %lld\n",
> @@ -232,17 +232,13 @@ static ssize_t m25p80_erase(struct cdev *cdev, size_t count, loff_t offset)
>
> /* "sector"-at-a-time erase */
> } else {
> - while (len) {
> + for (cur_sector = start_sector; cur_sector <= end_sector; cur_sector++) {
> if (ctrlc())
> return -EINTR;
> - if (erase_sector(flash, addr))
> + if (erase_sector(flash, cur_sector << eraseshift))
> return -EIO;
>
> - show_progress(++progress);
> - if (len <= flash->erasesize)
> - break;
> - addr += flash->erasesize;
> - len -= flash->erasesize;
> + show_progress(cur_sector - start_sector + 1);
> }
> }
>
> --
> 1.7.10
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
