Commit d10a39d1 authored by Hans-Christian Egtvedt's avatar Hans-Christian Egtvedt Committed by David Woodhouse
Browse files

[MTD] [NOR] More CFI fixups for Atmel chips 



Convert CFI tables from Atmel cmdset_0001 chips to Intel format and set
BufWrite timeouts to 0 for Atmel cmdset_0001 and cmdset_0002 chips.
Some chips may indicate support for buffered writes even though they
only support dual-word writes.

The CFI fixup must run before fixup_use_write_buffers for this to work.

Signed-off-by: default avatarHåvard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 4edaf56e

drivers/mtd/chips/cfi_cmdset_0001.c

+43 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define I82802AC	0x00ac

#define MANUFACTURER_ST         0x0020

#define M50LPW080       0x002F

#define AT49BV640D	0x02de



static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);

static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -157,6 +158,47 @@ static void cfi_tell_features(struct cfi_pri_intelext *extp) 
}

#endif



/* Atmel chips don't use the same PRI format as Intel chips */

static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)

{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;

	struct cfi_pri_intelext *extp = cfi->cmdset_priv;

	struct cfi_pri_atmel atmel_pri;

	uint32_t features = 0;



	/* Reverse byteswapping */

	extp->FeatureSupport = cpu_to_le32(extp->FeatureSupport);

	extp->BlkStatusRegMask = cpu_to_le16(extp->BlkStatusRegMask);

	extp->ProtRegAddr = cpu_to_le16(extp->ProtRegAddr);



	memcpy(&atmel_pri, extp, sizeof(atmel_pri));

	memset((char *)extp + 5, 0, sizeof(*extp) - 5);



	printk(KERN_ERR "atmel Features: %02x\n", atmel_pri.Features);



	if (atmel_pri.Features & 0x01) /* chip erase supported */

		features |= (1<<0);

	if (atmel_pri.Features & 0x02) /* erase suspend supported */

		features |= (1<<1);

	if (atmel_pri.Features & 0x04) /* program suspend supported */

		features |= (1<<2);

	if (atmel_pri.Features & 0x08) /* simultaneous operations supported */

		features |= (1<<9);

	if (atmel_pri.Features & 0x20) /* page mode read supported */

		features |= (1<<7);

	if (atmel_pri.Features & 0x40) /* queued erase supported */

		features |= (1<<4);

	if (atmel_pri.Features & 0x80) /* Protection bits supported */

		features |= (1<<6);



	extp->FeatureSupport = features;



	/* burst write mode not supported */

	cfi->cfiq->BufWriteTimeoutTyp = 0;

	cfi->cfiq->BufWriteTimeoutMax = 0;

}



#ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE

/* Some Intel Strata Flash prior to FPO revision C has bugs in this area */

static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
@@ -234,6 +276,7 @@ static void fixup_use_powerup_lock(struct mtd_info *mtd, void *param) 
}



static struct cfi_fixup cfi_fixup_table[] = {

	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },

#ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE

	{ CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },

#endif

drivers/mtd/chips/cfi_cmdset_0002.c

+5 −1
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) 
		extp->TopBottom = 2;

	else

		extp->TopBottom = 3;



	/* burst write mode not supported */

	cfi->cfiq->BufWriteTimeoutTyp = 0;

	cfi->cfiq->BufWriteTimeoutMax = 0;

}



static void fixup_use_secsi(struct mtd_info *mtd, void *param)
@@ -217,6 +221,7 @@ static void fixup_use_atmel_lock(struct mtd_info *mtd, void *param) 
}



static struct cfi_fixup cfi_fixup_table[] = {

	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },

#ifdef AMD_BOOTLOC_BUG

	{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },

#endif
@@ -229,7 +234,6 @@ static struct cfi_fixup cfi_fixup_table[] = { 
#if !FORCE_WORD_WRITE

	{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },

#endif

	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },

	{ 0, 0, NULL, NULL }

};

static struct cfi_fixup jedec_fixup_table[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE