kinetis : Add flash sector size detection for K21 MCU.
[fw/openocd] / src / flash / nor / kinetis.c
index 71722c645fef6120155a95e0646a48ec0ae56d14..6512ce7602d62189f162b5b7e3db1bba60feb863 100644 (file)
@@ -8,6 +8,9 @@
  *   Copyright (C) 2012 by Christopher D. Kilgour                          *
  *   techie at whiterocker.com                                             *
  *                                                                         *
+ *   Copyright (C) 2013 Nemui Trinomius                                    *
+ *   nemuisan_kawausogasuki@live.jp                                        *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -21,7 +24,7 @@
  *   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.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -29,7 +32,9 @@
 #endif
 
 #include "imp.h"
-#include "helper/binarybuffer.h"
+#include <helper/binarybuffer.h>
+#include <target/algorithm.h>
+#include <target/armv7m.h>
 
 /*
  * Implementation Notes
  * 8:7 of the read-only SIM_SDID register reflect the granularity
  * settings 0..3, so sector sizes and block counts are applicable
  * according to the following table.
+ * NB. These undocumented bits does not work for all MCUs.
+ * A more reliable way is to detect the particular MCU model from the
+ * SDID field and pick the correct granularity based on that. See
+ * the handling of K21 in kinetis_read_part_info() for an example.
  */
+
 const struct {
        unsigned pflash_sector_size_bytes;
        unsigned nvm_sector_size_bytes;
@@ -95,11 +105,46 @@ const struct {
        { 4<<10, 4<<10, 4 }
 };
 
+/* Addressess */
+#define FLEXRAM                0x14000000
+#define FTFx_FSTAT     0x40020000
+#define FTFx_FCNFG     0x40020001
+#define FTFx_FCCOB3    0x40020004
+#define FTFx_FPROT3    0x40020010
+#define SIM_SDID       0x40048024
+#define SIM_FCFG1      0x4004804c
+#define SIM_FCFG2      0x40048050
+
+/* Commands */
+#define FTFx_CMD_BLOCKSTAT  0x00
+#define FTFx_CMD_SECTSTAT   0x01
+#define FTFx_CMD_LWORDPROG  0x06
+#define FTFx_CMD_SECTERASE  0x09
+#define FTFx_CMD_SECTWRITE  0x0b
+#define FTFx_CMD_SETFLEXRAM 0x81
+#define FTFx_CMD_MASSERASE  0x44
+
+#define KINETIS_SDID_FAMID_MASK 0x00000070
+#define KINETIS_SDID_FAMID_K10  0x00000000
+#define KINETIS_SDID_FAMID_K12  0x00000000
+#define KINETIS_SDID_FAMID_K20  0x00000010
+#define KINETIS_SDID_FAMID_K22  0x00000010
+#define KINETIS_SDID_FAMID_K30  0x00000020
+#define KINETIS_SDID_FAMID_K11  0x00000020
+#define KINETIS_SDID_FAMID_K61  0x00000020
+#define KINETIS_SDID_FAMID_K40  0x00000030
+#define KINETIS_SDID_FAMID_K21  0x00000030
+#define KINETIS_SDID_FAMID_K60  0x00000040
+#define KINETIS_SDID_FAMID_K62  0x00000040
+#define KINETIS_SDID_FAMID_K70  0x00000050
+#define KINETIS_SDID_FAMID_KW24 0x00000060
+
 struct kinetis_flash_bank {
        unsigned granularity;
        unsigned bank_ordinal;
        uint32_t sector_size;
        uint32_t protection_size;
+       uint32_t klxx;
 
        uint32_t sim_sdid;
        uint32_t sim_fcfg1;
@@ -131,8 +176,178 @@ FLASH_BANK_COMMAND_HANDLER(kinetis_flash_bank_command)
        return ERROR_OK;
 }
 
-static int kinetis_protect(struct flash_bank *bank, int set, int first,
-                          int last)
+/* Kinetis Program-LongWord Microcodes */
+static const uint8_t kinetis_flash_write_code[] = {
+       /* Params:
+        * r0 - workarea buffer
+       * r1 - target address
+       * r2 - wordcount
+       * Clobbered:
+       * r4 - tmp
+       * r5 - tmp
+       * r6 - tmp
+       * r7 - tmp
+       */
+
+                                                       /* .L1: */
+                                               /* for(register uint32_t i=0;i<wcount;i++){ */
+       0x04, 0x1C,                                     /* mov    r4, r0          */
+       0x00, 0x23,                                     /* mov    r3, #0          */
+                                                       /* .L2: */
+       0x0E, 0x1A,                                     /* sub    r6, r1, r0      */
+       0xA6, 0x19,                                     /* add    r6, r4, r6      */
+       0x93, 0x42,                                     /* cmp    r3, r2          */
+       0x16, 0xD0,                                     /* beq    .L9             */
+                                                       /* .L5: */
+                                               /* while((FTFx_FSTAT&FTFA_FSTAT_CCIF_MASK) != FTFA_FSTAT_CCIF_MASK){}; */
+       0x0B, 0x4D,                                     /* ldr    r5, .L10        */
+       0x2F, 0x78,                                     /* ldrb   r7, [r5]        */
+       0x7F, 0xB2,                                     /* sxtb   r7, r7          */
+       0x00, 0x2F,                                     /* cmp    r7, #0          */
+       0xFA, 0xDA,                                     /* bge    .L5             */
+                                               /* FTFx_FSTAT = FTFA_FSTAT_ACCERR_MASK|FTFA_FSTAT_FPVIOL_MASK|FTFA_FSTAT_RDCO */
+       0x70, 0x27,                                     /* mov    r7, #112        */
+       0x2F, 0x70,                                     /* strb   r7, [r5]        */
+                                               /* FTFx_FCCOB3 = faddr; */
+       0x09, 0x4F,                                     /* ldr    r7, .L10+4      */
+       0x3E, 0x60,                                     /* str    r6, [r7]        */
+       0x06, 0x27,                                     /* mov    r7, #6          */
+                                               /* FTFx_FCCOB0 = 0x06;  */
+       0x08, 0x4E,                                     /* ldr    r6, .L10+8      */
+       0x37, 0x70,                                     /* strb   r7, [r6]        */
+                                               /* FTFx_FCCOB7 = *pLW;  */
+       0x80, 0xCC,                                     /* ldmia  r4!, {r7}       */
+       0x08, 0x4E,                                     /* ldr    r6, .L10+12     */
+       0x37, 0x60,                                     /* str    r7, [r6]        */
+                                               /* FTFx_FSTAT = FTFA_FSTAT_CCIF_MASK; */
+       0x80, 0x27,                                     /* mov    r7, #128        */
+       0x2F, 0x70,                                     /* strb   r7, [r5]        */
+                                                       /* .L4: */
+                                               /* while((FTFx_FSTAT&FTFA_FSTAT_CCIF_MASK) != FTFA_FSTAT_CCIF_MASK){}; */
+       0x2E, 0x78,                                     /* ldrb    r6, [r5]       */
+       0x77, 0xB2,                                     /* sxtb    r7, r6         */
+       0x00, 0x2F,                                     /* cmp     r7, #0         */
+       0xFB, 0xDA,                                     /* bge     .L4            */
+       0x01, 0x33,                                     /* add     r3, r3, #1     */
+       0xE4, 0xE7,                                     /* b       .L2            */
+                                                       /* .L9: */
+       0x00, 0xBE,                                     /* bkpt #0                */
+                                                       /* .L10: */
+       0x00, 0x00, 0x02, 0x40,         /* .word    1073872896    */
+       0x04, 0x00, 0x02, 0x40,         /* .word    1073872900    */
+       0x07, 0x00, 0x02, 0x40,         /* .word    1073872903    */
+       0x08, 0x00, 0x02, 0x40,         /* .word    1073872904    */
+};
+
+/* Program LongWord Block Write */
+static int kinetis_write_block(struct flash_bank *bank, uint8_t *buffer,
+               uint32_t offset, uint32_t wcount)
+{
+       struct target *target = bank->target;
+       uint32_t buffer_size = 2048;            /* Default minimum value */
+       struct working_area *write_algorithm;
+       struct working_area *source;
+       uint32_t address = bank->base + offset;
+       struct reg_param reg_params[3];
+       struct armv7m_algorithm armv7m_info;
+       int retval = ERROR_OK;
+
+       /* Params:
+        * r0 - workarea buffer
+        * r1 - target address
+        * r2 - wordcount
+        * Clobbered:
+        * r4 - tmp
+        * r5 - tmp
+        * r6 - tmp
+        * r7 - tmp
+        */
+
+       /* Increase buffer_size if needed */
+       if (buffer_size < (target->working_area_size/2))
+               buffer_size = (target->working_area_size/2);
+
+       LOG_INFO("Kinetis: FLASH Write ...");
+
+       /* check code alignment */
+       if (offset & 0x1) {
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 2-byte alignment", offset);
+               return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
+       }
+
+       /* allocate working area with flash programming code */
+       if (target_alloc_working_area(target, sizeof(kinetis_flash_write_code),
+                       &write_algorithm) != ERROR_OK) {
+               LOG_WARNING("no working area available, can't do block memory writes");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
+
+       retval = target_write_buffer(target, write_algorithm->address,
+               sizeof(kinetis_flash_write_code), kinetis_flash_write_code);
+       if (retval != ERROR_OK)
+               return retval;
+
+       /* memory buffer */
+       while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) {
+               buffer_size /= 4;
+               if (buffer_size <= 256) {
+                       /* free working area, write algorithm already allocated */
+                       target_free_working_area(target, write_algorithm);
+
+                       LOG_WARNING("No large enough working area available, can't do block memory writes");
+                       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+               }
+       }
+
+       armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
+       armv7m_info.core_mode = ARM_MODE_THREAD;
+
+       init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT); /* *pLW (*buffer) */
+       init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT); /* faddr */
+       init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT); /* number of words to program */
+
+       /* write code buffer and use Flash programming code within kinetis       */
+       /* Set breakpoint to 0 with time-out of 1000 ms                          */
+       while (wcount > 0) {
+               uint32_t thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
+
+               retval = target_write_buffer(target, write_algorithm->address, 8,
+                               kinetis_flash_write_code);
+               if (retval != ERROR_OK)
+                       break;
+
+               retval = target_write_buffer(target, source->address, thisrun_count * 4, buffer);
+               if (retval != ERROR_OK)
+                       break;
+
+               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, thisrun_count);
+
+               retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
+                               write_algorithm->address, 0, 100000, &armv7m_info);
+               if (retval != ERROR_OK) {
+                       LOG_ERROR("Error executing kinetis Flash programming algorithm");
+                       retval = ERROR_FLASH_OPERATION_FAILED;
+                       break;
+               }
+
+               buffer += thisrun_count * 4;
+               address += thisrun_count * 4;
+               wcount -= thisrun_count;
+       }
+
+       target_free_working_area(target, source);
+       target_free_working_area(target, write_algorithm);
+
+       destroy_reg_param(&reg_params[0]);
+       destroy_reg_param(&reg_params[1]);
+       destroy_reg_param(&reg_params[2]);
+
+       return retval;
+}
+
+static int kinetis_protect(struct flash_bank *bank, int set, int first, int last)
 {
        LOG_WARNING("kinetis_protect not supported yet");
        /* FIXME: TODO */
@@ -160,8 +375,8 @@ static int kinetis_protect_check(struct flash_bank *bank)
                uint32_t fprot, psec;
                int i, b;
 
-               /* read protection register FTFx_FPROT */
-               result = target_read_memory(bank->target, 0x40020010, 1, 4, buffer);
+               /* read protection register */
+               result = target_read_memory(bank->target, FTFx_FPROT3, 1, 4, buffer);
 
                if (result != ERROR_OK)
                        return result;
@@ -195,54 +410,55 @@ static int kinetis_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int kinetis_ftfx_command(struct flash_bank *bank, uint32_t w0,
-                               uint32_t w1, uint32_t w2, uint8_t *ftfx_fstat)
+static int kinetis_ftfx_command(struct flash_bank *bank, uint8_t fcmd, uint32_t faddr,
+                               uint8_t fccob4, uint8_t fccob5, uint8_t fccob6, uint8_t fccob7,
+                               uint8_t fccob8, uint8_t fccob9, uint8_t fccoba, uint8_t fccobb,
+                               uint8_t *ftfx_fstat)
 {
-       uint8_t buffer[12];
+       uint8_t command[12] = {faddr & 0xff, (faddr >> 8) & 0xff, (faddr >> 16) & 0xff, fcmd,
+                       fccob7, fccob6, fccob5, fccob4,
+                       fccobb, fccoba, fccob9, fccob8};
        int result, i;
+       uint8_t buffer;
 
        /* wait for done */
        for (i = 0; i < 50; i++) {
                result =
-                       target_read_memory(bank->target, 0x40020000, 1, 1, buffer);
+                       target_read_memory(bank->target, FTFx_FSTAT, 1, 1, &buffer);
 
                if (result != ERROR_OK)
                        return result;
 
-               if (buffer[0] & 0x80)
+               if (buffer & 0x80)
                        break;
 
-               buffer[0] = 0x00;
+               buffer = 0x00;
        }
 
-       if (buffer[0] != 0x80) {
+       if (buffer != 0x80) {
                /* reset error flags */
-               buffer[0] = 0x30;
+               buffer = 0x30;
                result =
-                       target_write_memory(bank->target, 0x40020000, 1, 1, buffer);
+                       target_write_memory(bank->target, FTFx_FSTAT, 1, 1, &buffer);
                if (result != ERROR_OK)
                        return result;
        }
 
-       target_buffer_set_u32(bank->target, buffer, w0);
-       target_buffer_set_u32(bank->target, buffer + 4, w1);
-       target_buffer_set_u32(bank->target, buffer + 8, w2);
-
-       result = target_write_memory(bank->target, 0x40020004, 4, 3, buffer);
+       result = target_write_memory(bank->target, FTFx_FCCOB3, 4, 3, command);
 
        if (result != ERROR_OK)
                return result;
 
        /* start command */
-       buffer[0] = 0x80;
-       result = target_write_memory(bank->target, 0x40020000, 1, 1, buffer);
+       buffer = 0x80;
+       result = target_write_memory(bank->target, FTFx_FSTAT, 1, 1, &buffer);
        if (result != ERROR_OK)
                return result;
 
        /* wait for done */
-       for (i = 0; i < 50; i++) {
+       for (i = 0; i < 240; i++) { /* Need Entire Erase Nemui Changed */
                result =
-                       target_read_memory(bank->target, 0x40020000, 1, 1, ftfx_fstat);
+                       target_read_memory(bank->target, FTFx_FSTAT, 1, 1, ftfx_fstat);
 
                if (result != ERROR_OK)
                        return result;
@@ -253,19 +469,52 @@ static int kinetis_ftfx_command(struct flash_bank *bank, uint32_t w0,
 
        if ((*ftfx_fstat & 0xf0) != 0x80) {
                LOG_ERROR
-                       ("ftfx command failed FSTAT: %02X W0: %08X W1: %08X W2: %08X",
-                        *ftfx_fstat, w0, w1, w2);
-
+                       ("ftfx command failed FSTAT: %02X FCCOB: %02X%02X%02X%02X %02X%02X%02X%02X %02X%02X%02X%02X",
+                        *ftfx_fstat, command[3], command[2], command[1], command[0],
+                        command[7], command[6], command[5], command[4],
+                        command[11], command[10], command[9], command[8]);
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
        return ERROR_OK;
 }
 
+static int kinetis_mass_erase(struct flash_bank *bank)
+{
+       int result;
+       uint8_t ftfx_fstat;
+
+       if (bank->target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       /* check if whole bank is blank */
+       LOG_INFO("Kinetis L Series Erase All Blocks");
+       /* set command and sector address */
+       result = kinetis_ftfx_command(bank, FTFx_CMD_MASSERASE, 0,
+                       0, 0, 0, 0,  0, 0, 0, 0,  &ftfx_fstat);
+       /* Anyway Result, write unsecure byte */
+       /*      if (result != ERROR_OK)
+               return result;*/
+
+       /* Write to MCU security status unsecure in Flash security byte(Work around) */
+       LOG_INFO("Write to MCU security status unsecure Anyway!");
+       uint8_t padding[4] = {0xFE, 0xFF, 0xFF, 0xFF}; /* Write 0xFFFFFFFE */
+
+       result = kinetis_ftfx_command(bank, FTFx_CMD_LWORDPROG, (bank->base + 0x0000040C),
+                               padding[3], padding[2], padding[1], padding[0],
+                               0, 0, 0, 0,  &ftfx_fstat);
+       if (result != ERROR_OK)
+               return ERROR_FLASH_OPERATION_FAILED;
+
+       return ERROR_OK;
+}
+
 static int kinetis_erase(struct flash_bank *bank, int first, int last)
 {
        int result, i;
-       uint32_t w0 = 0, w1 = 0, w2 = 0;
+       struct kinetis_flash_bank *kinfo = bank->driver_priv;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -275,6 +524,9 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
        if ((first > bank->num_sectors) || (last > bank->num_sectors))
                return ERROR_FLASH_OPERATION_FAILED;
 
+       if ((first == 0) && (last == (bank->num_sectors - 1)) && (kinfo->klxx))
+               return kinetis_mass_erase(bank);
+
        /*
         * FIXME: TODO: use the 'Erase Flash Block' command if the
         * requested erase is PFlash or NVM and encompasses the entire
@@ -283,9 +535,8 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
        for (i = first; i <= last; i++) {
                uint8_t ftfx_fstat;
                /* set command and sector address */
-               w0 = (0x09 << 24) | (bank->base + bank->sectors[i].offset);
-
-               result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+               result = kinetis_ftfx_command(bank, FTFx_CMD_SECTERASE, bank->base + bank->sectors[i].offset,
+                               0, 0, 0, 0,  0, 0, 0, 0,  &ftfx_fstat);
 
                if (result != ERROR_OK) {
                        LOG_WARNING("erase sector %d failed", i);
@@ -308,29 +559,34 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
 {
        unsigned int i, result, fallback = 0;
        uint8_t buf[8];
-       uint32_t wc, w0 = 0, w1 = 0, w2 = 0;
+       uint32_t wc;
        struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       uint8_t *new_buffer = NULL;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (kinfo->flash_class == FC_FLEX_NVM) {
+       if (kinfo->klxx) {
+               /* fallback to longword write */
+               fallback = 1;
+               LOG_WARNING("Kinetis L Series supports Program Longword execution only.");
+               LOG_DEBUG("flash write into PFLASH @08%" PRIX32, offset);
+
+       } else if (kinfo->flash_class == FC_FLEX_NVM) {
                uint8_t ftfx_fstat;
 
-               LOG_DEBUG("flash write into FlexNVM @%08X", offset);
+               LOG_DEBUG("flash write into FlexNVM @%08" PRIX32, offset);
 
                /* make flex ram available */
-               w0 = (0x81 << 24) | 0x00ff0000;
-
-               result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+               result = kinetis_ftfx_command(bank, FTFx_CMD_SETFLEXRAM, 0x00ff0000, 0, 0, 0, 0,  0, 0, 0, 0,  &ftfx_fstat);
 
                if (result != ERROR_OK)
                        return ERROR_FLASH_OPERATION_FAILED;
 
                /* check if ram ready */
-               result = target_read_memory(bank->target, 0x40020001, 1, 1, buf);
+               result = target_read_memory(bank->target, FTFx_FCNFG, 1, 1, buf);
 
                if (result != ERROR_OK)
                        return result;
@@ -339,33 +595,36 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
                        /* fallback to longword write */
                        fallback = 1;
 
-                       LOG_WARNING("ram not ready, fallback to slow longword write (FCNFG: %02X)",
-                                   buf[0]);
+                       LOG_WARNING("ram not ready, fallback to slow longword write (FCNFG: %02X)", buf[0]);
                }
        } else {
-               LOG_DEBUG("flash write into PFLASH @08%X", offset);
+               LOG_DEBUG("flash write into PFLASH @08%" PRIX32, offset);
        }
 
 
        /* program section command */
        if (fallback == 0) {
-               unsigned prog_section_bytes = kinfo->sector_size >> 8;
-               for (i = 0; i < count; i += kinfo->sector_size) {
-                       /*
-                        * The largest possible Kinetis "section" is
-                        * 16 bytes.  A full Kinetis sector is always
-                        * 256 "section"s.
-                        */
+               /*
+                * Kinetis uses different terms for the granularity of
+                * sector writes, e.g. "phrase" or "128 bits".  We use
+                * the generic term "chunk". The largest possible
+                * Kinetis "chunk" is 16 bytes (128 bits).
+                */
+               unsigned prog_section_chunk_bytes = kinfo->sector_size >> 8;
+               /* assume the NVM sector size is half the FlexRAM size */
+               unsigned prog_size_bytes = MIN(kinfo->sector_size,
+                               kinetis_flash_params[kinfo->granularity].nvm_sector_size_bytes);
+               for (i = 0; i < count; i += prog_size_bytes) {
                        uint8_t residual_buffer[16];
                        uint8_t ftfx_fstat;
-                       uint32_t section_count = 256;
+                       uint32_t section_count = prog_size_bytes / prog_section_chunk_bytes;
                        uint32_t residual_wc = 0;
 
                        /*
                         * Assume the word count covers an entire
                         * sector.
                         */
-                       wc = kinfo->sector_size / 4;
+                       wc = prog_size_bytes / 4;
 
                        /*
                         * If bytes to be programmed are less than the
@@ -374,30 +633,30 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
                         * residual buffer so that a full "section"
                         * may always be programmed.
                         */
-                       if ((count - i) < kinfo->sector_size) {
+                       if ((count - i) < prog_size_bytes) {
                                /* number of bytes to program beyond full section */
-                               unsigned residual_bc = (count-i) % prog_section_bytes;
+                               unsigned residual_bc = (count-i) % prog_section_chunk_bytes;
 
                                /* number of complete words to copy directly from buffer */
                                wc = (count - i) / 4;
 
                                /* number of total sections to write, including residual */
-                               section_count = DIV_ROUND_UP((count-i), prog_section_bytes);
+                               section_count = DIV_ROUND_UP((count-i), prog_section_chunk_bytes);
 
                                /* any residual bytes delivers a whole residual section */
-                               residual_wc = (residual_bc ? prog_section_bytes : 0)/4;
+                               residual_wc = (residual_bc ? prog_section_chunk_bytes : 0)/4;
 
                                /* clear residual buffer then populate residual bytes */
-                               (void) memset(residual_buffer, 0xff, prog_section_bytes);
+                               (void) memset(residual_buffer, 0xff, prog_section_chunk_bytes);
                                (void) memcpy(residual_buffer, &buffer[i+4*wc], residual_bc);
                        }
 
-                       LOG_DEBUG("write section @ %08X with length %d bytes",
-                                 offset + i, (count - i));
+                       LOG_DEBUG("write section @ %08" PRIX32 " with length %" PRIu32 " bytes",
+                                 offset + i, (uint32_t)wc*4);
 
                        /* write data to flexram as whole-words */
-                       result = target_write_memory(bank->target, 0x14000000, 4, wc,
-                                                    buffer + i);
+                       result = target_write_memory(bank->target, FLEXRAM, 4, wc,
+                                       buffer + i);
 
                        if (result != ERROR_OK) {
                                LOG_ERROR("target_write_memory failed");
@@ -407,9 +666,9 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
                        /* write the residual words to the flexram */
                        if (residual_wc) {
                                result = target_write_memory(bank->target,
-                                                            0x14000000+4*wc,
-                                                            4, residual_wc,
-                                                            residual_buffer);
+                                               FLEXRAM+4*wc,
+                                               4, residual_wc,
+                                               residual_buffer);
 
                                if (result != ERROR_OK) {
                                        LOG_ERROR("target_write_memory failed");
@@ -418,30 +677,60 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
                        }
 
                        /* execute section-write command */
-                       w0 = (0x0b << 24) | (bank->base + offset + i);
-                       w1 = section_count << 16;
-
-                       result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+                       result = kinetis_ftfx_command(bank, FTFx_CMD_SECTWRITE, bank->base + offset + i,
+                                       section_count>>8, section_count, 0, 0,
+                                       0, 0, 0, 0,  &ftfx_fstat);
 
                        if (result != ERROR_OK)
                                return ERROR_FLASH_OPERATION_FAILED;
                }
        }
        /* program longword command, not supported in "SF3" devices */
-       else if (kinfo->granularity != 3) {
-               for (i = 0; i < count; i += 4) {
-                       uint8_t ftfx_fstat;
+       else if ((kinfo->granularity != 3) || (kinfo->klxx)) {
+
+               if (count & 0x3) {
+                       uint32_t old_count = count;
+                       count = (old_count | 3) + 1;
+                       new_buffer = malloc(count);
+                       if (new_buffer == NULL) {
+                               LOG_ERROR("odd number of bytes to write and no memory "
+                                       "for padding buffer");
+                               return ERROR_FAIL;
+                       }
+                       LOG_INFO("odd number of bytes to write (%" PRIu32 "), extending to %" PRIu32 " "
+                               "and padding with 0xff", old_count, count);
+                       memset(buffer, 0xff, count);
+                       buffer = memcpy(new_buffer, buffer, old_count);
+               }
 
-                       LOG_DEBUG("write longword @ %08X", offset + i);
+               uint32_t words_remaining = count / 4;
 
-                       w0 = (0x06 << 24) | (bank->base + offset + i);
-                       w1 = buf_get_u32(buffer + offset + i, 0, 32);
+               /* try using a block write */
+               int retval = kinetis_write_block(bank, buffer, offset, words_remaining);
 
-                       result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+               if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) {
+                       /* if block write failed (no sufficient working area),
+                        * we use normal (slow) single word accesses */
+                       LOG_WARNING("couldn't use block writes, falling back to single "
+                               "memory accesses");
 
-                       if (result != ERROR_OK)
-                               return ERROR_FLASH_OPERATION_FAILED;
+                       for (i = 0; i < count; i += 4) {
+                               uint8_t ftfx_fstat;
+
+                               LOG_DEBUG("write longword @ %08" PRIX32, (uint32_t)(offset + i));
+
+                               uint8_t padding[4] = {0xff, 0xff, 0xff, 0xff};
+                               memcpy(padding, buffer + i, MIN(4, count-i));
+
+                               result = kinetis_ftfx_command(bank, FTFx_CMD_LWORDPROG, bank->base + offset + i,
+                                               padding[3], padding[2], padding[1], padding[0],
+                                               0, 0, 0, 0,  &ftfx_fstat);
+
+                               if (result != ERROR_OK)
+                                       return ERROR_FLASH_OPERATION_FAILED;
+                       }
                }
+
        } else {
                LOG_ERROR("Flash write strategy not implemented");
                return ERROR_FLASH_OPERATION_FAILED;
@@ -453,31 +742,41 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
 static int kinetis_read_part_info(struct flash_bank *bank)
 {
        int result, i;
-       uint8_t buf[4];
        uint32_t offset = 0;
        uint8_t fcfg1_nvmsize, fcfg1_pfsize, fcfg1_eesize, fcfg2_pflsh;
        uint32_t nvm_size = 0, pf_size = 0, ee_size = 0;
        unsigned granularity, num_blocks = 0, num_pflash_blocks = 0, num_nvm_blocks = 0,
                first_nvm_bank = 0, reassign = 0;
+       struct target *target = bank->target;
        struct kinetis_flash_bank *kinfo = bank->driver_priv;
 
-       result = target_read_memory(bank->target, 0x40048024, 1, 4, buf);
+       result = target_read_u32(target, SIM_SDID, &kinfo->sim_sdid);
        if (result != ERROR_OK)
                return result;
-       kinfo->sim_sdid = target_buffer_get_u32(bank->target, buf);
-       granularity = (kinfo->sim_sdid >> 7) & 0x03;
-       result = target_read_memory(bank->target, 0x4004804c, 1, 4, buf);
+
+       /* Kinetis L Series SubFamily Check */
+       kinfo->klxx = 0;
+       i = (kinfo->sim_sdid >> 20) & 0x0F;
+       if (i == 1) {
+               kinfo->klxx = 1;
+               granularity = 0;
+       } else if ((kinfo->sim_sdid & KINETIS_SDID_FAMID_MASK)
+               == KINETIS_SDID_FAMID_K21) {
+               granularity = 2;
+       } else
+               granularity = (kinfo->sim_sdid >> 7) & 0x03;
+
+       result = target_read_u32(target, SIM_FCFG1, &kinfo->sim_fcfg1);
        if (result != ERROR_OK)
                return result;
-       kinfo->sim_fcfg1 = target_buffer_get_u32(bank->target, buf);
-       result = target_read_memory(bank->target, 0x40048050, 1, 4, buf);
+
+       result = target_read_u32(target, SIM_FCFG2, &kinfo->sim_fcfg2);
        if (result != ERROR_OK)
                return result;
-       kinfo->sim_fcfg2 = target_buffer_get_u32(bank->target, buf);
        fcfg2_pflsh = (kinfo->sim_fcfg2 >> 23) & 0x01;
 
-       LOG_DEBUG("SDID: %08X FCFG1: %08X FCFG2: %08X", kinfo->sim_sdid,
-                 kinfo->sim_fcfg1, kinfo->sim_fcfg2);
+       LOG_DEBUG("SDID: 0x%08" PRIX32 " FCFG1: 0x%08" PRIX32 " FCFG2: 0x%08" PRIX32, kinfo->sim_sdid,
+                       kinfo->sim_fcfg1, kinfo->sim_fcfg2);
 
        fcfg1_nvmsize = (uint8_t)((kinfo->sim_fcfg1 >> 28) & 0x0f);
        fcfg1_pfsize = (uint8_t)((kinfo->sim_fcfg1 >> 24) & 0x0f);
@@ -544,16 +843,19 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                break;
        }
 
-       LOG_DEBUG("FlexNVM: %d PFlash: %d FlexRAM: %d PFLSH: %d",
+       LOG_DEBUG("FlexNVM: %" PRIu32 " PFlash: %" PRIu32 " FlexRAM: %" PRIu32 " PFLSH: %d",
                  nvm_size, pf_size, ee_size, fcfg2_pflsh);
+       if (kinfo->klxx)
+               num_blocks = 1;
+       else
+               num_blocks = kinetis_flash_params[granularity].num_blocks;
 
-       num_blocks = kinetis_flash_params[granularity].num_blocks;
        num_pflash_blocks = num_blocks / (2 - fcfg2_pflsh);
        first_nvm_bank = num_pflash_blocks;
        num_nvm_blocks = num_blocks - num_pflash_blocks;
 
        LOG_DEBUG("%d blocks total: %d PFlash, %d FlexNVM",
-                 num_blocks, num_pflash_blocks, num_nvm_blocks);
+                       num_blocks, num_pflash_blocks, num_nvm_blocks);
 
        /*
         * If the flash class is already assigned, verify the
@@ -570,8 +872,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                        switch (kinfo->flash_class) {
                        case FC_PFLASH:
                                if (kinfo->bank_ordinal >= first_nvm_bank) {
-                                       LOG_WARNING("Class mismatch, bank %d is not PFlash",
-                                                   bank->bank_number);
+                                       LOG_WARNING("Class mismatch, bank %d is not PFlash", bank->bank_number);
                                        reassign = 1;
                                } else if (bank->size != (pf_size / num_pflash_blocks)) {
                                        LOG_WARNING("PFlash size mismatch");
@@ -581,7 +882,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                                        LOG_WARNING("PFlash address range mismatch");
                                        reassign = 1;
                                } else if (kinfo->sector_size !=
-                                        kinetis_flash_params[granularity].pflash_sector_size_bytes) {
+                                               kinetis_flash_params[granularity].pflash_sector_size_bytes) {
                                        LOG_WARNING("PFlash sector size mismatch");
                                        reassign = 1;
                                } else {
@@ -591,19 +892,18 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                                break;
                        case FC_FLEX_NVM:
                                if ((kinfo->bank_ordinal >= num_blocks) ||
-                                   (kinfo->bank_ordinal < first_nvm_bank)) {
-                                       LOG_WARNING("Class mismatch, bank %d is not FlexNVM",
-                                                   bank->bank_number);
+                                               (kinfo->bank_ordinal < first_nvm_bank)) {
+                                       LOG_WARNING("Class mismatch, bank %d is not FlexNVM", bank->bank_number);
                                        reassign = 1;
                                } else if (bank->size != (nvm_size / num_nvm_blocks)) {
                                        LOG_WARNING("FlexNVM size mismatch");
                                        reassign = 1;
                                } else if (bank->base !=
-                                        (0x10000000 + bank->size * kinfo->bank_ordinal)) {
+                                               (0x10000000 + bank->size * kinfo->bank_ordinal)) {
                                        LOG_WARNING("FlexNVM address range mismatch");
                                        reassign = 1;
                                } else if (kinfo->sector_size !=
-                                        kinetis_flash_params[granularity].nvm_sector_size_bytes) {
+                                               kinetis_flash_params[granularity].nvm_sector_size_bytes) {
                                        LOG_WARNING("FlexNVM sector size mismatch");
                                        reassign = 1;
                                } else {
@@ -613,13 +913,12 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                                break;
                        case FC_FLEX_RAM:
                                if (kinfo->bank_ordinal != num_blocks) {
-                                       LOG_WARNING("Class mismatch, bank %d is not FlexRAM",
-                                                   bank->bank_number);
+                                       LOG_WARNING("Class mismatch, bank %d is not FlexRAM", bank->bank_number);
                                        reassign = 1;
                                } else if (bank->size != ee_size) {
                                        LOG_WARNING("FlexRAM size mismatch");
                                        reassign = 1;
-                               } else if (bank->base != 0x14000000) {
+                               } else if (bank->base != FLEXRAM) {
                                        LOG_WARNING("FlexRAM address mismatch");
                                        reassign = 1;
                                } else if (kinfo->sector_size !=
@@ -627,8 +926,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                                        LOG_WARNING("FlexRAM sector size mismatch");
                                        reassign = 1;
                                } else {
-                                       LOG_DEBUG("FlexRAM bank %d already configured okay",
-                                                 kinfo->bank_ordinal);
+                                       LOG_DEBUG("FlexRAM bank %d already configured okay", kinfo->bank_ordinal);
                                }
                                break;
 
@@ -667,7 +965,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
                return ERROR_FLASH_OPER_UNSUPPORTED;
        } else {
                LOG_ERROR("Cannot determine parameters for bank %d, only %d banks on device",
-                         bank->bank_number, num_blocks);
+                               bank->bank_number, num_blocks);
                return ERROR_FLASH_BANK_INVALID;
        }
 
@@ -738,14 +1036,10 @@ static int kinetis_blank_check(struct flash_bank *bank)
 
        if (kinfo->flash_class == FC_PFLASH) {
                int result;
-               uint32_t w0 = 0, w1 = 0, w2 = 0;
                uint8_t ftfx_fstat;
 
                /* check if whole bank is blank */
-               w0 = (0x00 << 24) | bank->base;
-               w1 = 0; /* "normal margin" */
-
-               result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+               result = kinetis_ftfx_command(bank, FTFx_CMD_BLOCKSTAT, bank->base, 0, 0, 0, 0,  0, 0, 0, 0, &ftfx_fstat);
 
                if (result != ERROR_OK)
                        return result;
@@ -754,10 +1048,9 @@ static int kinetis_blank_check(struct flash_bank *bank)
                        /* the whole bank is not erased, check sector-by-sector */
                        int i;
                        for (i = 0; i < bank->num_sectors; i++) {
-                               w0 = (0x01 << 24) | (bank->base + bank->sectors[i].offset);
-                               w1 = (0x100 << 16) | 0; /* normal margin */
-
-                               result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);
+                               /* normal margin */
+                               result = kinetis_ftfx_command(bank, FTFx_CMD_SECTSTAT, bank->base + bank->sectors[i].offset,
+                                               1, 0, 0, 0,  0, 0, 0, 0, &ftfx_fstat);
 
                                if (result == ERROR_OK) {
                                        bank->sectors[i].is_erased = !(ftfx_fstat & 0x01);
@@ -780,26 +1073,13 @@ static int kinetis_blank_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int kinetis_flash_read(struct flash_bank *bank,
-                             uint8_t *buffer, uint32_t offset, uint32_t count)
-{
-       LOG_WARNING("kinetis_flash_read not supported yet");
-
-       if (bank->target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
-       return ERROR_FLASH_OPERATION_FAILED;
-}
-
 struct flash_driver kinetis_flash = {
        .name = "kinetis",
        .flash_bank_command = kinetis_flash_bank_command,
        .erase = kinetis_erase,
        .protect = kinetis_protect,
        .write = kinetis_write,
-       .read = kinetis_flash_read,
+       .read = default_flash_read,
        .probe = kinetis_probe,
        .auto_probe = kinetis_auto_probe,
        .erase_check = kinetis_blank_check,