Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor: improved API of flash_driver.info & fixed buffer overruns
[openocd.git] / src / flash / nor / avrf.c
diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index ecc09046ca3f488883805a62a7df6627f95ca611..46621e99f100dfb61ae5b6921f9006a8fa6b1a4b 100644 (file)
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -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
@@ -60,7 +58,7 @@ struct avrf_type {
 
 struct avrf_flash_bank {
        int ppage_size;
-       int probed;
+       bool probed;
 };
 
 static const struct avrf_type avft_chips_info[] = {
@@ -68,7 +66,10 @@ static const struct avrf_type avft_chips_info[] = {
  *                     eeprom_page_size, eeprom_page_num
  */
        {"atmega128", 0x9702, 256, 512, 8, 512},
+       {"atmega128rfa1", 0xa701, 128, 512, 8, 512},
+       {"atmega256rfr2", 0xa802, 256, 1024, 8, 1024},
        {"at90can128", 0x9781, 256, 512, 8, 512},
+       {"at90usb128", 0x9782, 256, 512, 8, 512},
        {"atmega164p", 0x940a, 128, 128, 4, 128},
        {"atmega324p", 0x9508, 128, 256, 4, 256},
        {"atmega324pa", 0x9511, 128, 256, 4, 256},
@@ -142,16 +143,24 @@ static int avr_jtagprg_chiperase(struct avr_common *avr)
 }
 
 static int avr_jtagprg_writeflashpage(struct avr_common *avr,
+       const bool ext_addressing,
        const uint8_t *page_buf,
        uint32_t buf_size,
        uint32_t addr,
        uint32_t page_size)
 {
-       uint32_t i, poll_value;
+       uint32_t poll_value;
 
        avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS);
        avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2310, AVR_JTAG_REG_ProgrammingCommand_Len);
 
+       /* load extended high byte */
+       if (ext_addressing)
+               avr_jtag_senddat(avr->jtag_info.tap,
+                       NULL,
+                       0x0b00 | ((addr >> 17) & 0xFF),
+                       AVR_JTAG_REG_ProgrammingCommand_Len);
+
        /* load addr high byte */
        avr_jtag_senddat(avr->jtag_info.tap,
                NULL,
@@ -166,7 +175,7 @@ static int avr_jtagprg_writeflashpage(struct avr_common *avr,
 
        avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_PAGELOAD);
 
-       for (i = 0; i < page_size; i++) {
+       for (uint32_t i = 0; i < page_size; i++) {
                if (i < buf_size)
                        avr_jtag_senddat(avr->jtag_info.tap, NULL, page_buf[i], 8);
                else
@@ -204,12 +213,13 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
        avrf_info = malloc(sizeof(struct avrf_flash_bank));
        bank->driver_priv = avrf_info;
 
-       avrf_info->probed = 0;
+       avrf_info->probed = false;
 
        return ERROR_OK;
 }
 
-static int avrf_erase(struct flash_bank *bank, int first, int last)
+static int avrf_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
@@ -233,17 +243,12 @@ static int avrf_erase(struct flash_bank *bank, int first, int last)
        return avr_jtagprg_leaveprogmode(avr);
 }
 
-static int avrf_protect(struct flash_bank *bank, int set, int first, int last)
-{
-       LOG_INFO("%s", __func__);
-       return ERROR_OK;
-}
-
 static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
        uint32_t cur_size, cur_buffer_size, page_size;
+       bool ext_addressing;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -259,11 +264,16 @@ static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
        }
 
        LOG_DEBUG("offset is 0x%08" PRIx32 "", offset);
-       LOG_DEBUG("count is %" PRId32 "", count);
+       LOG_DEBUG("count is %" PRIu32 "", count);
 
        if (ERROR_OK != avr_jtagprg_enterprogmode(avr))
                return ERROR_FAIL;
 
+       if (bank->size > 0x20000)
+               ext_addressing = true;
+       else
+               ext_addressing = false;
+
        cur_size = 0;
        while (count > 0) {
                if (count > page_size)
@@ -271,6 +281,7 @@ static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
                else
                        cur_buffer_size = count;
                avr_jtagprg_writeflashpage(avr,
+                       ext_addressing,
                        buffer + cur_size,
                        cur_buffer_size,
                        offset + cur_size,
@@ -294,7 +305,6 @@ static int avrf_probe(struct flash_bank *bank)
        struct avrf_flash_bank *avrf_info = bank->driver_priv;
        struct avr_common *avr = target->arch_info;
        const struct avrf_type *avr_info = NULL;
-       int i;
        uint32_t device_id;
 
        if (bank->target->state != TARGET_HALTED) {
@@ -302,7 +312,7 @@ static int avrf_probe(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       avrf_info->probed = 0;
+       avrf_info->probed = false;
 
        avr_jtag_read_jtagid(avr, &device_id);
        if (ERROR_OK != mcu_execute_queue())
@@ -314,7 +324,7 @@ static int avrf_probe(struct flash_bank *bank)
                        EXTRACT_MFG(device_id),
                        0x1F);
 
-       for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(avft_chips_info); i++) {
                if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) {
                        avr_info = &avft_chips_info[i];
                        LOG_INFO("target device is %s", avr_info->name);
@@ -323,10 +333,7 @@ static int avrf_probe(struct flash_bank *bank)
        }
 
        if (avr_info != NULL) {
-               if (bank->sectors) {
-                       free(bank->sectors);
-                       bank->sectors = NULL;
-               }
+               free(bank->sectors);
 
                /* chip found */
                bank->base = 0x00000000;
@@ -334,20 +341,20 @@ static int avrf_probe(struct flash_bank *bank)
                bank->num_sectors = avr_info->flash_page_num;
                bank->sectors = malloc(sizeof(struct flash_sector) * avr_info->flash_page_num);
 
-               for (i = 0; i < avr_info->flash_page_num; i++) {
+               for (int i = 0; i < avr_info->flash_page_num; i++) {
                        bank->sectors[i].offset = i * avr_info->flash_page_size;
                        bank->sectors[i].size = avr_info->flash_page_size;
                        bank->sectors[i].is_erased = -1;
-                       bank->sectors[i].is_protected = 1;
+                       bank->sectors[i].is_protected = -1;
                }
 
-               avrf_info->probed = 1;
+               avrf_info->probed = true;
                return ERROR_OK;
        } else {
                /* chip not supported */
                LOG_ERROR("0x%" PRIx32 " is not support for avr", EXTRACT_PART(device_id));
 
-               avrf_info->probed = 1;
+               avrf_info->probed = true;
                return ERROR_FAIL;
        }
 }
@@ -360,18 +367,11 @@ static int avrf_auto_probe(struct flash_bank *bank)
        return avrf_probe(bank);
 }
 
-static int avrf_protect_check(struct flash_bank *bank)
-{
-       LOG_INFO("%s", __func__);
-       return ERROR_OK;
-}
-
-static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
+static int avrf_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
        const struct avrf_type *avr_info = NULL;
-       int i;
        uint32_t device_id;
 
        if (bank->target->state != TARGET_HALTED) {
@@ -389,7 +389,7 @@ static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
                        EXTRACT_MFG(device_id),
                        0x1F);
 
-       for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(avft_chips_info); i++) {
                if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) {
                        avr_info = &avft_chips_info[i];
                        LOG_INFO("target device is %s", avr_info->name);
@@ -400,12 +400,12 @@ static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
 
        if (avr_info != NULL) {
                /* chip found */
-               snprintf(buf, buf_size, "%s - Rev: 0x%" PRIx32 "", avr_info->name,
+               command_print_sameline(cmd, "%s - Rev: 0x%" PRIx32 "", avr_info->name,
                        EXTRACT_VER(device_id));
                return ERROR_OK;
        } else {
                /* chip not supported */
-               snprintf(buf, buf_size, "Cannot identify target as a avr\n");
+               command_print_sameline(cmd, "Cannot identify target as a avr\n");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 }
@@ -430,8 +430,6 @@ static int avrf_mass_erase(struct flash_bank *bank)
 
 COMMAND_HANDLER(avrf_handle_mass_erase_command)
 {
-       int i;
-
        if (CMD_ARGC < 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
@@ -442,12 +440,12 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 
        if (avrf_mass_erase(bank) == ERROR_OK) {
                /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
+               for (unsigned int i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_erased = 1;
 
-               command_print(CMD_CTX, "avr mass erase complete");
+               command_print(CMD, "avr mass erase complete");
        } else
-               command_print(CMD_CTX, "avr mass erase failed");
+               command_print(CMD, "avr mass erase failed");
 
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
@@ -474,17 +472,16 @@ static const struct command_registration avrf_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver avr_flash = {
+const struct flash_driver avr_flash = {
        .name = "avr",
        .commands = avrf_command_handlers,
        .flash_bank_command = avrf_flash_bank_command,
        .erase = avrf_erase,
-       .protect = avrf_protect,
        .write = avrf_write,
        .read = default_flash_read,
        .probe = avrf_probe,
        .auto_probe = avrf_auto_probe,
        .erase_check = default_flash_blank_check,
-       .protect_check = avrf_protect_check,
        .info = avrf_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };
Open On-Chip Debugger

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)