Commit 5b0c5c2c authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Josh Boyer
Browse files

MTD: Convert Atmel PRI information to AMD format 



Atmel flash chips don't have PRI information in the same format as
AMD flash chips. This patch installs a fixup for all Atmel chips that
converts the relevant PRI fields into AMD format.

Only the fields that are actually used by the command set is actually
converted. The rest are initialized to zero (which should be safe)

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarJosh Boyer <jwboyer@gmail.com>
parent 0b6c0bb3

drivers/mtd/chips/cfi_cmdset_0002.c

+21 −0
Original line number Diff line number Diff line
@@ -161,6 +161,26 @@ static void fixup_use_write_buffers(struct mtd_info *mtd, void *param) 
	}

}



/* Atmel chips don't use the same PRI format as AMD 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_amdstd *extp = cfi->cmdset_priv;

	struct cfi_pri_atmel atmel_pri;



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

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



	if (atmel_pri.Features & 0x02)

		extp->EraseSuspend = 2;



	if (atmel_pri.BottomBoot)

		extp->TopBottom = 2;

	else

		extp->TopBottom = 3;

}



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

{

	/* Setup for chips with a secsi area */
@@ -192,6 +212,7 @@ 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[] = {

include/linux/mtd/cfi.h

+13 −0
Original line number Diff line number Diff line
@@ -199,6 +199,18 @@ struct cfi_pri_amdstd { 
	uint8_t  TopBottom;

} __attribute__((packed));



/* Vendor-Specific PRI for Atmel chips (command set 0x0002) */



struct cfi_pri_atmel {

	uint8_t pri[3];

	uint8_t MajorVersion;

	uint8_t MinorVersion;

	uint8_t Features;

	uint8_t BottomBoot;

	uint8_t BurstMode;

	uint8_t PageMode;

} __attribute__((packed));



struct cfi_pri_query {

	uint8_t  NumFields;

	uint32_t ProtField[1]; /* Not host ordered */
@@ -464,6 +476,7 @@ struct cfi_fixup { 
#define CFI_ID_ANY  0xffff



#define CFI_MFR_AMD 0x0001

#define CFI_MFR_ATMEL 0x001F

#define CFI_MFR_ST  0x0020 	/* STMicroelectronics */



void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);

CRA Git | Maintained and supported by SUSTech CRA and CCSE