]> git.sur5r.net Git - openocd/commitdiff
cortex_a9: check if MMU is enabled on APB read/write memory
authorLuca Ellero <lroluk@gmail.com>
Sat, 12 Feb 2011 11:54:39 +0000 (11:54 +0000)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 14 Feb 2011 14:29:25 +0000 (15:29 +0100)
Signed-off-by: Luca Ellero <lroluk@gmail.com>
src/target/cortex_a9.c

index 3ad7a7d3dcabd43dfe4c0c7c9f0f5ceecf0eebdb..422da3f7da0687b1810369adcb01853c2a7d9b71 100644 (file)
@@ -1521,6 +1521,7 @@ static int cortex_a9_read_phys_memory(struct target *target,
                        uint32_t saved_r0, saved_r1;
                        int nbytes = count * size;
                        uint32_t data;
+                       int enabled = 0;
 
                        if (target->state != TARGET_HALTED)
                        {
@@ -1528,6 +1529,16 @@ static int cortex_a9_read_phys_memory(struct target *target,
                                return ERROR_TARGET_NOT_HALTED;
                        }
 
+                       retval = cortex_a9_mmu(target, &enabled);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       if (enabled)
+                       {
+                               LOG_WARNING("Reading physical memory through APB with MMU enabled is not yet implemented");
+                               return ERROR_TARGET_FAILURE;
+                       }
+
                        /* save registers r0 and r1, we are going to corrupt them  */
                        retval = cortex_a9_dap_read_coreregister_u32(target, &saved_r0, 0);
                        if (retval != ERROR_OK)
@@ -1635,6 +1646,7 @@ static int cortex_a9_write_phys_memory(struct target *target,
                        uint32_t saved_r0, saved_r1;
                        int nbytes = count * size;
                        uint32_t data;
+                       int enabled = 0;
 
                        if (target->state != TARGET_HALTED)
                        {
@@ -1642,6 +1654,16 @@ static int cortex_a9_write_phys_memory(struct target *target,
                                return ERROR_TARGET_NOT_HALTED;
                        }
 
+                       retval = cortex_a9_mmu(target, &enabled);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       if (enabled)
+                       {
+                               LOG_WARNING("Writing physical memory through APB with MMU enabled is not yet implemented");
+                               return ERROR_TARGET_FAILURE;
+                       }
+
                        /* save registers r0 and r1, we are going to corrupt them  */
                        retval = cortex_a9_dap_read_coreregister_u32(target, &saved_r0, 0);
                        if (retval != ERROR_OK)