target/xtensa: avoid IHI for writes to non-executable memory
[openocd.git] / src / flash / nor / at91sam4l.c
index 0a605d5d77647e6a49f2885717fd4a6d7c20ea22..ddf42a8c5f417f5522b959b108a2782511a435db 100644 (file)
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2013 by Andrey Yurovsky                                 *
  *   Andrey Yurovsky <yurovsky@gmail.com>                                  *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -22,6 +11,7 @@
 
 #include "imp.h"
 
+#include <jtag/jtag.h>
 #include <target/cortex_m.h>
 
 /* At this time, the SAM4L Flash is available in these capacities:
@@ -125,14 +115,12 @@ struct sam4l_info {
        uint32_t page_size;
        int num_pages;
        int sector_size;
-       int pages_per_sector;
+       unsigned int pages_per_sector;
 
        bool probed;
        struct target *target;
-       struct sam4l_info *next;
 };
 
-static struct sam4l_info *sam4l_chips;
 
 static int sam4l_flash_wait_until_ready(struct target *target)
 {
@@ -204,37 +192,26 @@ static int sam4l_flash_command(struct target *target, uint8_t cmd, int page)
 
 FLASH_BANK_COMMAND_HANDLER(sam4l_flash_bank_command)
 {
-       struct sam4l_info *chip = sam4l_chips;
-
-       while (chip) {
-               if (chip->target == bank->target)
-                       break;
-               chip = chip->next;
-       }
-
-       if (!chip) {
-               /* Create a new chip */
-               chip = calloc(1, sizeof(*chip));
-               if (!chip)
-                       return ERROR_FAIL;
-
-               chip->target = bank->target;
-               chip->probed = false;
-
-               bank->driver_priv = chip;
-
-               /* Insert it into the chips list (at head) */
-               chip->next = sam4l_chips;
-               sam4l_chips = chip;
-       }
-
        if (bank->base != SAM4L_FLASH) {
-               LOG_ERROR("Address 0x%08" PRIx32 " invalid bank address (try 0x%08" PRIx32
+               LOG_ERROR("Address " TARGET_ADDR_FMT
+                               " invalid bank address (try 0x%08" PRIx32
                                "[at91sam4l series] )",
                                bank->base, SAM4L_FLASH);
                return ERROR_FAIL;
        }
 
+       struct sam4l_info *chip;
+       chip = calloc(1, sizeof(*chip));
+       if (!chip) {
+               LOG_ERROR("No memory for flash bank chip info");
+               return ERROR_FAIL;
+       }
+
+       chip->target = bank->target;
+       chip->probed = false;
+
+       bank->driver_priv = chip;
+
        return ERROR_OK;
 }
 
@@ -348,7 +325,7 @@ static int sam4l_probe(struct flash_bank *bank)
 
        /* Fill out the sector information: all SAM4L sectors are the same size and
         * there is always a fixed number of them. */
-       for (int i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                bank->sectors[i].size = chip->sector_size;
                bank->sectors[i].offset = i * chip->sector_size;
                /* mark as unknown */
@@ -359,7 +336,7 @@ static int sam4l_probe(struct flash_bank *bank)
        /* Done */
        chip->probed = true;
 
-       LOG_INFO("SAM4L MCU: %s (Rev %c) (%" PRIu32 "KB Flash with %d %" PRId32 "B pages, %" PRIu32 "KB RAM)",
+       LOG_INFO("SAM4L MCU: %s (Rev %c) (%" PRIu32 "KB Flash with %d %" PRIu32 "B pages, %" PRIu32 "KB RAM)",
                        chip->details ? chip->details->name : "unknown", (char)('A' + (id & 0xF)),
                        chip->flash_kb, chip->num_pages, chip->page_size, chip->ram_kb);
 
@@ -388,15 +365,16 @@ static int sam4l_protect_check(struct flash_bank *bank)
                return res;
 
        st >>= 16; /* There are 16 lock region bits in the upper half word */
-       for (int i = 0; i < bank->num_sectors; i++)
-                       bank->sectors[i].is_protected = !!(st & (1<<i));
+       for (unsigned int i = 0; i < bank->num_sectors; i++)
+               bank->sectors[i].is_protected = !!(st & (1<<i));
 
        return ERROR_OK;
 }
 
-static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
+static int sam4l_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
-       struct sam4l_info *chip = sam4l_chips;
+       struct sam4l_info *chip = (struct sam4l_info *)bank->driver_priv;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -411,7 +389,7 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
 
        /* Make sure the pages make sense. */
        if (first >= bank->num_sectors || last >= bank->num_sectors) {
-               LOG_ERROR("Protect range %d - %d not valid (%d sectors total)", first, last,
+               LOG_ERROR("Protect range %u - %u not valid (%u sectors total)", first, last,
                                bank->num_sectors);
                return ERROR_FAIL;
        }
@@ -419,7 +397,7 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
        /* Try to lock or unlock each sector in the range.      This is done by locking
         * a region containing one page in that sector, we arbitrarily choose the 0th
         * page in the sector. */
-       for (int i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                int res;
 
                res = sam4l_flash_command(bank->target,
@@ -433,7 +411,8 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
        return ERROR_OK;
 }
 
-static int sam4l_erase(struct flash_bank *bank, int first, int last)
+static int sam4l_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        int ret;
        struct sam4l_info *chip = (struct sam4l_info *)bank->driver_priv;
@@ -451,7 +430,7 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
 
        /* Make sure the pages make sense. */
        if (first >= bank->num_sectors || last >= bank->num_sectors) {
-               LOG_ERROR("Erase range %d - %d not valid (%d sectors total)", first, last,
+               LOG_ERROR("Erase range %u - %u not valid (%u sectors total)", first, last,
                                bank->num_sectors);
                return ERROR_FAIL;
        }
@@ -466,19 +445,19 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
                        return ret;
                }
        } else {
-               LOG_DEBUG("Erasing sectors %d through %d...\n", first, last);
+               LOG_DEBUG("Erasing sectors %u through %u...\n", first, last);
 
                /* For each sector... */
-               for (int i = first; i <= last; i++) {
+               for (unsigned int i = first; i <= last; i++) {
                        /* For each page in that sector... */
-                       for (int j = 0; j < chip->pages_per_sector; j++) {
-                               int pn = i * chip->pages_per_sector + j;
+                       for (unsigned int j = 0; j < chip->pages_per_sector; j++) {
+                               unsigned int pn = i * chip->pages_per_sector + j;
                                bool is_erased = false;
 
                                /* Issue the page erase */
                                ret = sam4l_flash_command(bank->target, SAM4L_FCMD_EP, pn);
                                if (ret != ERROR_OK) {
-                                       LOG_ERROR("Erasing page %d failed", pn);
+                                       LOG_ERROR("Erasing page %u failed", pn);
                                        return ret;
                                }
 
@@ -487,13 +466,10 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
                                        return ret;
 
                                if (!is_erased) {
-                                       LOG_DEBUG("Page %d was not erased.", pn);
+                                       LOG_DEBUG("Page %u was not erased.", pn);
                                        return ERROR_FAIL;
                                }
                        }
-
-                       /* This sector is definitely erased. */
-                       bank->sectors[i].is_erased = 1;
                }
        }
 
@@ -614,6 +590,7 @@ static int sam4l_write(struct flash_bank *bank, const uint8_t *buffer,
 
        /* There's at least one aligned page to write out. */
        if (count >= chip->page_size) {
+               assert(chip->page_size > 0);
                int np = count / chip->page_size + ((count % chip->page_size) ? 1 : 0);
 
                for (int i = 0; i < np; i++) {
@@ -681,7 +658,8 @@ static const struct command_registration at91sam4l_exec_command_handlers[] = {
                .name = "smap_reset_deassert",
                .handler = sam4l_handle_reset_deassert,
                .mode = COMMAND_EXEC,
-               .help = "deasert internal reset held by SMAP"
+               .help = "deassert internal reset held by SMAP",
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -697,7 +675,7 @@ static const struct command_registration at91sam4l_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver at91sam4l_flash = {
+const struct flash_driver at91sam4l_flash = {
        .name = "at91sam4l",
        .commands = at91sam4l_command_handlers,
        .flash_bank_command = sam4l_flash_bank_command,
@@ -709,4 +687,5 @@ struct flash_driver at91sam4l_flash = {
        .auto_probe = sam4l_probe,
        .erase_check = default_flash_blank_check,
        .protect_check = sam4l_protect_check,
+       .free_driver_priv = default_flash_free_driver_priv,
 };

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)