]> git.sur5r.net Git - openocd/blobdiff - src/flash/nor/lpcspifi.c
Remove FSF address from GPL notices
[openocd] / src / flash / nor / lpcspifi.c
index dfd8645e7d9083ef8bf7eeb2b164d77632551ff3..94a8ccf48828fb2265dee7d999406343a6529484 100644 (file)
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #define SSP_PROBE_TIMEOUT (100)
 #define SSP_MAX_TIMEOUT  (3000)
 
+/* Size of the stack to alloc in the working area for the execution of
+ * the ROM spifi_init() function */
+#define SPIFI_INIT_STACK_SIZE  512
+
 struct lpcspifi_flash_bank {
        int probed;
        uint32_t ssp_base;
@@ -51,22 +53,7 @@ struct lpcspifi_flash_bank {
        uint32_t ioconfig_base;
        uint32_t bank_num;
        uint32_t max_spi_clock_mhz;
-       struct flash_device *dev;
-};
-
-struct lpcspifi_target {
-       char *name;
-       uint32_t tap_idcode;
-       uint32_t spifi_base;
-       uint32_t ssp_base;
-       uint32_t io_base;
-       uint32_t ioconfig_base; /* base address for the port word pin registers */
-};
-
-static struct lpcspifi_target target_devices[] = {
-       /* name,          tap_idcode, spifi_base, ssp_base,   io_base,    ioconfig_base */
-       { "LPC43xx/18xx", 0x4ba00477, 0x14000000, 0x40083000, 0x400F4000, 0x40086000 },
-       { NULL,           0,          0,          0,          0,          0 }
+       const struct flash_device *dev;
 };
 
 /* flash_bank lpcspifi <base> <size> <chip_width> <bus_width> <target>
@@ -151,7 +138,7 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
        uint32_t ssp_base = lpcspifi_info->ssp_base;
        struct armv7m_algorithm armv7m_info;
        struct working_area *spifi_init_algorithm;
-       struct reg_param reg_params[1];
+       struct reg_param reg_params[2];
        int retval = ERROR_OK;
 
        LOG_DEBUG("Uninitializing LPC43xx SSP");
@@ -187,19 +174,19 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
 
        LOG_DEBUG("Allocating working area for SPIFI init algorithm");
        /* Get memory for spifi initialization algorithm */
-       retval = target_alloc_working_area(target, sizeof(spifi_init_code),
-               &spifi_init_algorithm);
+       retval = target_alloc_working_area(target, sizeof(spifi_init_code)
+               + SPIFI_INIT_STACK_SIZE, &spifi_init_algorithm);
        if (retval != ERROR_OK) {
                LOG_ERROR("Insufficient working area to initialize SPIFI "\
                        "module. You must allocate at least %zdB of working "\
                        "area in order to use this driver.",
-                       sizeof(spifi_init_code)
+                       sizeof(spifi_init_code) + SPIFI_INIT_STACK_SIZE
                );
 
                return retval;
        }
 
-       LOG_DEBUG("Writing algorithm to working area at 0x%08x",
+       LOG_DEBUG("Writing algorithm to working area at 0x%08" PRIx32,
                spifi_init_algorithm->address);
        /* Write algorithm to working area */
        retval = target_write_buffer(target,
@@ -214,6 +201,8 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
        }
 
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);            /* spifi clk speed */
+       /* the spifi_init() rom API makes use of the stack */
+       init_reg_param(&reg_params[1], "sp", 32, PARAM_OUT);
 
        /* For now, the algorithm will set up the SPIFI module
         * @ the IRC clock speed. In the future, it could be made
@@ -221,10 +210,13 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
         * already configured them in order to speed up memory-
         * mapped reads. */
        buf_set_u32(reg_params[0].value, 0, 32, 12);
+       /* valid stack pointer */
+       buf_set_u32(reg_params[1].value, 0, 32, (spifi_init_algorithm->address +
+               sizeof(spifi_init_code) + SPIFI_INIT_STACK_SIZE) & ~7UL);
 
        /* Run the algorithm */
        LOG_DEBUG("Running SPIFI init algorithm");
-       retval = target_run_algorithm(target, 0 , NULL, 1, reg_params,
+       retval = target_run_algorithm(target, 0 , NULL, 2, reg_params,
                spifi_init_algorithm->address,
                spifi_init_algorithm->address + sizeof(spifi_init_code) - 2,
                1000, &armv7m_info);
@@ -235,6 +227,7 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
        target_free_working_area(target, spifi_init_algorithm);
 
        destroy_reg_param(&reg_params[0]);
+       destroy_reg_param(&reg_params[1]);
 
        return retval;
 }
@@ -581,7 +574,7 @@ static int lpcspifi_protect(struct flash_bank *bank, int set,
        return ERROR_OK;
 }
 
-static int lpcspifi_write(struct flash_bank *bank, uint8_t *buffer,
+static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
        uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -678,7 +671,8 @@ static int lpcspifi_write(struct flash_bank *bank, uint8_t *buffer,
                0x00, 0xf0, 0x02, 0xb8, 0x4f, 0xf0, 0x00, 0x08,
                0x4f, 0xf4, 0x80, 0x4a, 0xc4, 0xf2, 0x0f, 0x0a,
                0xca, 0xf8, 0xab, 0x80, 0x70, 0x47, 0x00, 0x20,
-               0x50, 0x60, 0x30, 0x46, 0x00, 0xbe, 0xff, 0xff
+               0x50, 0x60, 0xff, 0xf7, 0xef, 0xff, 0x30, 0x46,
+               0x00, 0xbe, 0xff, 0xff
        };
 
        if (target_alloc_working_area(target, sizeof(lpcspifi_flash_write_code),
@@ -687,7 +681,7 @@ static int lpcspifi_write(struct flash_bank *bank, uint8_t *buffer,
                        " a working area > %zdB in order to write to SPIFI flash.",
                        sizeof(lpcspifi_flash_write_code));
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-       };
+       }
 
        retval = target_write_buffer(target, write_algorithm->address,
                        sizeof(lpcspifi_flash_write_code),
@@ -715,7 +709,7 @@ static int lpcspifi_write(struct flash_bank *bank, uint8_t *buffer,
                LOG_WARNING("Working area size is limited; flash writes may be"\
                        " slow. Increase working area size to at least %zdB"\
                        " to reduce write times.",
-                       sizeof(lpcspifi_flash_write_code) + page_size
+                       (size_t)(sizeof(lpcspifi_flash_write_code) + page_size)
                );
        else if (fifo_size > 0x2000) /* Beyond this point, we start to get diminishing returns */
                fifo_size = 0x2000;
@@ -723,7 +717,7 @@ static int lpcspifi_write(struct flash_bank *bank, uint8_t *buffer,
        if (target_alloc_working_area(target, fifo_size, &fifo) != ERROR_OK) {
                target_free_working_area(target, write_algorithm);
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-       };
+       }
 
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
        armv7m_info.core_mode = ARM_MODE_THREAD;
@@ -774,6 +768,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id)
        uint32_t ssp_base = lpcspifi_info->ssp_base;
        uint32_t io_base = lpcspifi_info->io_base;
        uint32_t value;
+       uint8_t id_buf[3] = {0, 0, 0};
        int retval;
 
        if (target->state != TARGET_HALTED) {
@@ -808,7 +803,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id)
        if (retval == ERROR_OK)
                retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value);
        if (retval == ERROR_OK)
-               ((uint8_t *)id)[0] = value;
+               id_buf[0] = value;
 
        /* Dummy write to clock in data */
        if (retval == ERROR_OK)
@@ -818,7 +813,7 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id)
        if (retval == ERROR_OK)
                retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value);
        if (retval == ERROR_OK)
-               ((uint8_t *)id)[1] = value;
+               id_buf[1] = value;
 
        /* Dummy write to clock in data */
        if (retval == ERROR_OK)
@@ -828,24 +823,21 @@ static int lpcspifi_read_flash_id(struct flash_bank *bank, uint32_t *id)
        if (retval == ERROR_OK)
                retval = ssp_read_reg(target, ssp_base, SSP_DATA, &value);
        if (retval == ERROR_OK)
-               ((uint8_t *)id)[2] = value;
+               id_buf[2] = value;
 
        if (retval == ERROR_OK)
                retval = ssp_setcs(target, io_base, 1);
+       if (retval == ERROR_OK)
+               *id = id_buf[2] << 16 | id_buf[1] << 8 | id_buf[0];
 
        return retval;
 }
 
 static int lpcspifi_probe(struct flash_bank *bank)
 {
-       struct target *target = bank->target;
        struct lpcspifi_flash_bank *lpcspifi_info = bank->driver_priv;
-       uint32_t ssp_base;
-       uint32_t io_base;
-       uint32_t ioconfig_base;
        struct flash_sector *sectors;
        uint32_t id = 0; /* silence uninitialized warning */
-       struct lpcspifi_target *target_device;
        int retval;
 
        /* If we've already probed, we should be fine to skip this time. */
@@ -853,26 +845,11 @@ static int lpcspifi_probe(struct flash_bank *bank)
                return ERROR_OK;
        lpcspifi_info->probed = 0;
 
-       for (target_device = target_devices ; target_device->name ; ++target_device)
-               if (target_device->tap_idcode == target->tap->idcode)
-                       break;
-       if (!target_device->name) {
-               LOG_ERROR("Device ID 0x%" PRIx32 " is not known as SPIFI capable",
-                               target->tap->idcode);
-               return ERROR_FAIL;
-       }
-
-       ssp_base = target_device->ssp_base;
-       io_base = target_device->io_base;
-       ioconfig_base = target_device->ioconfig_base;
-       lpcspifi_info->ssp_base = ssp_base;
-       lpcspifi_info->io_base = io_base;
-       lpcspifi_info->ioconfig_base = ioconfig_base;
+       lpcspifi_info->ssp_base = 0x40083000;
+       lpcspifi_info->io_base = 0x400F4000;
+       lpcspifi_info->ioconfig_base = 0x40086000;
        lpcspifi_info->bank_num = bank->bank_number;
 
-       LOG_DEBUG("Valid SPIFI on device %s at address 0x%" PRIx32,
-               target_device->name, bank->base);
-
        /* read and decode flash ID; returns in SW mode */
        retval = lpcspifi_read_flash_id(bank, &id);
        if (retval != ERROR_OK)
@@ -883,7 +860,7 @@ static int lpcspifi_probe(struct flash_bank *bank)
                return retval;
 
        lpcspifi_info->dev = NULL;
-       for (struct flash_device *p = flash_devices; p->name ; p++)
+       for (const struct flash_device *p = flash_devices; p->name ; p++)
                if (p->device_id == id) {
                        lpcspifi_info->dev = p;
                        break;
@@ -913,7 +890,7 @@ static int lpcspifi_probe(struct flash_bank *bank)
                sectors[sector].offset = sector * lpcspifi_info->dev->sectorsize;
                sectors[sector].size = lpcspifi_info->dev->sectorsize;
                sectors[sector].is_erased = -1;
-               sectors[sector].is_protected = 1;
+               sectors[sector].is_protected = 0;
        }
 
        bank->sectors = sectors;
@@ -947,7 +924,7 @@ static int get_lpcspifi_info(struct flash_bank *bank, char *buf, int buf_size)
        }
 
        snprintf(buf, buf_size, "\nSPIFI flash information:\n"
-               "  Device \'%s\' (ID 0x%08x)\n",
+               "  Device \'%s\' (ID 0x%08" PRIx32 ")\n",
                lpcspifi_info->dev->name, lpcspifi_info->dev->device_id);
 
        return ERROR_OK;