Patchwork cfi_cmdset_0001.c: CFI 1.0 and CFI 1.1

login
register
mail settings
Submitter Daniel Ribeiro
Date May 17, 2009, 11:02 a.m.
Message ID <1242558128.26769.6.camel@brutus>
Download mbox | patch
Permalink /patch/27313/
State New
Headers show

Comments

Daniel Ribeiro - May 17, 2009, 11:02 a.m.
This patch allows otpinfo for CFI >= 1.0 and burst read for CFI >= 1.1.
(sent again with CC to Nicolas Pitre)

references:
1.0:	http://www.datasheetcatalog.org/datasheets2/81/816884_1.pdf

1.1:	http://milkymist.org/doc/MT28F640J3.pdf
	http://www.delorie.com/agenda/specs/29066709.pdf

Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0001.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
Nicolas Pitre - May 18, 2009, 11:28 p.m.
On Sun, 17 May 2009, Daniel Ribeiro wrote:

> This patch allows otpinfo for CFI >= 1.0 and burst read for CFI >= 1.1.
> (sent again with CC to Nicolas Pitre)
> 
> references:
> 1.0:	http://www.datasheetcatalog.org/datasheets2/81/816884_1.pdf
> 
> 1.1:	http://milkymist.org/doc/MT28F640J3.pdf
> 	http://www.delorie.com/agenda/specs/29066709.pdf
> 
> Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>

Acked-by: Nicolas Pitre <nico@cam.org>

> ---
>  drivers/mtd/chips/cfi_cmdset_0001.c |   14 ++++++++++----
>  1 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
> index c240454..bf07d14 100644
> --- a/drivers/mtd/chips/cfi_cmdset_0001.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0001.c
> @@ -319,6 +319,7 @@ static inline struct cfi_pri_intelext *
>  read_pri_intelext(struct map_info *map, __u16 adr)
>  {
>  	struct cfi_pri_intelext *extp;
> +	unsigned int extra_size = 0;
>  	unsigned int extp_size = sizeof(*extp);
>  
>   again:
> @@ -340,19 +341,24 @@ read_pri_intelext(struct map_info *map, __u16 adr)
>  	extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask);
>  	extp->ProtRegAddr = le16_to_cpu(extp->ProtRegAddr);
>  
> -	if (extp->MajorVersion == '1' && extp->MinorVersion >= '3') {
> -		unsigned int extra_size = 0;
> -		int nb_parts, i;
> +	if (extp->MinorVersion >= '0') {
> +		extra_size = 0;
>  
>  		/* Protection Register info */
>  		extra_size += (extp->NumProtectionFields - 1) *
>  			      sizeof(struct cfi_intelext_otpinfo);
> +	}
>  
> +	if (extp->MinorVersion >= '1') {
>  		/* Burst Read info */
>  		extra_size += 2;
>  		if (extp_size < sizeof(*extp) + extra_size)
>  			goto need_more;
> -		extra_size += extp->extra[extra_size-1];
> +		extra_size += extp->extra[extra_size - 1];
> +	}
> +
> +	if (extp->MinorVersion >= '3') {
> +		int nb_parts, i;
>  
>  		/* Number of hardware-partitions */
>  		extra_size += 1;
> -- 
> tg: (1406de8..) mtd/cfi1.1-has-extra-too (depends on: master)
> 
> -- 
> Daniel Ribeiro
>

Patch

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index c240454..bf07d14 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -319,6 +319,7 @@  static inline struct cfi_pri_intelext *
 read_pri_intelext(struct map_info *map, __u16 adr)
 {
 	struct cfi_pri_intelext *extp;
+	unsigned int extra_size = 0;
 	unsigned int extp_size = sizeof(*extp);
 
  again:
@@ -340,19 +341,24 @@  read_pri_intelext(struct map_info *map, __u16 adr)
 	extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask);
 	extp->ProtRegAddr = le16_to_cpu(extp->ProtRegAddr);
 
-	if (extp->MajorVersion == '1' && extp->MinorVersion >= '3') {
-		unsigned int extra_size = 0;
-		int nb_parts, i;
+	if (extp->MinorVersion >= '0') {
+		extra_size = 0;
 
 		/* Protection Register info */
 		extra_size += (extp->NumProtectionFields - 1) *
 			      sizeof(struct cfi_intelext_otpinfo);
+	}
 
+	if (extp->MinorVersion >= '1') {
 		/* Burst Read info */
 		extra_size += 2;
 		if (extp_size < sizeof(*extp) + extra_size)
 			goto need_more;
-		extra_size += extp->extra[extra_size-1];
+		extra_size += extp->extra[extra_size - 1];
+	}
+
+	if (extp->MinorVersion >= '3') {
+		int nb_parts, i;
 
 		/* Number of hardware-partitions */
 		extra_size += 1;