[PATCH] m25p80: wait for flash before returning after erase

[PATCH] m25p80: wait for flash before returning after erase

[Eric Bénard]

else when we do "erase /dev/m25p0.rootfs; reset", the board
will never reboot as the flash is busy to finish the erase
command.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 drivers/nor/m25p80.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/nor/m25p80.c b/drivers/nor/m25p80.c
index daaf60c..5713ad5 100644
--- a/drivers/nor/m25p80.c
+++ b/drivers/nor/m25p80.c
@@ -257,6 +257,9 @@ static ssize_t m25p80_erase(struct cdev *cdev, size_t count, loff_t offset)
 		}
 	}
 
+	if (wait_till_ready(flash))
+		return -ETIMEDOUT;
+
 	return 0;
 }
 
@@ -684,7 +687,6 @@ static const struct spi_device_id *jedec_probe(struct spi_device *spi)
 	return NULL;
 }
 
-
 static struct file_operations m25p80_ops = {
 	.read   = m25p80_read,
 	.write  = m25p80_write,
-- 
1.7.7.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] m25p80: wait for flash before returning after erase

[Sascha Hauer]

On Tue, Aug 28, 2012 at 11:58:08PM +0200, Eric Bénard wrote:
> else when we do "erase /dev/m25p0.rootfs; reset", the board
> will never reboot as the flash is busy to finish the erase
> command.

Applied, thanks

Sascha

> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  drivers/nor/m25p80.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/nor/m25p80.c b/drivers/nor/m25p80.c
> index daaf60c..5713ad5 100644
> --- a/drivers/nor/m25p80.c
> +++ b/drivers/nor/m25p80.c
> @@ -257,6 +257,9 @@ static ssize_t m25p80_erase(struct cdev *cdev, size_t count, loff_t offset)
>  		}
>  	}
>  
> +	if (wait_till_ready(flash))
> +		return -ETIMEDOUT;
> +
>  	return 0;
>  }
>  
> @@ -684,7 +687,6 @@ static const struct spi_device_id *jedec_probe(struct spi_device *spi)
>  	return NULL;
>  }
>  
> -
>  static struct file_operations m25p80_ops = {
>  	.read   = m25p80_read,
>  	.write  = m25p80_write,
> -- 
> 1.7.7.6
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> 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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox