arm_adi_v5: mem_ap_write error propagation

[fw/openocd] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 496360f73c844a6985e0032d1aec2ccddd069a60..39d8bde9092efe7174e986faebae926b1e0127cb 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -376,13 +376,14 @@ static int mem_ap_write_buf_packed_u16(struct adiv5_dap *dap,
 
                        if (nbytes < 4)
                        {
-                               if (mem_ap_write_buf_u16(dap, buffer,
-                                               nbytes, address) != ERROR_OK)
+                               retval = mem_ap_write_buf_u16(dap, buffer,
+                                               nbytes, address);
+                               if (retval != ERROR_OK)
                                {
                                        LOG_WARNING("Block write error address "
                                                "0x%" PRIx32 ", count 0x%x",
                                                address, count);
-                                       return ERROR_JTAG_DEVICE_ERROR;
+                                       return retval;
                                }
 
                                address += nbytes >> 1;
@@ -485,12 +486,13 @@ static int mem_ap_write_buf_packed_u8(struct adiv5_dap *dap,
 
                        if (nbytes < 4)
                        {
-                               if (mem_ap_write_buf_u8(dap, buffer, nbytes, address) != ERROR_OK)
+                               retval = mem_ap_write_buf_u8(dap, buffer, nbytes, address);
+                               if (retval != ERROR_OK)
                                {
                                        LOG_WARNING("Block write error address "
                                                "0x%" PRIx32 ", count 0x%x",
                                                address, count);
-                                       return ERROR_JTAG_DEVICE_ERROR;
+                                       return retval;
                                }
 
                                address += nbytes;
@@ -1124,7 +1126,9 @@ static int dap_info_command(struct command_context *cmd_ctx,
                entry_offset = 0;
                do
                {
-                       mem_ap_read_atomic_u32(dap, (dbgbase&0xFFFFF000) | entry_offset, &romentry);
+                       retval = mem_ap_read_atomic_u32(dap, (dbgbase&0xFFFFF000) | entry_offset, &romentry);
+                       if (retval != ERROR_OK)
+                               return retval;
                        command_print(cmd_ctx, "\tROMTABLE[0x%x] = 0x%" PRIx32 "",entry_offset,romentry);
                        if (romentry&0x01)
                        {
@@ -1140,33 +1144,51 @@ static int dap_info_command(struct command_context *cmd_ctx,
                                /* IDs are in last 4K section */
 
 
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFE0, &c_pid0);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_pid0 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFE4, &c_pid1);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_pid1 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFE8, &c_pid2);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_pid2 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFEC, &c_pid3);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_pid3 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFD0, &c_pid4);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_pid4 &= 0xff;
 
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFF0, &c_cid0);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_cid0 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFF4, &c_cid1);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_cid1 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFF8, &c_cid2);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_cid2 &= 0xff;
-                               mem_ap_read_atomic_u32(dap,
+                               retval = mem_ap_read_atomic_u32(dap,
                                        component_base + 0xFFC, &c_cid3);
+                               if (retval != ERROR_OK)
+                                       return retval;
                                c_cid3 &= 0xff;
 
 
@@ -1187,9 +1209,11 @@ static int dap_info_command(struct command_context *cmd_ctx,
                                        unsigned minor;
                                        char *major = "Reserved", *subtype = "Reserved";
 
-                                       mem_ap_read_atomic_u32(dap,
+                                       retval = mem_ap_read_atomic_u32(dap,
                                                        (component_base & 0xfffff000) | 0xfcc,
                                                        &devtype);
+                                       if (retval != ERROR_OK)
+                                               return retval;
                                        minor = (devtype >> 4) & 0x0f;
                                        switch (devtype & 0x0f) {
                                        case 0: