Patchwork mtd: hot spin and code duplication in nand_bcm_umi_bch_read_oobEcc()

login
register
mail settings
Submitter roel kluin
Date Jan. 22, 2010, 9:22 p.m.
Message ID <4B5A172C.2010609@gmail.com>
Download mbox | patch
Permalink /patch/43513/
State New
Headers show

Comments

roel kluin - Jan. 22, 2010, 9:22 p.m.
In the branch where pagesize equalled NAND_DATA_ACCESS_SIZE, NumToRead
wasn't decremented in the `while (numToRead > 11)' loop.
Also the first and last while loops were duplicated in both branches.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
 drivers/mtd/nand/nand_bcm_umi.h |   71 ++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 46 deletions(-)
Leo (Hao) Chen - Jan. 22, 2010, 10:04 p.m.
Thanks for identifying the NumToRead bug.
Tested on board. Works.

Acked-by: Leo Chen <leochen@broadcom.com>

On Fri, Jan 22, 2010 at 01:22:52PM -0800, Roel Kluin wrote:
> In the branch where pagesize equalled NAND_DATA_ACCESS_SIZE, NumToRead
> wasn't decremented in the `while (numToRead > 11)' loop.
> Also the first and last while loops were duplicated in both branches.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
>  drivers/mtd/nand/nand_bcm_umi.h |   71 ++++++++++++++-------------------------
>  1 files changed, 25 insertions(+), 46 deletions(-)
> 
> diff --git a/drivers/mtd/nand/nand_bcm_umi.h b/drivers/mtd/nand/nand_bcm_umi.h
> index 7cec2cd..198b304 100644
> --- a/drivers/mtd/nand/nand_bcm_umi.h
> +++ b/drivers/mtd/nand/nand_bcm_umi.h
> @@ -167,18 +167,27 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
>  	int numToRead = 16;	/* There are 16 bytes per sector in the OOB */
>  
>  	/* ECC is already paused when this function is called */
> +	if (pageSize != NAND_DATA_ACCESS_SIZE) {
> +		/* skip BI */
> +#if defined(__KERNEL__) && !defined(STANDALONE)
> +		*oobp++ = REG_NAND_DATA8;
> +#else
> +		REG_NAND_DATA8;
> +#endif
> +		numToRead--;
> +	}
>  
> -	if (pageSize == NAND_DATA_ACCESS_SIZE) {
> -		while (numToRead > numEccBytes) {
> -			/* skip free oob region */
> +	while (numToRead > numEccBytes) {
> +		/* skip free oob region */
>  #if defined(__KERNEL__) && !defined(STANDALONE)
> -			*oobp++ = REG_NAND_DATA8;
> +		*oobp++ = REG_NAND_DATA8;
>  #else
> -			REG_NAND_DATA8;
> +		REG_NAND_DATA8;
>  #endif
> -			numToRead--;
> -		}
> +		numToRead--;
> +	}
>  
> +	if (pageSize == NAND_DATA_ACCESS_SIZE) {
>  		/* read ECC bytes before BI */
>  		nand_bcm_umi_bch_resume_read_ecc_calc();
>  
> @@ -190,6 +199,7 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
>  #else
>  			eccCalc[eccPos++] = REG_NAND_DATA8;
>  #endif
> +			numToRead--;
>  		}
>  
>  		nand_bcm_umi_bch_pause_read_ecc_calc();
> @@ -204,49 +214,18 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
>  			numToRead--;
>  		}
>  
> -		/* read ECC bytes */
> -		nand_bcm_umi_bch_resume_read_ecc_calc();
> -		while (numToRead) {
> -#if defined(__KERNEL__) && !defined(STANDALONE)
> -			*oobp = REG_NAND_DATA8;
> -			eccCalc[eccPos++] = *oobp;
> -			oobp++;
> -#else
> -			eccCalc[eccPos++] = REG_NAND_DATA8;
> -#endif
> -			numToRead--;
> -		}
> -	} else {
> -		/* skip BI */
> +	}
> +	/* read ECC bytes */
> +	nand_bcm_umi_bch_resume_read_ecc_calc();
> +	while (numToRead) {
>  #if defined(__KERNEL__) && !defined(STANDALONE)
> -		*oobp++ = REG_NAND_DATA8;
> +		*oobp = REG_NAND_DATA8;
> +		eccCalc[eccPos++] = *oobp;
> +		oobp++;
>  #else
> -		REG_NAND_DATA8;
> +		eccCalc[eccPos++] = REG_NAND_DATA8;
>  #endif
>  		numToRead--;
> -
> -		while (numToRead > numEccBytes) {
> -			/* skip free oob region */
> -#if defined(__KERNEL__) && !defined(STANDALONE)
> -			*oobp++ = REG_NAND_DATA8;
> -#else
> -			REG_NAND_DATA8;
> -#endif
> -			numToRead--;
> -		}
> -
> -		/* read ECC bytes */
> -		nand_bcm_umi_bch_resume_read_ecc_calc();
> -		while (numToRead) {
> -#if defined(__KERNEL__) && !defined(STANDALONE)
> -			*oobp = REG_NAND_DATA8;
> -			eccCalc[eccPos++] = *oobp;
> -			oobp++;
> -#else
> -			eccCalc[eccPos++] = REG_NAND_DATA8;
> -#endif
> -			numToRead--;
> -		}
>  	}
>  }
>  
>
Artem Bityutskiy - Feb. 3, 2010, 4:22 p.m.
On Fri, 2010-01-22 at 22:22 +0100, Roel Kluin wrote:
> In the branch where pagesize equalled NAND_DATA_ACCESS_SIZE, NumToRead
> wasn't decremented in the `while (numToRead > 11)' loop.
> Also the first and last while loops were duplicated in both branches.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
>  drivers/mtd/nand/nand_bcm_umi.h |   71 ++++++++++++++-------------------------
>  1 files changed, 25 insertions(+), 46 deletions(-)

Taken to l2-mtd-2.6.git / dunno

Patch

diff --git a/drivers/mtd/nand/nand_bcm_umi.h b/drivers/mtd/nand/nand_bcm_umi.h
index 7cec2cd..198b304 100644
--- a/drivers/mtd/nand/nand_bcm_umi.h
+++ b/drivers/mtd/nand/nand_bcm_umi.h
@@ -167,18 +167,27 @@  static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
 	int numToRead = 16;	/* There are 16 bytes per sector in the OOB */
 
 	/* ECC is already paused when this function is called */
+	if (pageSize != NAND_DATA_ACCESS_SIZE) {
+		/* skip BI */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+		*oobp++ = REG_NAND_DATA8;
+#else
+		REG_NAND_DATA8;
+#endif
+		numToRead--;
+	}
 
-	if (pageSize == NAND_DATA_ACCESS_SIZE) {
-		while (numToRead > numEccBytes) {
-			/* skip free oob region */
+	while (numToRead > numEccBytes) {
+		/* skip free oob region */
 #if defined(__KERNEL__) && !defined(STANDALONE)
-			*oobp++ = REG_NAND_DATA8;
+		*oobp++ = REG_NAND_DATA8;
 #else
-			REG_NAND_DATA8;
+		REG_NAND_DATA8;
 #endif
-			numToRead--;
-		}
+		numToRead--;
+	}
 
+	if (pageSize == NAND_DATA_ACCESS_SIZE) {
 		/* read ECC bytes before BI */
 		nand_bcm_umi_bch_resume_read_ecc_calc();
 
@@ -190,6 +199,7 @@  static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
 #else
 			eccCalc[eccPos++] = REG_NAND_DATA8;
 #endif
+			numToRead--;
 		}
 
 		nand_bcm_umi_bch_pause_read_ecc_calc();
@@ -204,49 +214,18 @@  static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
 			numToRead--;
 		}
 
-		/* read ECC bytes */
-		nand_bcm_umi_bch_resume_read_ecc_calc();
-		while (numToRead) {
-#if defined(__KERNEL__) && !defined(STANDALONE)
-			*oobp = REG_NAND_DATA8;
-			eccCalc[eccPos++] = *oobp;
-			oobp++;
-#else
-			eccCalc[eccPos++] = REG_NAND_DATA8;
-#endif
-			numToRead--;
-		}
-	} else {
-		/* skip BI */
+	}
+	/* read ECC bytes */
+	nand_bcm_umi_bch_resume_read_ecc_calc();
+	while (numToRead) {
 #if defined(__KERNEL__) && !defined(STANDALONE)
-		*oobp++ = REG_NAND_DATA8;
+		*oobp = REG_NAND_DATA8;
+		eccCalc[eccPos++] = *oobp;
+		oobp++;
 #else
-		REG_NAND_DATA8;
+		eccCalc[eccPos++] = REG_NAND_DATA8;
 #endif
 		numToRead--;
-
-		while (numToRead > numEccBytes) {
-			/* skip free oob region */
-#if defined(__KERNEL__) && !defined(STANDALONE)
-			*oobp++ = REG_NAND_DATA8;
-#else
-			REG_NAND_DATA8;
-#endif
-			numToRead--;
-		}
-
-		/* read ECC bytes */
-		nand_bcm_umi_bch_resume_read_ecc_calc();
-		while (numToRead) {
-#if defined(__KERNEL__) && !defined(STANDALONE)
-			*oobp = REG_NAND_DATA8;
-			eccCalc[eccPos++] = *oobp;
-			oobp++;
-#else
-			eccCalc[eccPos++] = REG_NAND_DATA8;
-#endif
-			numToRead--;
-		}
 	}
 }