Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b158ab authored by Daniel Ribeiro's avatar Daniel Ribeiro Committed by David Woodhouse
Browse files

mtd: CFI 1.0 and CFI 1.1 

This patch allows otpinfo for CFI >= 1.0 and burst read for CFI >= 1.1.

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: default avatarDaniel Ribeiro <drwyrm@gmail.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent ec2d0d84

drivers/mtd/chips/cfi_cmdset_0001.c

+10 −4
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ read_pri_intelext(struct map_info *map, __u16 adr) 
{

	struct cfi_private *cfi = map->fldrv_priv;

	struct cfi_pri_intelext *extp;

	unsigned int extra_size = 0;

	unsigned int extp_size = sizeof(*extp);



 again:
@@ -352,19 +353,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];

	}



	if (extp->MinorVersion >= '3') {

		int nb_parts, i;



		/* Number of hardware-partitions */

		extra_size += 1;