Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Subject: ADIv5: fix more diagnostics
[openocd.git] / src / target / arm_adi_v5.c
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index ba5db3b13c23bd1faca14cfd2c350524c51a6737..bfa5cb4259de7fe431c02e961ade35973fb6d25c 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -8,6 +8,8 @@
  *   Copyright (C) 2009 by Oyvind Harboe                                   *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
+ *   Copyright (C) 2009-2010 by David Brownell                             *
+ *                                                                         *
  *   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     *
@@ -220,7 +222,7 @@ static int scan_inout_check(struct swjdp_common *swjdp,
         */
        if ((instr == JTAG_DP_APACC)
                        && (swjdp->trans_mode == TRANS_MODE_ATOMIC))
-               return swjdp_transaction_endcheck(swjdp);
+               return jtagdp_transaction_endcheck(swjdp);
 
        return ERROR_OK;
 }
@@ -244,12 +246,12 @@ static int scan_inout_check_u32(struct swjdp_common *swjdp,
         */
        if ((instr == JTAG_DP_APACC)
                        && (swjdp->trans_mode == TRANS_MODE_ATOMIC))
-               return swjdp_transaction_endcheck(swjdp);
+               return jtagdp_transaction_endcheck(swjdp);
 
        return ERROR_OK;
 }
 
-int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
+int jtagdp_transaction_endcheck(struct swjdp_common *swjdp)
 {
        int retval;
        uint32_t ctrlstat;
@@ -305,7 +307,7 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
                        }
                        else
                        {
-                               LOG_WARNING("Invalid ACK %#x"
+                               LOG_WARNING("Invalid ACK %#x "
                                                "in JTAG-DP transaction",
                                                swjdp->ack);
                                return ERROR_JTAG_DEVICE_ERROR;
@@ -319,24 +321,34 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
                }
        }
 
