flash/nor/stellaris: allow to recover a locked device that can't be examined
[openocd.git] / src / flash / nor / stellaris.c
index 10e4d559fc0653970101580f623fdb7ad5b7e2d9..27b66325a363d48be00310d428cf6189b94adade 100644 (file)
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /***************************************************************************
 * STELLARIS flash is tested on LM3S811, LM3S6965, LM3s3748, more.
 ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "jtag/interface.h"
 #include "imp.h"
 #include <target/algorithm.h>
 #include <target/armv7m.h>
 
-
 #define DID0_VER(did0) ((did0 >> 28)&0x07)
 
 /* STELLARIS control registers */
@@ -68,6 +69,8 @@
 #define FLASH_CRIS     (FLASH_CONTROL_BASE | 0x00C)
 #define FLASH_CIM      (FLASH_CONTROL_BASE | 0x010)
 #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 PMISC  2
 #define FLASH_FMA_PRE(x)       (2 * (x))       /* for FMPPREx */
 #define FLASH_FMA_PPE(x)       (2 * (x) + 1)   /* for FMPPPEx */
 
-
 static void stellaris_read_clock_info(struct flash_bank *bank);
 static int stellaris_mass_erase(struct flash_bank *bank);
 
-struct stellaris_flash_bank
-{
+struct stellaris_flash_bank {
        /* chip id register */
        uint32_t did0;
        uint32_t did1;
        uint32_t dc0;
        uint32_t dc1;
+       uint32_t fsize;
+       uint32_t ssize;
 
-       const char * target_name;
+       const char *target_name;
+       uint8_t target_class;
 
        uint32_t sramsiz;
-       uint32_t flshsz;
        /* flash geometry */
        uint32_t num_pages;
        uint32_t pagesize;
-       uint32_t pages_in_lockregion;
-
-       /* nv memory bits */
-       uint16_t num_lockbits;
 
        /* main clock status */
        uint32_t rcc;
@@ -123,9 +122,9 @@ struct stellaris_flash_bank
        const char *mck_desc;
 };
 
-// Autogenerated by contrib/gen-stellaris-part-header.pl
-// From Stellaris Firmware Development Package revision 8049
-static struct {
+/* Autogenerated by contrib/gen-stellaris-part-header.pl */
+/* From Stellaris Firmware Development Package revision 9453 */
+static const struct {
        uint8_t class;
        uint8_t partno;
        const char *partname;
@@ -189,7 +188,6 @@ static struct {
        {0x04, 0xC9, "LM3S1R26"},
        {0x04, 0x30, "LM3S1W16"},
        {0x04, 0x2F, "LM3S1Z16"},
-       {0x01, 0xD4, "LM3S2016"},
        {0x01, 0x51, "LM3S2110"},
        {0x01, 0x84, "LM3S2139"},
        {0x03, 0x39, "LM3S2276"},
@@ -301,9 +299,7 @@ static struct {
        {0x01, 0x8B, "LM3S6637"},
        {0x01, 0xA3, "LM3S6730"},
        {0x01, 0x77, "LM3S6753"},
-       {0x01, 0xD1, "LM3S6816"},
        {0x01, 0xE9, "LM3S6911"},
-       {0x01, 0xD3, "LM3S6916"},
        {0x01, 0xE8, "LM3S6918"},
        {0x01, 0x89, "LM3S6938"},
        {0x01, 0x72, "LM3S6950"},
@@ -350,11 +346,9 @@ static struct {
        {0x04, 0x1E, "LM3S9BN5"},
        {0x04, 0x1F, "LM3S9BN6"},
        {0x06, 0x70, "LM3S9C97"},
-       {0x06, 0x7A, "LM3S9CN5"},
        {0x06, 0xA9, "LM3S9D81"},
        {0x06, 0x7E, "LM3S9D90"},
        {0x06, 0x92, "LM3S9D92"},
-       {0x06, 0xC8, "LM3S9D95"},
        {0x06, 0x9D, "LM3S9D96"},
        {0x06, 0x7B, "LM3S9DN5"},
        {0x06, 0x7C, "LM3S9DN6"},
@@ -365,65 +359,97 @@ static struct {
        {0x06, 0xA8, "LM3S9U81"},
        {0x06, 0x7D, "LM3S9U90"},
        {0x06, 0x90, "LM3S9U92"},
-       {0x06, 0xB7, "LM3S9U95"},
        {0x06, 0x9B, "LM3S9U96"},
-       {0x05, 0x18, "LM4F110B2QR"},
-       {0x05, 0x19, "LM4F110C4QR"},
-       {0x05, 0x10, "LM4F110E5QR"},
-       {0x05, 0x11, "LM4F110H5QR"},
-       {0x05, 0x22, "LM4F111B2QR"},
-       {0x05, 0x23, "LM4F111C4QR"},
-       {0x05, 0x20, "LM4F111E5QR"},
-       {0x05, 0x21, "LM4F111H5QR"},
-       {0x05, 0x36, "LM4F112C4QC"},
-       {0x05, 0x30, "LM4F112E5QC"},
-       {0x05, 0x31, "LM4F112H5QC"},
-       {0x05, 0x35, "LM4F112H5QD"},
-       {0x05, 0x01, "LM4F120B2QR"},
-       {0x05, 0x02, "LM4F120C4QR"},
-       {0x05, 0x03, "LM4F120E5QR"},
-       {0x05, 0x04, "LM4F120H5QR"},
-       {0x05, 0x08, "LM4F121B2QR"},
-       {0x05, 0x09, "LM4F121C4QR"},
-       {0x05, 0x0A, "LM4F121E5QR"},
-       {0x05, 0x0B, "LM4F121H5QR"},
-       {0x05, 0xD0, "LM4F122C4QC"},
-       {0x05, 0xD1, "LM4F122E5QC"},
-       {0x05, 0xD2, "LM4F122H5QC"},
-       {0x05, 0xD6, "LM4F122H5QD"},
-       {0x05, 0x48, "LM4F130C4QR"},
-       {0x05, 0x40, "LM4F130E5QR"},
-       {0x05, 0x41, "LM4F130H5QR"},
-       {0x05, 0x52, "LM4F131C4QR"},
-       {0x05, 0x50, "LM4F131E5QR"},
-       {0x05, 0x51, "LM4F131H5QR"},
-       {0x05, 0x66, "LM4F132C4QC"},
-       {0x05, 0x60, "LM4F132E5QC"},
-       {0x05, 0x61, "LM4F132H5QC"},
-       {0x05, 0x65, "LM4F132H5QD"},
-       {0x05, 0xA0, "LM4F230E5QR"},
-       {0x05, 0xA1, "LM4F230H5QR"},
-       {0x05, 0xB0, "LM4F231E5QR"},
-       {0x05, 0xB1, "LM4F231H5QR"},
-       {0x05, 0xC0, "LM4F232E5QC"},
-       {0x05, 0xE3, "LM4F232H5BB"},
-       {0x05, 0xC1, "LM4F232H5QC"},
-       {0x05, 0xC5, "LM4F232H5QD"},
-       {0x05, 0xE5, "LM4FS1AH5BB"},
+       {0x05, 0x01, "LM4F120B2QR/TM4C1233C3PM"},
+       {0x05, 0x02, "LM4F120C4QR/TM4C1233D5PM"},
+       {0x05, 0x03, "LM4F120E5QR/TM4C1233E6PM"},
+       {0x05, 0x04, "LM4F120H5QR/TM4C1233H6PM"},
+       {0x05, 0x08, "LM4F121B2QR/TM4C1232C3PM"},
+       {0x05, 0x09, "LM4F121C4QR/TM4C1232D5PM"},
+       {0x05, 0x0A, "LM4F121E5QR/TM4C1232E6PM"},
+       {0x05, 0x0B, "LM4F121H5QR/TM4C1232H6PM"},
+       {0x05, 0x10, "LM4F110E5QR/TM4C1231E6PM"},
+       {0x05, 0x11, "LM4F110H5QR/TM4C1231H6PM"},
+       {0x05, 0x18, "LM4F110B2QR/TM4C1231C3PM"},
+       {0x05, 0x19, "LM4F110C4QR/TM4C1231D5PM"},
+       {0x05, 0x20, "LM4F111E5QR/TM4C1230E6PM"},
+       {0x05, 0x21, "LM4F111H5QR/TM4C1230H6PM"},
+       {0x05, 0x22, "LM4F111B2QR/TM4C1230C3PM"},
+       {0x05, 0x23, "LM4F111C4QR/TM4C1230D5PM"},
+       {0x05, 0x30, "LM4F112E5QC/TM4C1231E6PZ"},
+       {0x05, 0x31, "LM4F112H5QC/TM4C1231H6PZ"},
+       {0x05, 0x35, "LM4F112H5QD/TM4C1231H6PGE"},
+       {0x05, 0x36, "LM4F112C4QC/TM4C1231D5PZ"},
+       {0x05, 0x40, "LM4F130E5QR/TM4C1237E6PM"},
+       {0x05, 0x41, "LM4F130H5QR/TM4C1237H6PM"},
+       {0x05, 0x48, "LM4F130C4QR/TM4C1237D5PM"},
+       {0x05, 0x50, "LM4F131E5QR/TM4C1236E6PM"},
+       {0x05, 0x51, "LM4F131H5QR/TM4C1236H6PM"},
+       {0x05, 0x52, "LM4F131C4QR/TM4C1236D5PM"},
+       {0x05, 0x60, "LM4F132E5QC/TM4C1237E6PZ"},
+       {0x05, 0x61, "LM4F132H5QC/TM4C1237H6PZ"},
+       {0x05, 0x65, "LM4F132H5QD/TM4C1237H6PGE"},
+       {0x05, 0x66, "LM4F132C4QC/TM4C1237D5PZ"},
+       {0x05, 0x70, "LM4F210E5QR/TM4C123BE6PM"},
+       {0x05, 0x73, "LM4F210H5QR/TM4C123BH6PM"},
+       {0x05, 0x80, "LM4F211E5QR/TM4C123AE6PM"},
+       {0x05, 0x83, "LM4F211H5QR/TM4C123AH6PM"},
+       {0x05, 0xA0, "LM4F230E5QR/TM4C123GE6PM"},
+       {0x05, 0xA1, "LM4F230H5QR/TM4C123GH6PM"},
+       {0x05, 0xB0, "LM4F231E5QR/TM4C123FE6PM"},
+       {0x05, 0xB1, "LM4F231H5QR/TM4C123FH6PM"},
+       {0x05, 0xC0, "LM4F232E5QC/TM4C123GE6PZ"},
+       {0x05, 0xC1, "LM4F232H5QC/TM4C123GH6PZ"},
+       {0x05, 0xC3, "LM4F212E5QC/TM4C123BE6PZ"},
+       {0x05, 0xC4, "LM4F212H5QC/TM4C123BH6PZ"},
+       {0x05, 0xC5, "LM4F232H5QD/TM4C123GH6PGE"},
+       {0x05, 0xC6, "LM4F212H5QD/TM4C123BH6PGE"},
+       {0x05, 0xD0, "LM4F122C4QC/TM4C1233D5PZ"},
+       {0x05, 0xD1, "LM4F122E5QC/TM4C1233E6PZ"},
+       {0x05, 0xD2, "LM4F122H5QC/TM4C1233H6PZ"},
+       {0x05, 0xD6, "LM4F122H5QD/TM4C1233H6PGE"},
+       {0x05, 0xE1, "LM4FSXLH5BB"},
+       {0x05, 0xE3, "LM4F232H5BB/TM4C123GH6ZRB"},
        {0x05, 0xE4, "LM4FS99H5BB"},
-       {0x05, 0xE0, "LM4FSXAH5BB"},
+       {0x05, 0xE5, "LM4FS1AH5BB"},
+       {0x05, 0xE9, "LM4F212H5BB/TM4C123BH6ZRB"},
+       {0x05, 0xEA, "LM4FS1GH5BB"},
+       {0x05, 0xF0, "TM4C123GH6ZXR"},
+       {0x0A, 0x19, "TM4C1290NCPDT"},
+       {0x0A, 0x1B, "TM4C1290NCZAD"},
+       {0x0A, 0x1C, "TM4C1292NCPDT"},
+       {0x0A, 0x1E, "TM4C1292NCZAD"},
+       {0x0A, 0x1F, "TM4C1294NCPDT"},
+       {0x0A, 0x21, "TM4C1294NCZAD"},
+       {0x0A, 0x22, "TM4C1297NCZAD"},
+       {0x0A, 0x23, "TM4C1299NCZAD"},
+       {0x0A, 0x24, "TM4C129CNCPDT"},
+       {0x0A, 0x26, "TM4C129CNCZAD"},
+       {0x0A, 0x27, "TM4C129DNCPDT"},
+       {0x0A, 0x29, "TM4C129DNCZAD"},
+       {0x0A, 0x2D, "TM4C129ENCPDT"},
+       {0x0A, 0x2F, "TM4C129ENCZAD"},
+       {0x0A, 0x30, "TM4C129LNCZAD"},
+       {0x0A, 0x32, "TM4C129XNCZAD"},
+       {0x0A, 0x34, "TM4C1294KCPDT"},
+       {0x0A, 0x35, "TM4C129EKCPDT"},
+       {0x0A, 0x36, "TM4C1299KCZAD"},
+       {0x0A, 0x37, "TM4C129XKCZAD"},
        {0xFF, 0x00, "Unknown Part"}
 };
 
-static char * StellarisClassname[7] =
-{
+static const char * const StellarisClassname[] = {
        "Sandstorm",
        "Fury",
        "Unknown",
        "DustDevil",
        "Tempest",
-       "Blizzard",
-       "Firestorm"
+       "Blizzard/TM4C123x",
+       "Firestorm",
+       "",
+       "",
+       "",
+       "Snowflake",
 };
 
 /***************************************************************************
@@ -437,9 +463,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
        struct stellaris_flash_bank *stellaris_info;
 
        if (CMD_ARGC < 6)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        stellaris_info = calloc(sizeof(struct stellaris_flash_bank), 1);
        bank->base = 0x0;
@@ -459,7 +483,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 
 static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
 {
-       int printed, device_class;
+       int printed;
        struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 
        if (stellaris_info->did1 == 0)
@@ -468,20 +492,12 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
        /* Read main and master clock freqency register */
        stellaris_read_clock_info(bank);
 
-       if (DID0_VER(stellaris_info->did0) > 0)
-       {
-               device_class = (stellaris_info->did0 >> 16) & 0xFF;
-       }
-       else
-       {
-               device_class = 0;
-       }
        printed = snprintf(buf,
                           buf_size,
                           "\nTI/LMI Stellaris information: Chip is "
                           "class %i (%s) %s rev %c%i\n",
-                          device_class,
-                          StellarisClassname[device_class],
+                          stellaris_info->target_class,
+                          StellarisClassname[stellaris_info->target_class],
                           stellaris_info->target_name,
                           (int)('A' + ((stellaris_info->did0 >> 8) & 0xFF)),
                           (int)((stellaris_info->did0) & 0xFF));
@@ -495,33 +511,23 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
                           stellaris_info->did1,
                           stellaris_info->did1,
                           "ARMv7M",
-                          (int)((1 + ((stellaris_info->dc0 >> 16) & 0xFFFF))/4),
-                          (int)((1 + (stellaris_info->dc0 & 0xFFFF))*2));
+                          stellaris_info->sramsiz,
+                          stellaris_info->num_pages * stellaris_info->pagesize / 1024);
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf,
+       snprintf(buf,
                           buf_size,
                           "master clock: %ikHz%s, "
-                          "rcc is 0x%" PRIx32 ", rcc2 is 0x%" PRIx32 "\n",
+                          "rcc is 0x%" PRIx32 ", rcc2 is 0x%" PRIx32 ", "
+                          "pagesize: %" PRIu32 ", pages: %" PRIu32,
                           (int)(stellaris_info->mck_freq / 1000),
                           stellaris_info->mck_desc,
                           stellaris_info->rcc,
-                          stellaris_info->rcc2);
-       buf += printed;
-       buf_size -= printed;
+                          stellaris_info->rcc2,
+                          stellaris_info->pagesize,
+                          stellaris_info->num_pages);
 
-       if (stellaris_info->num_lockbits > 0)
-       {
-               snprintf(buf,
-                               buf_size,
-                               "pagesize: %" PRIi32 ", pages: %d, "
-                               "lockbits: %i, pages per lockbit: %i\n",
-                               stellaris_info->pagesize,
-                               (unsigned) stellaris_info->num_pages,
-                               stellaris_info->num_lockbits,
-                               (unsigned) stellaris_info->pages_in_lockregion);
-       }
        return ERROR_OK;
 }
 
@@ -536,7 +542,11 @@ static void stellaris_set_flash_timing(struct flash_bank *bank)
        struct target *target = bank->target;
        uint32_t usecrl = (stellaris_info->mck_freq/1000000ul-1);
 
-       LOG_DEBUG("usecrl = %i",(int)(usecrl));
+       /* only valid for Sandstorm and Fury class devices */
+       if (stellaris_info->target_class > 1)
+               return;
+
+       LOG_DEBUG("usecrl = %i", (int)(usecrl));
        target_write_u32(target, SCB_BASE | USECRL, usecrl);
 }
 
@@ -617,8 +627,7 @@ static void stellaris_read_clock_info(struct flash_bank *bank)
 
        stellaris_info->mck_desc = "";
 
-       switch (oscsrc)
-       {
+       switch (oscsrc) {
                case 0:                         /* MOSC */
                        mainfreq = rcc_xtal[xtal];
                        break;
@@ -673,23 +682,20 @@ static int stellaris_read_part_info(struct flash_bank *bank)
        LOG_DEBUG("did0 0x%" PRIx32 ", did1 0x%" PRIx32 ", dc0 0x%" PRIx32 ", dc1 0x%" PRIx32 "",
                  did0, did1, stellaris_info->dc0, stellaris_info->dc1);
 
-       ver = did0 >> 28;
-       if ((ver != 0) && (ver != 1))
-       {
+       ver = DID0_VER(did0);
+       if ((ver != 0) && (ver != 1)) {
                LOG_WARNING("Unknown did0 version, cannot identify target");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
-       if (did1 == 0)
-       {
+       if (did1 == 0) {
                LOG_WARNING("Cannot identify target as a Stellaris");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
        ver = did1 >> 28;
        fam = (did1 >> 24) & 0xF;
-       if (((ver != 0) && (ver != 1)) || (fam != 0))
-       {
+       if (((ver != 0) && (ver != 1)) || (fam != 0)) {
                LOG_WARNING("Unknown did1 version/family.");
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -700,47 +706,56 @@ static int stellaris_read_part_info(struct flash_bank *bank)
         * always approximate.
         *
         * For Tempest:  IOSC is calibrated, 16 MHz
+        * For Blizzard:  IOSC is calibrated, 16 MHz
+        * For Firestorm:  IOSC is calibrated, 16 MHz
         */
        stellaris_info->iosc_freq = 12000000;
        stellaris_info->iosc_desc = " (±30%)";
        stellaris_info->xtal_mask = 0x0f;
 
-       switch ((did0 >> 28) & 0x7) {
-       case 0:                         /* Sandstorm */
-               /*
-                * Current (2009-August) parts seem to be rev C2 and use 12 MHz.
-                * Parts before rev C0 used 15 MHz; some C0 parts use 15 MHz
-                * (LM3S618), but some other C0 parts are 12 MHz (LM3S811).
-                */
-               if (((did0 >> 8) & 0xff) < 2) {
-                       stellaris_info->iosc_freq = 15000000;
-                       stellaris_info->iosc_desc = " (±50%)";
-               }
-               break;
-       case 1:
-               switch ((did0 >> 16) & 0xff) {
+       /* get device class */
+       if (DID0_VER(did0) > 0) {
+               stellaris_info->target_class = (did0 >> 16) & 0xFF;
+       } else {
+               /* Sandstorm class */
+               stellaris_info->target_class = 0;
+       }
+
+       switch (stellaris_info->target_class) {
+               case 0:                         /* Sandstorm */
+                       /*
+                        * Current (2009-August) parts seem to be rev C2 and use 12 MHz.
+                        * Parts before rev C0 used 15 MHz; some C0 parts use 15 MHz
+                        * (LM3S618), but some other C0 parts are 12 MHz (LM3S811).
+                        */
+                       if (((did0 >> 8) & 0xff) < 2) {
+                               stellaris_info->iosc_freq = 15000000;
+                               stellaris_info->iosc_desc = " (±50%)";
+                       }
+                       break;
+
                case 1:                 /* Fury */
                        break;
+
                case 4:                 /* Tempest */
+               case 5:                 /* Blizzard */
+               case 6:                 /* Firestorm */
+               case 0xa:               /* Snowflake */
                        stellaris_info->iosc_freq = 16000000;   /* +/- 1% */
                        stellaris_info->iosc_desc = " (±1%)";
                        /* FALL THROUGH */
+
                case 3:                 /* DustDevil */
                        stellaris_info->xtal_mask = 0x1f;
                        break;
+
                default:
                        LOG_WARNING("Unknown did0 class");
-               }
-               break;
-       default:
-               LOG_WARNING("Unknown did0 version");
-               break;
        }
 
-       for (i = 0; StellarisParts[i].partno; i++)
-       {
+       for (i = 0; StellarisParts[i].partno; i++) {
                if ((StellarisParts[i].partno == ((did1 >> 16) & 0xFF)) &&
-                               (StellarisParts[i].class == ((did0 >> 16) & 0xFF)))
+                               (StellarisParts[i].class == stellaris_info->target_class))
                        break;
        }
 
@@ -749,10 +764,26 @@ static int stellaris_read_part_info(struct flash_bank *bank)
        stellaris_info->did0 = did0;
        stellaris_info->did1 = did1;
 
-       stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF);
-       stellaris_info->num_pages = 2 *(1 + (stellaris_info->dc0 & 0xFFFF));
-       stellaris_info->pagesize = 1024;
-       stellaris_info->pages_in_lockregion = 2;
+       if (stellaris_info->target_class == 5) { /* Blizzard */
+               target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize);
+               target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize);
+
+               stellaris_info->num_pages = 2 * (1 + (stellaris_info->fsize & 0xFFFF));
+               stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
+               stellaris_info->pagesize = 1024;
+       } 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->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
+       } else {
+               stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF));
+               stellaris_info->sramsiz = (1 + ((stellaris_info->dc0 >> 16) & 0xFFFF)) / 4;
+               stellaris_info->pagesize = 1024;
+       }
 
        /* REVISIT for at least Tempest parts, read NVMSTAT.FWB too.
         * That exposes a 32-word Flash Write Buffer ... enabling
@@ -769,9 +800,12 @@ static int stellaris_read_part_info(struct flash_bank *bank)
 static int stellaris_protect_check(struct flash_bank *bank)
 {
        struct stellaris_flash_bank *stellaris = bank->driver_priv;
+       struct target *target = bank->target;
+       uint32_t flash_sizek = stellaris->pagesize / 1024 *
+               stellaris->num_pages;
+       uint32_t fmppe_addr;
        int status = ERROR_OK;
        unsigned i;
-       unsigned page;
 
        if (stellaris->did1 == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
@@ -783,32 +817,32 @@ static int stellaris_protect_check(struct flash_bank *bank)
         * to report any pages that we can't write.  Ignore the Read Enable
         * register (FMPRE).
         */
-       for (i = 0, page = 0;
-                       i < DIV_ROUND_UP(stellaris->num_lockbits, 32u);
-                       i++) {
-               uint32_t lockbits;
-
-               status = target_read_u32(bank->target,
-                               SCB_BASE + (i ? (FMPPE0 + 4 * i) : FMPPE),
-                               &lockbits);
-               LOG_DEBUG("FMPPE%d = %#8.8x (status %d)", i,
-                               (unsigned) lockbits, status);
-               if (status != ERROR_OK)
-                       goto done;
-
-               for (unsigned j = 0; j < 32; j++) {
-                       unsigned k;
 
-                       for (k = 0; k < stellaris->pages_in_lockregion; k++) {
-                               if (page >= (unsigned) bank->num_sectors)
-                                       goto done;
-                               bank->sectors[page++].is_protected =
-                                               !(lockbits & (1 << j));
+       if (stellaris->target_class >= 0x0a || flash_sizek > 64)
+               fmppe_addr = SCB_BASE | FMPPE0;
+       else
+               fmppe_addr = SCB_BASE | FMPPE;
+
+       unsigned int page = 0, lockbitnum, lockbitcnt = flash_sizek / 2;
+       unsigned int bits_per_page = stellaris->pagesize / 2048;
+       /* Every lock bit always corresponds to a 2k region */
+       for (lockbitnum = 0; lockbitnum < lockbitcnt; lockbitnum += 32) {
+               uint32_t fmppe;
+
+               target_read_u32(target, fmppe_addr, &fmppe);
+               for (i = 0; i < 32 && lockbitnum + i < lockbitcnt; i++) {
+                       bool protect = !(fmppe & (1 << i));
+                       if (bits_per_page) {
+                               bank->sectors[page++].is_protected = protect;
+                               i += bits_per_page - 1;
+                       } else { /* 1024k pages, every lockbit covers 2 pages */
+                               bank->sectors[page++].is_protected = protect;
+                               bank->sectors[page++].is_protected = protect;
                        }
                }
+               fmppe_addr += 4;
        }
 
-done:
        return status;
 }
 
@@ -819,8 +853,7 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
        struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
        struct target *target = bank->target;
 
-       if (bank->target->state != TARGET_HALTED)
-       {
+       if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -829,14 +862,10 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        if ((first < 0) || (last < first) || (last >= (int)stellaris_info->num_pages))
-       {
                return ERROR_FLASH_SECTOR_INVALID;
-       }
 
        if ((first == 0) && (last == ((int)stellaris_info->num_pages-1)))
-       {
                return stellaris_mass_erase(bank);
-       }
 
        /* Refresh flash controller timing */
        stellaris_read_clock_info(bank);
@@ -850,24 +879,21 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
         * it might want to process those IRQs.
         */
 
-       for (banknr = first; banknr <= last; banknr++)
-       {
+       for (banknr = first; banknr <= last; banknr++) {
                /* Address is first word in page */
                target_write_u32(target, FLASH_FMA, banknr * stellaris_info->pagesize);
                /* Write erase command */
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_ERASE);
                /* Wait until erase complete */
-               do
-               {
+               do {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
-               }
-               while (flash_fmc & FMC_ERASE);
+               } while (flash_fmc & FMC_ERASE);
 
                /* Check acess violations */
                target_read_u32(target, FLASH_CRIS, &flash_cris);
-               if (flash_cris & (AMASK))
-               {
-                       LOG_WARNING("Error erasing flash page %i,  flash_cris 0x%" PRIx32 "", banknr, flash_cris);
+               if (flash_cris & (AMASK)) {
+                       LOG_WARNING("Error erasing flash page %i,  flash_cris 0x%" PRIx32 "",
+                                       banknr, flash_cris);
                        target_write_u32(target, FLASH_CRIS, 0);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
@@ -880,34 +906,34 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
 
 static int stellaris_protect(struct flash_bank *bank, int set, int first, int last)
 {
-       uint32_t fmppe, flash_fmc, flash_cris;
-       int lockregion;
-
-       struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
+       struct stellaris_flash_bank *stellaris = bank->driver_priv;
        struct target *target = bank->target;
+       uint32_t flash_fmc, flash_cris;
+       unsigned int bits_per_page = stellaris->pagesize / 2048;
 
-       if (bank->target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (!set)
-       {
+       if (!set) {
                LOG_ERROR("Hardware doesn't support page-level unprotect. "
                        "Try the 'recover' command.");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       if (stellaris_info->did1 == 0)
+       if (stellaris->did1 == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
-       /* lockregions are 2 pages ... must protect [even..odd] */
-       if ((first < 0) || (first & 1)
-                       || (last < first) || !(last & 1)
-                       || (last >= 2 * stellaris_info->num_lockbits))
-       {
-               LOG_ERROR("Can't protect unaligned or out-of-range pages.");
+       if (stellaris->target_class == 0x03 &&
+           !((stellaris->did0 >> 8) & 0xFF) &&
+           !((stellaris->did0) & 0xFF)) {
+               LOG_ERROR("DustDevil A0 parts can't be unprotected, see errata; refusing to proceed");
+               return ERROR_FLASH_OPERATION_FAILED;
+       }
+
+       if (!bits_per_page && (first % 2 || !(last % 2))) {
+               LOG_ERROR("Can't protect unaligned pages");
                return ERROR_FLASH_SECTOR_INVALID;
        }
 
@@ -915,60 +941,60 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
        stellaris_read_clock_info(bank);
        stellaris_set_flash_timing(bank);
 
-       /* convert from pages to lockregions */
-       first /= 2;
-       last /= 2;
-
-       /* FIXME this assumes single FMPPE, for a max of 64K of flash!!
-        * Current parts can be much bigger.
-        */
-       if (last >= 32) {
-               LOG_ERROR("No support yet for protection > 64K");
-               return ERROR_FLASH_OPERATION_FAILED;
-       }
-
-       target_read_u32(target, SCB_BASE | FMPPE, &fmppe);
-
-       for (lockregion = first; lockregion <= last; lockregion++)
-               fmppe &= ~(1 << lockregion);
-
        /* Clear and disable flash programming interrupts */
        target_write_u32(target, FLASH_CIM, 0);
        target_write_u32(target, FLASH_MISC, PMISC | AMISC);
 
-       /* REVISIT this clobbers state set by any halted firmware ...
-        * it might want to process those IRQs.
-        */
+       uint32_t flash_sizek = stellaris->pagesize / 1024 *
+               stellaris->num_pages;
+       uint32_t fmppe_addr;
 
-       LOG_DEBUG("fmppe 0x%" PRIx32 "",fmppe);
-       target_write_u32(target, SCB_BASE | FMPPE, fmppe);
+       if (stellaris->target_class >= 0x0a || flash_sizek > 64)
+               fmppe_addr = SCB_BASE | FMPPE0;
+       else
+               fmppe_addr = SCB_BASE | FMPPE;
+
+       int page = 0;
+       unsigned int lockbitnum, lockbitcnt = flash_sizek / 2;
+       /* Every lock bit always corresponds to a 2k region */
+       for (lockbitnum = 0; lockbitnum < lockbitcnt; lockbitnum += 32) {
+               uint32_t fmppe;
+
+               target_read_u32(target, fmppe_addr, &fmppe);
+               for (unsigned int i = 0;
+                    i < 32 && lockbitnum + i < lockbitcnt;
+                    i++) {
+                       if (page >= first && page <= last)
+                               fmppe &= ~(1 << i);
+
+                       if (bits_per_page) {
+                               if (!((i + 1) % bits_per_page))
+                                       page++;
+                       } else { /* 1024k pages, every lockbit covers 2 pages */
+                               page += 2;
+                       }
+               }
+               target_write_u32(target, fmppe_addr, fmppe);
 
-       /* Commit FMPPE */
-       target_write_u32(target, FLASH_FMA, 1);
+               /* Commit FMPPE* */
+               target_write_u32(target, FLASH_FMA, 1 + lockbitnum / 16);
+               /* Write commit command */
+               target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_COMT);
 
-       /* Write commit command */
-       /* REVISIT safety check, since this cannot be undone
-        * except by the "Recover a locked device" procedure.
-        * REVISIT DustDevil-A0 parts have an erratum making FMPPE commits
-        * inadvisable ... it makes future mass erase operations fail.
-        */
-       LOG_WARNING("Flash protection cannot be removed once committed, commit is NOT executed !");
-       /* target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_COMT); */
+               /* Wait until commit complete */
+               do {
+                       target_read_u32(target, FLASH_FMC, &flash_fmc);
+               } while (flash_fmc & FMC_COMT);
 
-       /* Wait until erase complete */
-       do
-       {
-               target_read_u32(target, FLASH_FMC, &flash_fmc);
-       }
-       while (flash_fmc & FMC_COMT);
+               /* Check access violations */
+               target_read_u32(target, FLASH_CRIS, &flash_cris);
+               if (flash_cris & (AMASK)) {
+                       LOG_WARNING("Error setting flash page protection,  flash_cris 0x%" PRIx32 "", flash_cris);
+                       target_write_u32(target, FLASH_CRIS, 0);
+                       return ERROR_FLASH_OPERATION_FAILED;
+               }
 
-       /* Check acess violations */
-       target_read_u32(target, FLASH_CRIS, &flash_cris);
-       if (flash_cris & (AMASK))
-       {
-               LOG_WARNING("Error setting flash page protection,  flash_cris 0x%" PRIx32 "", flash_cris);
-               target_write_u32(target, FLASH_CRIS, 0);
-               return ERROR_FLASH_OPERATION_FAILED;
+               fmppe_addr += 4;
        }
 
        return ERROR_OK;
@@ -976,54 +1002,51 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 
 /* see contib/loaders/flash/stellaris.s for src */
 
-static const uint8_t stellaris_write_code[] =
-{
-/*
-       Call with :
-       r0 = buffer address
-       r1 = destination address
-       r2 = bytecount (in) - endaddr (work)
-
-       Used registers:
-       r3 = pFLASH_CTRL_BASE
-       r4 = FLASHWRITECMD
-       r5 = #1
-       r6 = bytes written
-       r7 = temp reg
-*/
-       0x07,0x4B,                      /* ldr r3,pFLASH_CTRL_BASE */
-       0x08,0x4C,                      /* ldr r4,FLASHWRITECMD */
-       0x01,0x25,                      /* movs r5, 1 */
-       0x00,0x26,                      /* movs r6, #0 */
-/* mainloop: */
-       0x19,0x60,                      /* str  r1, [r3, #0] */
-       0x87,0x59,                      /* ldr  r7, [r0, r6] */
-       0x5F,0x60,                      /* str  r7, [r3, #4] */
-       0x9C,0x60,                      /* str  r4, [r3, #8] */
-/* waitloop: */
-       0x9F,0x68,                      /* ldr  r7, [r3, #8] */
-       0x2F,0x42,                      /* tst  r7, r5 */
-       0xFC,0xD1,                      /* bne  waitloop */
-       0x04,0x31,                      /* adds r1, r1, #4 */
-       0x04,0x36,                      /* adds r6, r6, #4 */
-       0x96,0x42,                      /* cmp  r6, r2 */
-       0xF4,0xD1,                      /* bne  mainloop */
-       0x00,0xBE,              /* bkpt #0 */
-/* pFLASH_CTRL_BASE: */
-       0x00,0xD0,0x0F,0x40,    /* .word        0x400FD000 */
-/* FLASHWRITECMD: */
-       0x01,0x00,0x42,0xA4     /* .word        0xA4420001 */
+static const uint8_t stellaris_write_code[] = {
+                                                               /* write: */
+       0xDF, 0xF8, 0x40, 0x40,         /* ldr          r4, pFLASH_CTRL_BASE */
+       0xDF, 0xF8, 0x40, 0x50,         /* ldr          r5, FLASHWRITECMD */
+                                                               /* wait_fifo: */
+       0xD0, 0xF8, 0x00, 0x80,         /* ldr          r8, [r0, #0] */
+       0xB8, 0xF1, 0x00, 0x0F,         /* cmp          r8, #0 */
+       0x17, 0xD0,                                     /* beq          exit */
+       0x47, 0x68,                                     /* ldr          r7, [r0, #4] */
+       0x47, 0x45,                                     /* cmp          r7, r8 */
+       0xF7, 0xD0,                                     /* beq          wait_fifo */
+                                                               /* mainloop: */
+       0x22, 0x60,                                     /* str          r2, [r4, #0] */
+       0x02, 0xF1, 0x04, 0x02,         /* add          r2, r2, #4 */
+       0x57, 0xF8, 0x04, 0x8B,         /* ldr          r8, [r7], #4 */
+       0xC4, 0xF8, 0x04, 0x80,         /* str          r8, [r4, #4] */
+       0xA5, 0x60,                                     /* str          r5, [r4, #8] */
+                                                               /* busy: */
+       0xD4, 0xF8, 0x08, 0x80,         /* ldr          r8, [r4, #8] */
+       0x18, 0xF0, 0x01, 0x0F,         /* tst          r8, #1 */
+       0xFA, 0xD1,                                     /* bne          busy */
+       0x8F, 0x42,                                     /* cmp          r7, r1 */
+       0x28, 0xBF,                                     /* it           cs */
+       0x00, 0xF1, 0x08, 0x07,         /* addcs        r7, r0, #8 */
+       0x47, 0x60,                                     /* str          r7, [r0, #4] */
+       0x01, 0x3B,                                     /* subs         r3, r3, #1 */
+       0x03, 0xB1,                                     /* cbz          r3, exit */
+       0xE2, 0xE7,                                     /* b            wait_fifo */
+                                                               /* exit: */
+       0x00, 0xBE,                                     /* bkpt         #0 */
+
+       /* pFLASH_CTRL_BASE: */
+       0x00, 0xD0, 0x0F, 0x40, /* .word        0x400FD000 */
+       /* FLASHWRITECMD: */
+       0x01, 0x00, 0x42, 0xA4  /* .word        0xA4420001 */
 };
-
 static int stellaris_write_block(struct flash_bank *bank,
-               uint8_t *buffer, uint32_t offset, uint32_t wcount)
+               const uint8_t *buffer, uint32_t offset, uint32_t wcount)
 {
        struct target *target = bank->target;
        uint32_t buffer_size = 16384;
        struct working_area *source;
        struct working_area *write_algorithm;
        uint32_t address = bank->base + offset;
-       struct reg_param reg_params[3];
+       struct reg_param reg_params[4];
        struct armv7m_algorithm armv7m_info;
        int retval = ERROR_OK;
 
@@ -1038,8 +1061,8 @@ static int stellaris_write_block(struct flash_bank *bank,
                        bank, buffer, offset, wcount);
 
        /* flash write code */
-       if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK)
-       {
+       if (target_alloc_working_area(target, sizeof(stellaris_write_code),
+                       &write_algorithm) != ERROR_OK) {
                LOG_DEBUG("no working area for block memory writes");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        };
@@ -1049,11 +1072,9 @@ static int stellaris_write_block(struct flash_bank *bank,
                buffer_size = wcount * 4;
 
        /* memory buffer */
-       while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
-       {
+       while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) {
                buffer_size /= 2;
-               if (buffer_size <= buf_min)
-               {
+               if (buffer_size <= buf_min) {
                        target_free_working_area(target, write_algorithm);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
@@ -1061,51 +1082,32 @@ static int stellaris_write_block(struct flash_bank *bank,
                                target_name(target), (unsigned) buffer_size);
        };
 
-       retval = target_write_buffer(target, write_algorithm->address,
+       target_write_buffer(target, write_algorithm->address,
                        sizeof(stellaris_write_code),
-                       (uint8_t *) stellaris_write_code);
+                       stellaris_write_code);
 
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
-       armv7m_info.core_mode = ARMV7M_MODE_ANY;
+       armv7m_info.core_mode = ARM_MODE_THREAD;
 
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
        init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
+       init_reg_param(&reg_params[3], "r3", 32, PARAM_OUT);
 
-       while (wcount > 0)
-       {
-               uint32_t thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
-
-               target_write_buffer(target, source->address, thisrun_count * 4, buffer);
-
-               buf_set_u32(reg_params[0].value, 0, 32, source->address);
-               buf_set_u32(reg_params[1].value, 0, 32, address);
-               buf_set_u32(reg_params[2].value, 0, 32, 4*thisrun_count);
-               LOG_DEBUG("Algorithm flash write %u words to 0x%" PRIx32
-                               ", %u remaining",
-                               (unsigned) thisrun_count, address,
-                               (unsigned) (wcount - thisrun_count));
-               retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
-                               write_algorithm->address,
-                               0,
-                               10000, &armv7m_info);
-               if (retval != ERROR_OK)
-               {
-                       LOG_ERROR("error %d executing stellaris "
-                                       "flash write algorithm",
-                                       retval);
-                       retval = ERROR_FLASH_OPERATION_FAILED;
-                       break;
-               }
+       buf_set_u32(reg_params[0].value, 0, 32, source->address);
+       buf_set_u32(reg_params[1].value, 0, 32, source->address + source->size);
+       buf_set_u32(reg_params[2].value, 0, 32, address);
+       buf_set_u32(reg_params[3].value, 0, 32, wcount);
 
-               buffer += thisrun_count * 4;
-               address += thisrun_count * 4;
-               wcount -= thisrun_count;
-       }
+       retval = target_run_flash_async_algorithm(target, buffer, wcount, 4,
+                       0, NULL,
+                       4, reg_params,
+                       source->address, source->size,
+                       write_algorithm->address, 0,
+                       &armv7m_info);
 
-       /* REVISIT we could speed up writing multi-section images by
-        * not freeing the initialized write_algorithm this way.
-        */
+       if (retval == ERROR_FLASH_OPERATION_FAILED)
+               LOG_ERROR("error %d executing stellaris flash write algorithm", retval);
 
        target_free_working_area(target, write_algorithm);
        target_free_working_area(target, source);
@@ -1113,11 +1115,13 @@ static int stellaris_write_block(struct flash_bank *bank,
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
+       destroy_reg_param(&reg_params[3]);
 
        return retval;
 }
 
-static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stellaris_write(struct flash_bank *bank, const uint8_t *buffer,
+               uint32_t offset, uint32_t count)
 {
        struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
        struct target *target = bank->target;
@@ -1128,8 +1132,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
        uint32_t bytes_written = 0;
        int retval;
 
-       if (bank->target->state != TARGET_HALTED)
-       {
+       if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -1140,8 +1143,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
        if (stellaris_info->did1 == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
-       if (offset & 0x3)
-       {
+       if (offset & 0x3) {
                LOG_WARNING("offset size must be word aligned");
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
@@ -1162,36 +1164,28 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
         */
 
        /* multiple words to be programmed? */
-       if (words_remaining > 0)
-       {
+       if (words_remaining > 0) {
                /* try using a block write */
                retval = stellaris_write_block(bank, buffer, offset,
                                words_remaining);
-               if (retval != ERROR_OK)
-               {
-                       if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
-                       {
+               if (retval != ERROR_OK) {
+                       if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) {
                                LOG_DEBUG("writing flash word-at-a-time");
-                       }
-                       else if (retval == ERROR_FLASH_OPERATION_FAILED)
-                       {
+                       } else if (retval == ERROR_FLASH_OPERATION_FAILED) {
                                /* if an error occured, we examine the reason, and quit */
                                target_read_u32(target, FLASH_CRIS, &flash_cris);
 
                                LOG_ERROR("flash writing failed with CRIS: 0x%" PRIx32 "", flash_cris);
                                return ERROR_FLASH_OPERATION_FAILED;
                        }
-               }
-               else
-               {
+               } else {
                        buffer += words_remaining * 4;
                        address += words_remaining * 4;
                        words_remaining = 0;
                }
        }
 
-       while (words_remaining > 0)
-       {
+       while (words_remaining > 0) {
                if (!(address & 0xff))
                        LOG_DEBUG("0x%" PRIx32 "", address);
 
@@ -1201,8 +1195,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE);
                /* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */
                /* Wait until write complete */
-               do
-               {
+               do {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
                } while (flash_fmc & FMC_WRITE);
 
@@ -1211,8 +1204,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
                words_remaining--;
        }
 
-       if (bytes_remaining)
-       {
+       if (bytes_remaining) {
                uint8_t last_word[4] = {0xff, 0xff, 0xff, 0xff};
 
                /* copy the last remaining bytes into the write buffer */
@@ -1227,16 +1219,14 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE);
                /* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */
                /* Wait until write complete */
-               do
-               {
+               do {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
                } while (flash_fmc & FMC_WRITE);
        }
 
        /* Check access violations */
        target_read_u32(target, FLASH_CRIS, &flash_cris);
-       if (flash_cris & (AMASK))
-       {
+       if (flash_cris & (AMASK)) {
                LOG_DEBUG("flash_cris 0x%" PRIx32 "", flash_cris);
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -1262,18 +1252,16 @@ static int stellaris_probe(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       if (bank->sectors)
-       {
+       if (bank->sectors) {
                free(bank->sectors);
                bank->sectors = NULL;
        }
 
        /* 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->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++) {
                bank->sectors[i].offset = i * stellaris_info->pagesize;
                bank->sectors[i].size = stellaris_info->pagesize;
                bank->sectors[i].is_erased = -1;
@@ -1292,8 +1280,7 @@ static int stellaris_mass_erase(struct flash_bank *bank)
        stellaris_info = bank->driver_priv;
        target = bank->target;
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -1316,24 +1303,19 @@ static int stellaris_mass_erase(struct flash_bank *bank)
        target_write_u32(target, FLASH_FMA, 0);
        target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
        /* Wait until erase complete */
-       do
-       {
+       do {
                target_read_u32(target, FLASH_FMC, &flash_fmc);
-       }
-       while (flash_fmc & FMC_MERASE);
+       } while (flash_fmc & FMC_MERASE);
 
        /* if device has > 128k, then second erase cycle is needed
         * this is only valid for older devices, but will not hurt */
-       if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
-       {
+       if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000) {
                target_write_u32(target, FLASH_FMA, 0x20000);
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
                /* Wait until erase complete */
-               do
-               {
+               do {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
-               }
-               while (flash_fmc & FMC_MERASE);
+               } while (flash_fmc & FMC_MERASE);
        }
 
        return ERROR_OK;
@@ -1344,29 +1326,21 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
        int i;
 
        if (CMD_ARGC < 1)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
-       if (stellaris_mass_erase(bank) == ERROR_OK)
-       {
+       if (stellaris_mass_erase(bank) == ERROR_OK) {
                /* set all sectors as erased */
                for (i = 0; i < bank->num_sectors; i++)
-               {
                        bank->sectors[i].is_erased = 1;
-               }
 
                command_print(CMD_CTX, "stellaris mass erase complete");
-       }
-       else
-       {
+       } else
                command_print(CMD_CTX, "stellaris mass erase failed");
-       }
 
        return ERROR_OK;
 }
@@ -1385,9 +1359,12 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
        struct flash_bank *bank;
        int retval;
 
-       retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (retval != ERROR_OK)
-               return retval;
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       bank = get_flash_bank_by_num_noprobe(0);
+       if (!bank)
+               return ERROR_FAIL;
 
        /* REVISIT ... it may be worth sanity checking that the AP is
         * inactive before we start.  ARM documents that switching a DP's
@@ -1395,12 +1372,18 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
         * cycle to recover.
         */
 
+       Jim_Eval_Named(CMD_CTX->interp, "catch { hla_command \"debug unlock\" }", 0, 0);
+       if (!strcmp(Jim_GetString(Jim_GetResult(CMD_CTX->interp), NULL), "0")) {
+               retval = ERROR_OK;
+               goto user_action;
+       }
+
        /* assert SRST */
        if (!(jtag_get_reset_config() & RESET_HAS_SRST)) {
                LOG_ERROR("Can't recover Stellaris flash without SRST");
                return ERROR_FAIL;
        }
-       jtag_add_reset(0, 1);
+       adapter_assert_reset();
 
        for (int i = 0; i < 5; i++) {
                retval = dap_to_swd(bank->target);
@@ -1413,12 +1396,13 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
        }
 
        /* de-assert SRST */
-       jtag_add_reset(0, 0);
+       adapter_deassert_reset();
        retval = jtag_execute_queue();
 
        /* wait 400+ msec ... OK, "1+ second" is simpler */
        usleep(1000);
 
+user_action:
        /* USER INTERVENTION required for the power cycle
         * Restarting OpenOCD is likely needed because of mode switching.
         */
@@ -1441,7 +1425,7 @@ static const struct command_registration stellaris_exec_command_handlers[] = {
                .name = "recover",
                .handler = stellaris_handle_recover_command,
                .mode = COMMAND_EXEC,
-               .usage = "bank_id",
+               .usage = "",
                .help = "recover (and erase) locked device",
        },
        COMMAND_REGISTRATION_DONE
@@ -1467,7 +1451,7 @@ struct flash_driver stellaris_flash = {
        .read = default_flash_read,
        .probe = stellaris_probe,
        .auto_probe = stellaris_probe,
-       .erase_check = default_flash_mem_blank_check,
+       .erase_check = default_flash_blank_check,
        .protect_check = stellaris_protect_check,
        .info = get_stellaris_info,
 };

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)