interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flash/nor/stellaris: improve support for Tiva C (Blizzard and Snowflake) 

This should make current Tiva C parts usable apart from the protection.

Runtime tested on TM4C123GXL (Blizzard) and TM4C1294XL (Snowflake).

Change-Id: Ia64e9d39fbd2b7049578bbfade72435e5203ddf5
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2257
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Paul Fertser 2014-08-17 13:58:07 +04:00 committed by Andreas Fritiofson
parent 804aee7702
commit 76cabfc311
1 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/flash/nor/stellaris.c
View File

@ -69,6 +69,8 @@
#define FLASH_CRIS (FLASH_CONTROL_BASE | 0x00C) #define FLASH_CRIS (FLASH_CONTROL_BASE | 0x00C)
#define FLASH_CIM (FLASH_CONTROL_BASE | 0x010) #define FLASH_CIM (FLASH_CONTROL_BASE | 0x010)
#define FLASH_MISC (FLASH_CONTROL_BASE | 0x014) #define FLASH_MISC (FLASH_CONTROL_BASE | 0x014)
#define FLASH_FSIZE (FLASH_CONTROL_BASE | 0xFC0)
#define FLASH_SSIZE (FLASH_CONTROL_BASE | 0xFC4)
#define AMISC 1 #define AMISC 1
#define PMISC 2 #define PMISC 2
@ -98,6 +100,8 @@ struct stellaris_flash_bank {
uint32_t did1; uint32_t did1;
uint32_t dc0; uint32_t dc0;
uint32_t dc1; uint32_t dc1;
uint32_t fsize;
uint32_t ssize;
const char *target_name; const char *target_name;
uint8_t target_class; uint8_t target_class;
@ -403,7 +407,7 @@ static const struct {
{0x05, 0xC4, "LM4F212H5QC"}, {0x05, 0xC4, "LM4F212H5QC"},
{0x05, 0xC6, "LM4F212H5QD"}, {0x05, 0xC6, "LM4F212H5QD"},
{0x05, 0xA0, "LM4F230E5QR"}, {0x05, 0xA0, "LM4F230E5QR"},
{0x05, 0xA1, "LM4F230H5QR"}, {0x05, 0xA1, "LM4F230H5QR/TM4C123GH6PM"},
{0x05, 0xB0, "LM4F231E5QR"}, {0x05, 0xB0, "LM4F231E5QR"},
{0x05, 0xB1, "LM4F231H5QR"}, {0x05, 0xB1, "LM4F231H5QR"},
{0x05, 0xC0, "LM4F232E5QC"}, {0x05, 0xC0, "LM4F232E5QC"},
@ -414,17 +418,22 @@ static const struct {
{0x05, 0xEA, "LM4FS1GH5BB"}, {0x05, 0xEA, "LM4FS1GH5BB"},
{0x05, 0xE4, "LM4FS99H5BB"}, {0x05, 0xE4, "LM4FS99H5BB"},
{0x05, 0xE1, "LM4FSXLH5BB"}, {0x05, 0xE1, "LM4FSXLH5BB"},
{0x0A, 0x1F, "TM4C1294NCPDT"},
{0xFF, 0x00, "Unknown Part"} {0xFF, 0x00, "Unknown Part"}
}; };
static const char *StellarisClassname[7] = { static const char * const StellarisClassname[] = {
"Sandstorm", "Sandstorm",
"Fury", "Fury",
"Unknown", "Unknown",
"DustDevil", "DustDevil",
"Tempest", "Tempest",
"Blizzard", "Blizzard/TM4C123x",
"Firestorm" "Firestorm",
"",
"",
"",
"Snowflake",
}; };
/*************************************************************************** /***************************************************************************
@ -486,8 +495,8 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
stellaris_info->did1, stellaris_info->did1,
stellaris_info->did1, stellaris_info->did1,
"ARMv7M", "ARMv7M",
(int)((1 + ((stellaris_info->dc0 >> 16) & 0xFFFF))/4), stellaris_info->sramsiz,
(int)((1 + (stellaris_info->dc0 & 0xFFFF))*2)); stellaris_info->num_pages * stellaris_info->pagesize / 1024);
buf += printed; buf += printed;
buf_size -= printed; buf_size -= printed;
@ -666,7 +675,7 @@ static int stellaris_read_part_info(struct flash_bank *bank)
LOG_DEBUG("did0 0x%" PRIx32 ", did1 0x%" PRIx32 ", dc0 0x%" PRIx32 ", dc1 0x%" PRIx32 "", LOG_DEBUG("did0 0x%" PRIx32 ", did1 0x%" PRIx32 ", dc0 0x%" PRIx32 ", dc1 0x%" PRIx32 "",
did0, did1, stellaris_info->dc0, stellaris_info->dc1); did0, did1, stellaris_info->dc0, stellaris_info->dc1);
ver = did0 >> 28; ver = DID0_VER(did0);
if ((ver != 0) && (ver != 1)) { if ((ver != 0) && (ver != 1)) {
LOG_WARNING("Unknown did0 version, cannot identify target"); LOG_WARNING("Unknown did0 version, cannot identify target");
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
@ -724,6 +733,7 @@ static int stellaris_read_part_info(struct flash_bank *bank)
case 4: /* Tempest */ case 4: /* Tempest */
case 5: /* Blizzard */ case 5: /* Blizzard */
case 6: /* Firestorm */ case 6: /* Firestorm */
case 0xa: /* Snowflake */
stellaris_info->iosc_freq = 16000000; /* +/- 1% */ stellaris_info->iosc_freq = 16000000; /* +/- 1% */
stellaris_info->iosc_desc = " (±1%)"; stellaris_info->iosc_desc = " (±1%)";
/* FALL THROUGH */ /* FALL THROUGH */
@ -747,10 +757,34 @@ static int stellaris_read_part_info(struct flash_bank *bank)
stellaris_info->did0 = did0; stellaris_info->did0 = did0;
stellaris_info->did1 = did1; stellaris_info->did1 = did1;
stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF); if (stellaris_info->target_class == 5) { /* Blizzard */
stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF)); target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize);
stellaris_info->pagesize = 1024; target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize);
stellaris_info->pages_in_lockregion = 2;
stellaris_info->num_lockbits = 1 + (stellaris_info->fsize & 0xFFFF);
stellaris_info->num_pages = 2 * (1 + (stellaris_info->fsize & 0xFFFF));
stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
stellaris_info->pagesize = 1024;
stellaris_info->pages_in_lockregion = 2;
} else if (stellaris_info->target_class == 0xa) { /* Snowflake */
target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize);
target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize);
stellaris_info->pagesize = (1 << ((stellaris_info->fsize >> 16) & 7)) * 1024;
stellaris_info->num_pages = 2048 * (1 + (stellaris_info->fsize & 0xFFFF)) /
stellaris_info->pagesize;
stellaris_info->pages_in_lockregion = 1;
stellaris_info->num_lockbits = stellaris_info->pagesize * stellaris_info->num_pages /
2048;
stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
} else {
stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF);
stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF));
stellaris_info->sramsiz = (1 + ((stellaris_info->dc0 >> 16) & 0xFFFF)) / 4;
stellaris_info->pagesize = 1024;
stellaris_info->pages_in_lockregion = 2;
}
/* REVISIT for at least Tempest parts, read NVMSTAT.FWB too. /* REVISIT for at least Tempest parts, read NVMSTAT.FWB too.
* That exposes a 32-word Flash Write Buffer ... enabling * That exposes a 32-word Flash Write Buffer ... enabling
@ -774,6 +808,11 @@ static int stellaris_protect_check(struct flash_bank *bank)
if (stellaris->did1 == 0) if (stellaris->did1 == 0)
return ERROR_FLASH_BANK_NOT_PROBED; return ERROR_FLASH_BANK_NOT_PROBED;
if (stellaris->target_class == 0xa) {
LOG_WARNING("Assuming flash to be unprotected on Snowflake");
return ERROR_OK;
}
for (i = 0; i < (unsigned) bank->num_sectors; i++) for (i = 0; i < (unsigned) bank->num_sectors; i++)
bank->sectors[i].is_protected = -1; bank->sectors[i].is_protected = -1;
@ -890,6 +929,11 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
if (stellaris_info->did1 == 0) if (stellaris_info->did1 == 0)
return ERROR_FLASH_BANK_NOT_PROBED; return ERROR_FLASH_BANK_NOT_PROBED;
if (stellaris_info->target_class == 0xa) {
LOG_ERROR("Protection on Snowflake is not supported yet");
return ERROR_FLASH_OPERATION_FAILED;
}
/* lockregions are 2 pages ... must protect [even..odd] */ /* lockregions are 2 pages ... must protect [even..odd] */
if ((first < 0) || (first & 1) if ((first < 0) || (first & 1)
|| (last < first) || !(last & 1) || (last < first) || !(last & 1)
@ -1216,7 +1260,7 @@ static int stellaris_probe(struct flash_bank *bank)
} }
/* provide this for the benefit of the NOR flash framework */ /* provide this for the benefit of the NOR flash framework */
bank->size = 1024 * stellaris_info->num_pages; bank->size = stellaris_info->num_pages * stellaris_info->pagesize;
bank->num_sectors = stellaris_info->num_pages; bank->num_sectors = stellaris_info->num_pages;
bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector)); bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector));
for (int i = 0; i < bank->num_sectors; i++) { for (int i = 0; i < bank->num_sectors; i++) {