+       /* REVISIT also STICKYCMP, for pushed comparisons (nyet used) */
+
        /* Check for STICKYERR and STICKYORUN */
        if (ctrlstat & (SSTICKYORUN | SSTICKYERR))
        {
-               LOG_DEBUG("swjdp: CTRL/STAT error 0x%" PRIx32 "", ctrlstat);
+               LOG_DEBUG("jtag-dp: CTRL/STAT error, 0x%" PRIx32, ctrlstat);
                /* Check power to debug regions */
                if ((ctrlstat & 0xf0000000) != 0xf0000000)
-               {
                         ahbap_debugport_init(swjdp);
-               }
                else
                {
                        uint32_t mem_ap_csw, mem_ap_tar;
 
-                       /* Print information about last AHBAP access */
-                       LOG_ERROR("AHBAP Cached values: dp_select 0x%" PRIx32 ", ap_csw 0x%" PRIx32 ", ap_tar 0x%" PRIx32 "", swjdp->dp_select_value, swjdp->ap_csw_value, swjdp->ap_tar_value);
+                       /* Maybe print information about last MEM-AP access */
+                       if (swjdp->ap_tar_value != (uint32_t) -1)
+                               LOG_DEBUG("MEM-AP Cached values: "
+                                       "ap_bank 0x%" PRIx32
+                                       ", ap_csw 0x%" PRIx32
+                                       ", ap_tar 0x%" PRIx32,
+                                       swjdp->dp_select_value,
+                                       swjdp->ap_csw_value,
+                                       swjdp->ap_tar_value);
+                       else
+                               LOG_ERROR("Invalid MEM-AP TAR cache!");
+
                        if (ctrlstat & SSTICKYORUN)
-                               LOG_ERROR("JTAG-DP OVERRUN - "
-                                       "check clock or reduce jtag speed");
+                               LOG_ERROR("JTAG-DP OVERRUN - check clock, "
+                                       "memaccess, or reduce jtag speed");
 
                        if (ctrlstat & SSTICKYERR)
                                LOG_ERROR("JTAG-DP STICKY ERROR");
@@ -351,13 +363,14 @@ int swjdp_transaction_endcheck(struct swjdp_common *swjdp)
                        if ((retval = jtag_execute_queue()) != ERROR_OK)
                                return retval;
 
-                       LOG_DEBUG("swjdp: status 0x%" PRIx32 "", ctrlstat);
+                       LOG_DEBUG("jtag-dp: CTRL/STAT 0x%" PRIx32, ctrlstat);
 
                        dap_ap_read_reg_u32(swjdp, AP_REG_CSW, &mem_ap_csw);
                        dap_ap_read_reg_u32(swjdp, AP_REG_TAR, &mem_ap_tar);
                        if ((retval = jtag_execute_queue()) != ERROR_OK)
                                return retval;
-                       LOG_ERROR("Read MEM_AP_CSW 0x%" PRIx32 ", MEM_AP_TAR 0x%" PRIx32 "", mem_ap_csw, mem_ap_tar);
+                       LOG_ERROR("MEM_AP_CSW 0x%" PRIx32 ", MEM_AP_TAR 0x%"
+                                       PRIx32, mem_ap_csw, mem_ap_tar);
 
                }
                if ((retval = jtag_execute_queue()) != ERROR_OK)
@@ -461,13 +474,13 @@ int dap_setup_accessport(struct swjdp_common *swjdp, uint32_t csw, uint32_t tar)
        csw = csw | CSW_DBGSWENABLE | CSW_MASTER_DEBUG | CSW_HPROT;
        if (csw != swjdp->ap_csw_value)
        {
-               /* LOG_DEBUG("swjdp : Set CSW %x",csw); */
+               /* LOG_DEBUG("DAP: Set CSW %x",csw); */
                dap_ap_write_reg_u32(swjdp, AP_REG_CSW, csw);
                swjdp->ap_csw_value = csw;
        }
        if (tar != swjdp->ap_tar_value)
        {
-               /* LOG_DEBUG("swjdp : Set TAR %x",tar); */
+               /* LOG_DEBUG("DAP: Set TAR %x",tar); */
                dap_ap_write_reg_u32(swjdp, AP_REG_TAR, tar);
                swjdp->ap_tar_value = tar;
        }
@@ -501,7 +514,7 @@ int mem_ap_read_atomic_u32(struct swjdp_common *swjdp, uint32_t address, uint32_
 {
        mem_ap_read_u32(swjdp, address, value);
 
-       return swjdp_transaction_endcheck(swjdp);
+       return jtagdp_transaction_endcheck(swjdp);
 }
 
 /*****************************************************************************
@@ -525,7 +538,7 @@ int mem_ap_write_atomic_u32(struct swjdp_common *swjdp, uint32_t address, uint32
 {
        mem_ap_write_u32(swjdp, address, value);
 
-       return swjdp_transaction_endcheck(swjdp);
+       return jtagdp_transaction_endcheck(swjdp);
 }
 
 /*****************************************************************************
@@ -583,7 +596,7 @@ int mem_ap_write_buf_u32(struct swjdp_common *swjdp, uint8_t *buffer, int count,
                        dap_ap_write_reg(swjdp, AP_REG_DRW, buffer + 4 * writecount);
                }
 
-               if (swjdp_transaction_endcheck(swjdp) == ERROR_OK)
+               if (jtagdp_transaction_endcheck(swjdp) == ERROR_OK)
                {
                        wcount = wcount - blocksize;
                        address = address + 4 * blocksize;
@@ -637,9 +650,12 @@ static int mem_ap_write_buf_packed_u16(struct swjdp_common *swjdp,
 
                        if (nbytes < 4)
                        {
-                               if (mem_ap_write_buf_u16(swjdp, buffer, nbytes, address) != ERROR_OK)
+                               if (mem_ap_write_buf_u16(swjdp, buffer,
+                                               nbytes, address) != ERROR_OK)
                                {
-                                       LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+                                       LOG_WARNING("Block write error address "
+                                               "0x%" PRIx32 ", count 0x%x",
+                                               address, count);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
 
@@ -659,9 +675,11 @@ static int mem_ap_write_buf_packed_u16(struct swjdp_common *swjdp,
 
                                memcpy(&outvalue, buffer, sizeof(uint32_t));
                                dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
-                               if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
+                               if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
                                {
-                                       LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+                                       LOG_WARNING("Block write error address "
+                                               "0x%" PRIx32 ", count 0x%x",
+                                               address, count);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
                        }
@@ -692,7 +710,7 @@ int mem_ap_write_buf_u16(struct swjdp_common *swjdp, uint8_t *buffer, int count,
                memcpy(&svalue, buffer, sizeof(uint16_t));
                uint32_t outvalue = (uint32_t)svalue << 8 * (address & 0x3);
                dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
-               retval = swjdp_transaction_endcheck(swjdp);
+               retval = jtagdp_transaction_endcheck(swjdp);
                count -= 2;
                address += 2;
                buffer += 2;
@@ -732,7 +750,9 @@ static int mem_ap_write_buf_packed_u8(struct swjdp_common *swjdp,
                        {
                                if (mem_ap_write_buf_u8(swjdp, buffer, nbytes, address) != ERROR_OK)
                                {
-                                       LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+                                       LOG_WARNING("Block write error address "
+                                               "0x%" PRIx32 ", count 0x%x",
+                                               address, count);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
 
@@ -752,9 +772,11 @@ static int mem_ap_write_buf_packed_u8(struct swjdp_common *swjdp,
 
                                memcpy(&outvalue, buffer, sizeof(uint32_t));
                                dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
-                               if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
+                               if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
                                {
-                                       LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
+                                       LOG_WARNING("Block write error address "
+                                               "0x%" PRIx32 ", count 0x%x",
+                                               address, count);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
                        }
@@ -783,7 +805,7 @@ int mem_ap_write_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count,
                dap_setup_accessport(swjdp, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
                uint32_t outvalue = (uint32_t)*buffer << 8 * (address & 0x3);
                dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
-               retval = swjdp_transaction_endcheck(swjdp);
+               retval = jtagdp_transaction_endcheck(swjdp);
                count--;
                address++;
                buffer++;
@@ -843,7 +865,7 @@ int mem_ap_read_buf_u32(struct swjdp_common *swjdp, uint8_t *buffer, int count,
                adi_jtag_dp_scan(swjdp, JTAG_DP_DPACC, DP_RDBUFF,
                                DPAP_READ, 0, buffer + 4 * readcount,
                                &swjdp->ack);
-               if (swjdp_transaction_endcheck(swjdp) == ERROR_OK)
+               if (jtagdp_transaction_endcheck(swjdp) == ERROR_OK)
                {
                        wcount = wcount - blocksize;
                        address += 4 * blocksize;
@@ -912,7 +934,7 @@ static int mem_ap_read_buf_packed_u16(struct swjdp_common *swjdp,
                do
                {
                        dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
-                       if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
+                       if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
                        {
                                LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
                                return ERROR_JTAG_DEVICE_ERROR;
@@ -949,7 +971,7 @@ int mem_ap_read_buf_u16(struct swjdp_common *swjdp, uint8_t *buffer, int count,
        {
                dap_setup_accessport(swjdp, CSW_16BIT | CSW_ADDRINC_SINGLE, address);
                dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
-               retval = swjdp_transaction_endcheck(swjdp);
+               retval = jtagdp_transaction_endcheck(swjdp);
                if (address & 0x1)
                {
                        for (i = 0; i < 2; i++)
@@ -1005,7 +1027,7 @@ static int mem_ap_read_buf_packed_u8(struct swjdp_common *swjdp,
                do
                {
                        dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
-                       if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
+                       if (jtagdp_transaction_endcheck(swjdp) != ERROR_OK)
                        {
                                LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
                                return ERROR_JTAG_DEVICE_ERROR;
@@ -1042,7 +1064,7 @@ int mem_ap_read_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count, u
        {
                dap_setup_accessport(swjdp, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
                dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
-               retval = swjdp_transaction_endcheck(swjdp);
+               retval = jtagdp_transaction_endcheck(swjdp);
                *((uint8_t*)buffer) = (invalue >> 8 * (address & 0x3));
                count--;
                address++;
@@ -1058,6 +1080,7 @@ int mem_ap_read_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count, u
  * @todo Rename this.  We also need an initialization scheme which account
  * for SWD transports not just JTAG; that will need to address differences
  * in layering.  (JTAG is useful without any debug target; but not SWD.)
+ * And this may not even use an AHB-AP ... e.g. DAP-Lite uses an APB-AP.
  */
 int ahbap_debugport_init(struct swjdp_common *swjdp)
 {
@@ -1094,7 +1117,7 @@ int ahbap_debugport_init(struct swjdp_common *swjdp)
        /* Check that we have debug power domains activated */
        while (!(ctrlstat & CDBGPWRUPACK) && (cnt++ < 10))
        {
-               LOG_DEBUG("swjdp: wait CDBGPWRUPACK");
+               LOG_DEBUG("DAP: wait CDBGPWRUPACK");
                dap_dp_read_reg(swjdp, &ctrlstat, DP_CTRL_STAT);
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                        return retval;
@@ -1103,7 +1126,7 @@ int ahbap_debugport_init(struct swjdp_common *swjdp)
 
        while (!(ctrlstat & CSYSPWRUPACK) && (cnt++ < 10))
        {
-               LOG_DEBUG("swjdp: wait CSYSPWRUPACK");
+               LOG_DEBUG("DAP: wait CSYSPWRUPACK");
                dap_dp_read_reg(swjdp, &ctrlstat, DP_CTRL_STAT);
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                        return retval;
@@ -1125,7 +1148,9 @@ int ahbap_debugport_init(struct swjdp_common *swjdp)
        dap_ap_read_reg_u32(swjdp, AP_REG_IDR, &idreg);
        dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &romaddr);
 
-       LOG_DEBUG("AHB-AP ID Register 0x%" PRIx32 ", Debug ROM Address 0x%" PRIx32 "", idreg, romaddr);
+       LOG_DEBUG("MEM-AP #%d ID Register 0x%" PRIx32
+               ", Debug ROM Address 0x%" PRIx32,
+               swjdp->apsel, idreg, romaddr);
 
        return ERROR_OK;
 }
@@ -1148,7 +1173,8 @@ is_dap_cid_ok(uint32_t cid3, uint32_t cid2, uint32_t cid1, uint32_t cid0)
                        && ((cid1 & 0x0f) == 0) && cid0 == 0x0d;
 }
 
-int dap_info_command(struct command_context *cmd_ctx, struct swjdp_common *swjdp, int apsel)
+int dap_info_command(struct command_context *cmd_ctx,
+               struct swjdp_common *swjdp, int apsel)
 {
 
        uint32_t dbgbase, apid;
@@ -1156,11 +1182,15 @@ int dap_info_command(struct command_context *cmd_ctx, struct swjdp_common *swjdp
        uint8_t mem_ap;
        uint32_t apselold;
 
+       /* AP address is in bits 31:24 of DP_SELECT */
+       if (apsel >= 256)
+               return ERROR_INVALID_ARGUMENTS;
+
        apselold = swjdp->apsel;
        dap_ap_select(swjdp, apsel);
        dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &dbgbase);
        dap_ap_read_reg_u32(swjdp, AP_REG_IDR, &apid);
-       swjdp_transaction_endcheck(swjdp);
+       jtagdp_transaction_endcheck(swjdp);
        /* Now we read ROM table ID registers, ref. ARM IHI 0029B sec  */
        mem_ap = ((apid&0x10000) && ((apid&0x0F) != 0));
        command_print(cmd_ctx, "AP ID register 0x%8.8" PRIx32, apid);
@@ -1212,7 +1242,7 @@ int dap_info_command(struct command_context *cmd_ctx, struct swjdp_common *swjdp
                mem_ap_read_u32(swjdp, (dbgbase&0xFFFFF000) | 0xFF8, &cid2);
                mem_ap_read_u32(swjdp, (dbgbase&0xFFFFF000) | 0xFFC, &cid3);
                mem_ap_read_u32(swjdp, (dbgbase&0xFFFFF000) | 0xFCC, &memtype);
-               swjdp_transaction_endcheck(swjdp);
+               jtagdp_transaction_endcheck(swjdp);
                if (!is_dap_cid_ok(cid3, cid2, cid1, cid0))
                        command_print(cmd_ctx, "\tCID3 0x%2.2" PRIx32
                                        ", CID2 0x%2.2" PRIx32
@@ -1508,6 +1538,9 @@ DAP_COMMAND_HANDLER(dap_baseaddr_command)
                break;
        case 1:
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
+               /* AP address is in bits 31:24 of DP_SELECT */
+               if (apsel >= 256)
+                       return ERROR_INVALID_ARGUMENTS;
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1516,8 +1549,13 @@ DAP_COMMAND_HANDLER(dap_baseaddr_command)
        if (apselsave != apsel)
                dap_ap_select(swjdp, apsel);
 
+       /* NOTE:  assumes we're talking to a MEM-AP, which
+        * has a base address.  There are other kinds of AP,
+        * though they're not common for now.  This should
+        * use the ID register to verify it's a MEM-AP.
+        */
        dap_ap_read_reg_u32(swjdp, AP_REG_BASE, &baseaddr);
-       retval = swjdp_transaction_endcheck(swjdp);
+       retval = jtagdp_transaction_endcheck(swjdp);
        command_print(CMD_CTX, "0x%8.8" PRIx32, baseaddr);
 
        if (apselsave != apsel)
@@ -1559,6 +1597,9 @@ DAP_COMMAND_HANDLER(dap_apsel_command)
                break;
        case 1:
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
+               /* AP address is in bits 31:24 of DP_SELECT */
+               if (apsel >= 256)
+                       return ERROR_INVALID_ARGUMENTS;
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1566,7 +1607,7 @@ DAP_COMMAND_HANDLER(dap_apsel_command)
 
        dap_ap_select(swjdp, apsel);
        dap_ap_read_reg_u32(swjdp, AP_REG_IDR, &apid);
-       retval = swjdp_transaction_endcheck(swjdp);
+       retval = jtagdp_transaction_endcheck(swjdp);
        command_print(CMD_CTX, "ap %" PRIi32 " selected, identification register 0x%8.8" PRIx32,
                        apsel, apid);
 
@@ -1585,6 +1626,9 @@ DAP_COMMAND_HANDLER(dap_apid_command)
                break;
        case 1:
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
+               /* AP address is in bits 31:24 of DP_SELECT */
+               if (apsel >= 256)
+                       return ERROR_INVALID_ARGUMENTS;
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1594,7 +1638,7 @@ DAP_COMMAND_HANDLER(dap_apid_command)
                dap_ap_select(swjdp, apsel);
 
        dap_ap_read_reg_u32(swjdp, AP_REG_IDR, &apid);
-       retval = swjdp_transaction_endcheck(swjdp);
+       retval = jtagdp_transaction_endcheck(swjdp);
        command_print(CMD_CTX, "0x%8.8" PRIx32, apid);
        if (apselsave != apsel)
                dap_ap_select(swjdp, apselsave);
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)