mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] nandtest: use new pread and pwrite functions
@ 2013-02-19 20:56 Alexander Aring
  2013-02-19 20:56 ` [PATCH 2/2] nandtest: fix length calculation Alexander Aring
  2013-02-21 13:31 ` [PATCH 1/2] nandtest: use new pread and pwrite functions Sascha Hauer
  0 siblings, 2 replies; 4+ messages in thread
From: Alexander Aring @ 2013-02-19 20:56 UTC (permalink / raw)
  To: barebox

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 commands/nandtest.c | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/commands/nandtest.c b/commands/nandtest.c
index f08f8eb..4e6024b 100644
--- a/commands/nandtest.c
+++ b/commands/nandtest.c
@@ -43,41 +43,17 @@ static unsigned int ecc_stats_over;
 static unsigned int ecc_failed_cnt;
 
 /*
- * Implementation of pread with lseek and read.
- */
-static ssize_t pread(int fd, void *buf, size_t count, loff_t offset)
-{
-	int ret;
-
-	/* Seek to offset */
-	ret = lseek(fd, offset, SEEK_SET);
-	if (ret < 0)
-		perror("lseek");
-
-	/* Read from flash and put it into buf  */
-	ret = read(fd, buf, count);
-	if (ret < 0)
-		perror("read");
-
-	return 0;
-}
-
-/*
  * Implementation of pwrite with lseek and write.
  */
-static ssize_t pwrite(int fd, const void *buf,
+static ssize_t __pwrite(int fd, const void *buf,
 		size_t count, loff_t offset, loff_t length)
 {
-	int ret;
-
-	ret = lseek(fd, offset, SEEK_SET);
-	if (ret < 0)
-		perror("lseek");
+	ssize_t ret;
 
 	/* Write buf to flash */
-	ret = write(fd, buf, count);
+	ret = pwrite(fd, buf, count, offset);
 	if (ret < 0) {
-		perror("write");
+		perror("pwrite");
 		if (markbad) {
 			printf("\nMark block bad at 0x%08llx\n",
 					offset + memregion.offset);
@@ -88,7 +64,7 @@ static ssize_t pwrite(int fd, const void *buf,
 	}
 
 	flush(fd);
-	return 0;
+	return ret;
 }
 
 /*
@@ -119,7 +95,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 	for (i = 0; i < meminfo.erasesize;
 			i += meminfo.writesize) {
 		/* Write data to given offset */
-		pwrite(fd, data + i, meminfo.writesize,
+		__pwrite(fd, data + i, meminfo.writesize,
 				ofs + i, length);
 
 		/* Read data from offset */
-- 
1.8.1.3


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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 2/2] nandtest: fix length calculation
  2013-02-19 20:56 [PATCH 1/2] nandtest: use new pread and pwrite functions Alexander Aring
@ 2013-02-19 20:56 ` Alexander Aring
  2013-02-21 13:31 ` [PATCH 1/2] nandtest: use new pread and pwrite functions Sascha Hauer
  1 sibling, 0 replies; 4+ messages in thread
From: Alexander Aring @ 2013-02-19 20:56 UTC (permalink / raw)
  To: barebox

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 commands/nandtest.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/commands/nandtest.c b/commands/nandtest.c
index 4e6024b..ba15ecf 100644
--- a/commands/nandtest.c
+++ b/commands/nandtest.c
@@ -112,7 +112,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 					newstats.corrected - oldstats.corrected,
 					ofs + memregion.offset + i);
 			init_progression_bar(length);
-			show_progress(ofs);
+			show_progress(ofs + i);
 			if ((newstats.corrected-oldstats.corrected) >=
 					MAX_ECC_BITS) {
 				/* Increment ECC stats that
@@ -130,7 +130,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 			printf("\nECC failed at page 0x%08llx\n",
 					ofs + memregion.offset + i);
 			init_progression_bar(length);
-			show_progress(ofs);
+			show_progress(ofs + i);
 			oldstats.failed = newstats.failed;
 			ecc_failed_cnt++;
 		}
@@ -292,8 +292,8 @@ static int do_nandtest(int argc, char *argv[])
 
 	for (iter = 0; iter < nr_iterations; iter++) {
 		init_progression_bar(length);
-		for (test_ofs = flash_offset;
-				test_ofs < flash_offset + length;
+		for (test_ofs = 0;
+				test_ofs < length;
 				test_ofs += meminfo.erasesize) {
 			show_progress(test_ofs);
 			srand(seed);
-- 
1.8.1.3


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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] nandtest: use new pread and pwrite functions
  2013-02-19 20:56 [PATCH 1/2] nandtest: use new pread and pwrite functions Alexander Aring
  2013-02-19 20:56 ` [PATCH 2/2] nandtest: fix length calculation Alexander Aring
@ 2013-02-21 13:31 ` Sascha Hauer
  2013-02-21 19:50   ` Alexander Aring
  1 sibling, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2013-02-21 13:31 UTC (permalink / raw)
  To: Alexander Aring; +Cc: barebox

On Tue, Feb 19, 2013 at 09:56:33PM +0100, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
>  commands/nandtest.c | 36 ++++++------------------------------
>  1 file changed, 6 insertions(+), 30 deletions(-)

Applied, thanks

I squashed this into the commit adding pread/pwrite to make this commit
compilable.

Sascha

> 
> diff --git a/commands/nandtest.c b/commands/nandtest.c
> index f08f8eb..4e6024b 100644
> --- a/commands/nandtest.c
> +++ b/commands/nandtest.c
> @@ -43,41 +43,17 @@ static unsigned int ecc_stats_over;
>  static unsigned int ecc_failed_cnt;
>  
>  /*
> - * Implementation of pread with lseek and read.
> - */
> -static ssize_t pread(int fd, void *buf, size_t count, loff_t offset)
> -{
> -	int ret;
> -
> -	/* Seek to offset */
> -	ret = lseek(fd, offset, SEEK_SET);
> -	if (ret < 0)
> -		perror("lseek");
> -
> -	/* Read from flash and put it into buf  */
> -	ret = read(fd, buf, count);
> -	if (ret < 0)
> -		perror("read");
> -
> -	return 0;
> -}
> -
> -/*
>   * Implementation of pwrite with lseek and write.
>   */
> -static ssize_t pwrite(int fd, const void *buf,
> +static ssize_t __pwrite(int fd, const void *buf,
>  		size_t count, loff_t offset, loff_t length)
>  {
> -	int ret;
> -
> -	ret = lseek(fd, offset, SEEK_SET);
> -	if (ret < 0)
> -		perror("lseek");
> +	ssize_t ret;
>  
>  	/* Write buf to flash */
> -	ret = write(fd, buf, count);
> +	ret = pwrite(fd, buf, count, offset);
>  	if (ret < 0) {
> -		perror("write");
> +		perror("pwrite");
>  		if (markbad) {
>  			printf("\nMark block bad at 0x%08llx\n",
>  					offset + memregion.offset);
> @@ -88,7 +64,7 @@ static ssize_t pwrite(int fd, const void *buf,
>  	}
>  
>  	flush(fd);
> -	return 0;
> +	return ret;
>  }
>  
>  /*
> @@ -119,7 +95,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
>  	for (i = 0; i < meminfo.erasesize;
>  			i += meminfo.writesize) {
>  		/* Write data to given offset */
> -		pwrite(fd, data + i, meminfo.writesize,
> +		__pwrite(fd, data + i, meminfo.writesize,
>  				ofs + i, length);
>  
>  		/* Read data from offset */
> -- 
> 1.8.1.3
> 
> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] nandtest: use new pread and pwrite functions
  2013-02-21 13:31 ` [PATCH 1/2] nandtest: use new pread and pwrite functions Sascha Hauer
@ 2013-02-21 19:50   ` Alexander Aring
  0 siblings, 0 replies; 4+ messages in thread
From: Alexander Aring @ 2013-02-21 19:50 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Hi,

On Thu, Feb 21, 2013 at 02:31:02PM +0100, Sascha Hauer wrote:
> On Tue, Feb 19, 2013 at 09:56:33PM +0100, Alexander Aring wrote:
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> >  commands/nandtest.c | 36 ++++++------------------------------
> >  1 file changed, 6 insertions(+), 30 deletions(-)
> 
> Applied, thanks
> 
> I squashed this into the commit adding pread/pwrite to make this commit
> compilable.
> 

Thanks. :-)

Regards
Alex

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-21 19:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-19 20:56 [PATCH 1/2] nandtest: use new pread and pwrite functions Alexander Aring
2013-02-19 20:56 ` [PATCH 2/2] nandtest: fix length calculation Alexander Aring
2013-02-21 13:31 ` [PATCH 1/2] nandtest: use new pread and pwrite functions Sascha Hauer
2013-02-21 19:50   ` Alexander Aring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox