jtag newtap change & huge manual update
[openocd.git] / src / target / mips_m4k.c
index 03995b5e6cb50fd2c4d9e4e29e1fe7a6c0e55e7d..e1fd8dc8138579f1fb00abeb050576698b495568 100644 (file)
@@ -25,6 +25,7 @@
 
 #include "mips32.h"
 #include "mips_m4k.h"
+#include "mips32_dmaacc.h"
 #include "jtag.h"
 #include "log.h"
 
@@ -89,28 +90,56 @@ target_type_t mips_m4k_target =
        .quit = mips_m4k_quit
 };
 
+int mips_m4k_examine_debug_reason(target_t *target)
+{      
+       int break_status;
+       int retval;
+       
+       if ((target->debug_reason != DBG_REASON_DBGRQ)
+               && (target->debug_reason != DBG_REASON_SINGLESTEP))
+       {
+               /* get info about inst breakpoint support */
+               if ((retval = target_read_u32(target, EJTAG_IBS, &break_status)) != ERROR_OK)
+                       return retval;
+               if (break_status & 0x1f)
+               {
+                       /* we have halted on a  breakpoint */
+                       if ((retval = target_write_u32(target, EJTAG_IBS, 0)) != ERROR_OK)
+                               return retval;
+                       target->debug_reason = DBG_REASON_BREAKPOINT;
+               }
+               
+               /* get info about data breakpoint support */
+               if ((retval = target_read_u32(target, 0xFF302000, &break_status)) != ERROR_OK)
+                       return retval;
+               if (break_status & 0x1f)
+               {
+                       /* we have halted on a  breakpoint */
+                       if ((retval = target_write_u32(target, 0xFF302000, 0)) != ERROR_OK)
+                               return retval;
+                       target->debug_reason = DBG_REASON_WATCHPOINT;
+               }
+       }
+       
+       return ERROR_OK;
+}
+
 int mips_m4k_debug_entry(target_t *target)
 {
-       u32 debug_reg;
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       u32 debug_reg;
        
        /* read debug register */
        mips_ejtag_read_debug(ejtag_info, &debug_reg);
        
-       if ((target->debug_reason != DBG_REASON_DBGRQ)
-               && (target->debug_reason != DBG_REASON_SINGLESTEP))
-       {
-//             if (cortex_m3->nvic_dfsr & DFSR_BKPT)
-//             {
-//                     target->debug_reason = DBG_REASON_BREAKPOINT;
-//                     if (cortex_m3->nvic_dfsr & DFSR_DWTTRAP)
-//                             target->debug_reason = DBG_REASON_WPTANDBKPT;
-//             }
-//             else if (cortex_m3->nvic_dfsr & DFSR_DWTTRAP)
-//                     target->debug_reason = DBG_REASON_WATCHPOINT;
-       }
+       /* make sure break uit configured */
+       mips32_configure_break_unit(target);
        
+       /* attempt to find halt reason */
+       mips_m4k_examine_debug_reason(target);
+       
+       /* clear single step if active */
        if (debug_reg & EJTAG_DEBUG_DSS)
        {
                /* stopped due to single step - clear step bit */
@@ -131,13 +160,29 @@ int mips_m4k_poll(target_t *target)
        int retval;
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       u32 ejtag_ctrl = ejtag_info->ejtag_ctrl;
        
        /* read ejtag control reg */
        jtag_add_end_state(TAP_RTI);
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-       mips_ejtag_drscan_32(ejtag_info, &ejtag_info->ejtag_ctrl);
+       mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+       
+       /* clear this bit before handling polling
+        * as after reset registers will read zero */
+       if (ejtag_ctrl & EJTAG_CTRL_ROCC)
+       {
+               /* we have detected a reset, clear flag
+                * otherwise ejtag will not work */
+               jtag_add_end_state(TAP_RTI);
+               ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC;
+               
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+               mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
+               LOG_DEBUG("Reset Detected");
+       }
        
-       if (ejtag_info->ejtag_ctrl & EJTAG_CTRL_BRKST)
+       /* check for processor halted */
+       if (ejtag_ctrl & EJTAG_CTRL_BRKST)
        {
                if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
                {
@@ -166,19 +211,7 @@ int mips_m4k_poll(target_t *target)
                target->state = TARGET_RUNNING;
        }
        
-       if (ejtag_info->ejtag_ctrl & EJTAG_CTRL_ROCC)
-       {
-               /* we have detected a reset, clear flag
-                * otherwise ejtag will not work */
-               jtag_add_end_state(TAP_RTI);
-               ejtag_info->ejtag_ctrl &= ~EJTAG_CTRL_ROCC;
-               
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-               mips_ejtag_drscan_32(ejtag_info, &ejtag_info->ejtag_ctrl);
-               LOG_DEBUG("Reset Detected");
-       }
-       
-//     LOG_DEBUG("ctrl=0x%08X", ejtag_info->ejtag_ctrl);
+//     LOG_DEBUG("ctrl=0x%08X", ejtag_ctrl);
        
        return ERROR_OK;
 }
@@ -232,9 +265,10 @@ int mips_m4k_assert_reset(target_t *target)
 {
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       mips_m4k_common_t *mips_m4k = mips32->arch_info;
        
        LOG_DEBUG("target->state: %s", 
-                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+               Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        if (!(jtag_reset_config & RESET_HAS_SRST))
        {
@@ -254,14 +288,24 @@ int mips_m4k_assert_reset(target_t *target)
                mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
        }
        
-       /* here we should issue a srst only, but we may have to assert trst as well */
-       if (jtag_reset_config & RESET_SRST_PULLS_TRST)
+       if (strcmp(mips_m4k->variant, "ejtag_srst") == 0)
        {
-               jtag_add_reset(1, 1);
+               u32 ejtag_ctrl = ejtag_info->ejtag_ctrl | EJTAG_CTRL_PRRST | EJTAG_CTRL_PERRST;
+               LOG_DEBUG("Using EJTAG reset (PRRST) to reset processor...");
+               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+               mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        }
        else
        {
-               jtag_add_reset(0, 1);
+               /* here we should issue a srst only, but we may have to assert trst as well */
+               if (jtag_reset_config & RESET_SRST_PULLS_TRST)
+               {
+                       jtag_add_reset(1, 1);
+               }
+               else
+               {
+                       jtag_add_reset(0, 1);
+               }
        }
        
        target->state = TARGET_RESET;
@@ -269,13 +313,12 @@ int mips_m4k_assert_reset(target_t *target)
 
        mips32_invalidate_core_regs(target);
 
-    if (target->reset_halt)
-    {
-       int retval;
+       if (target->reset_halt)
+       {
+               int retval;
                if ((retval = target_halt(target))!=ERROR_OK)
                        return retval;
-    }
-       
+       }
        
        return ERROR_OK;
 }
@@ -283,7 +326,7 @@ int mips_m4k_assert_reset(target_t *target)
 int mips_m4k_deassert_reset(target_t *target)
 {
        LOG_DEBUG("target->state: %s", 
-                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+               Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        /* deassert reset lines */
        jtag_add_reset(0, 0);
@@ -297,6 +340,22 @@ int mips_m4k_soft_reset_halt(struct target_s *target)
        return ERROR_OK;
 }
 
+int mips_m4k_single_step_core(target_t *target)
+{
+       mips32_common_t *mips32 = target->arch_info;
+       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       
+       /* configure single step mode */
+       mips_ejtag_config_step(ejtag_info, 1);
+       
+       /* exit debug mode */
+       mips_ejtag_exit_debug(ejtag_info, 1);
+       
+       mips_m4k_debug_entry(target);
+       
+       return ERROR_OK;
+}
+
 int mips_m4k_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
 {
        mips32_common_t *mips32 = target->arch_info;
@@ -318,7 +377,7 @@ int mips_m4k_resume(struct target_s *target, int current, u32 address, int handl
        }
        
        /* current = 1: continue on current pc, otherwise continue at <address> */
-       if (!current) 
+       if (!current)
        {
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32, address);
                mips32->core_cache->reg_list[MIPS32_PC].dirty = 1;
@@ -337,13 +396,14 @@ int mips_m4k_resume(struct target_s *target, int current, u32 address, int handl
                {
                        LOG_DEBUG("unset breakpoint at 0x%8.8x", breakpoint->address);
                        mips_m4k_unset_breakpoint(target, breakpoint);
-                       //mips_m4k_single_step_core(target);
+                       mips_m4k_single_step_core(target);
                        mips_m4k_set_breakpoint(target, breakpoint);
                }
        }
        
        /* exit debug mode - enable interrupts if required */
        mips_ejtag_exit_debug(ejtag_info, !debug_execution);
+       target->debug_reason = DBG_REASON_NOTHALTED;
        
        /* registers are now invalid */
        mips32_invalidate_core_regs(target);
@@ -428,25 +488,114 @@ void mips_m4k_enable_breakpoints(struct target_s *target)
 
 int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-       /* TODO */
+       mips32_common_t *mips32 = target->arch_info;
+       mips32_comparator_t * comparator_list = mips32->inst_break_list;
+       
+       if (breakpoint->set)
+       {
+               LOG_WARNING("breakpoint already set");
+               return ERROR_OK;
+       }
+       
+       if (breakpoint->type == BKPT_HARD)
+       {
+               int bp_num = 0;
+               
+               while(comparator_list[bp_num].used && (bp_num < mips32->num_inst_bpoints))
+                       bp_num++;
+               if (bp_num >= mips32->num_inst_bpoints)
+               {
+                       LOG_DEBUG("ERROR Can not find free FP Comparator");
+                       LOG_WARNING("ERROR Can not find free FP Comparator");
+                       exit(-1);
+               }
+               breakpoint->set = bp_num + 1;
+               comparator_list[bp_num].used = 1;
+               comparator_list[bp_num].bp_value = breakpoint->address;
+               target_write_u32(target, comparator_list[bp_num].reg_address, comparator_list[bp_num].bp_value);
+               target_write_u32(target, comparator_list[bp_num].reg_address + 0x08, 0x00000000);
+               target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 1);
+               LOG_DEBUG("bp_num %i bp_value 0x%x", bp_num, comparator_list[bp_num].bp_value);
+       }
+       else if (breakpoint->type == BKPT_SOFT)
+       {
+
+       }
+       
        return ERROR_OK;
 }
 
 int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-       /* TODO */
+       /* get pointers to arch-specific information */
+       mips32_common_t *mips32 = target->arch_info;
+       mips32_comparator_t * comparator_list = mips32->inst_break_list;
+
+       if (!breakpoint->set)
+       {
+               LOG_WARNING("breakpoint not set");
+               return ERROR_OK;
+       }
+       
+       if (breakpoint->type == BKPT_HARD)
+       {
+               int bp_num = breakpoint->set - 1;
+               if ((bp_num < 0) || (bp_num >= mips32->num_inst_bpoints))
+               {
+                       LOG_DEBUG("Invalid FP Comparator number in breakpoint");
+                       return ERROR_OK;
+               }
+               comparator_list[bp_num].used = 0;
+               comparator_list[bp_num].bp_value = 0;
+               target_write_u32(target, comparator_list[bp_num].reg_address + 0x18, 0);
+       }
+       else
+       {
+
+       }
+       breakpoint->set = 0;
+       
        return ERROR_OK;
 }
 
 int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-       /* TODO */
+       mips32_common_t *mips32 = target->arch_info;
+       
+       if (mips32->num_inst_bpoints_avail < 1)
+       {
+               LOG_INFO("no hardware breakpoint available");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
+       
+       /* default to hardware for now */
+       breakpoint->type = BKPT_HARD;
+       
+       mips32->num_inst_bpoints_avail--;
+       mips_m4k_set_breakpoint(target, breakpoint);
+       
        return ERROR_OK;
 }
 
 int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-       /* TODO */
+       /* get pointers to arch-specific information */
+       mips32_common_t *mips32 = target->arch_info;
+       
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+       
+       if (breakpoint->set)
+       {
+               mips_m4k_unset_breakpoint(target, breakpoint);
+       }
+       
+       if (breakpoint->type == BKPT_HARD)
+               mips32->num_inst_bpoints_avail++;
+       
        return ERROR_OK;
 }
 
@@ -513,7 +662,7 @@ int mips_m4k_read_memory(struct target_s *target, u32 address, u32 size, u32 cou
                case 2:
                case 1:
                        /* if noDMA off, use DMAACC mode for memory read */
-                       if(ejtag_info->impcode & (1<<14))
+                       if(ejtag_info->impcode & EJTAG_IMP_NODMA)
                                return mips32_pracc_read_mem(ejtag_info, address, size, count, (void *)buffer);
                        else
                                return mips32_dmaacc_read_mem(ejtag_info, address, size, count, (void *)buffer);
@@ -552,7 +701,7 @@ int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32 co
                case 2:
                case 1:
                        /* if noDMA off, use DMAACC mode for memory write */
-                       if(ejtag_info->impcode & (1<<14))
+                       if(ejtag_info->impcode & EJTAG_IMP_NODMA)
                                mips32_pracc_write_mem(ejtag_info, address, size, count, (void *)buffer);
                        else
                                mips32_dmaacc_write_mem(ejtag_info, address, size, count, (void *)buffer);
@@ -586,7 +735,7 @@ int mips_m4k_quit(void)
        return ERROR_OK;
 }
 
-int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int chain_pos, const char *variant)
+int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, jtag_tap_t *tap, const char *variant)
 {
        mips32_common_t *mips32 = &mips_m4k->mips32_common;
        
@@ -602,9 +751,9 @@ int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int c
        mips_m4k->common_magic = MIPSM4K_COMMON_MAGIC;
        
        /* initialize mips4k specific info */
-       mips32_init_arch_info(target, mips32, chain_pos, variant);
+       mips32_init_arch_info(target, mips32, tap, variant);
        mips32->arch_info = mips_m4k;
-               
+       
        return ERROR_OK;
 }
 
@@ -612,7 +761,7 @@ int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp)
 {
        mips_m4k_common_t *mips_m4k = calloc(1,sizeof(mips_m4k_common_t));
        
-       mips_m4k_init_arch_info(target, mips_m4k, target->chain_position, target->variant);
+       mips_m4k_init_arch_info(target, mips_m4k, target->tap, target->variant);
        
        return ERROR_OK;
 }
@@ -624,22 +773,26 @@ int mips_m4k_examine(struct target_s *target)
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
        u32 idcode = 0;
        
-       target->type->examined = 1;
-       
-       mips_ejtag_get_idcode(ejtag_info, &idcode, NULL);
-       
-       if (((idcode >> 1) & 0x7FF) == 0x29)
+       if (!target->type->examined)
        {
-               /* we are using a pic32mx so select ejtag port
-                * as it is not selected by default */
-               mips_ejtag_set_instr(ejtag_info, 0x05, NULL);
-               LOG_DEBUG("PIC32MX Detected - using EJTAG Interface");
+               mips_ejtag_get_idcode(ejtag_info, &idcode, NULL);
+               
+               if (((idcode >> 1) & 0x7FF) == 0x29)
+               {
+                       /* we are using a pic32mx so select ejtag port
+                        * as it is not selected by default */
+                       mips_ejtag_set_instr(ejtag_info, 0x05, NULL);
+                       LOG_DEBUG("PIC32MX Detected - using EJTAG Interface");
+               }
        }
        
        /* init rest of ejtag interface */
        if ((retval = mips_ejtag_init(ejtag_info)) != ERROR_OK)
                return retval;
        
+       if ((retval = mips32_examine(target)) != ERROR_OK)
+               return retval;
+       
        return ERROR_OK;
 }
 

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)