mips32: add new functions mips32_configure_ibs and _dbs
[fw/openocd] / src / target / mips32.c
index 5682e3f6c69541ae0818143105b2d0ad37285fe4..16988b5a212d6b61399338bcc3b261c0e052bb1f 100644 (file)
@@ -23,7 +23,7 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -300,6 +300,9 @@ int mips32_init_arch_info(struct target *target, struct mips32_common *mips32, s
        mips32->read_core_reg = mips32_read_core_reg;
        mips32->write_core_reg = mips32_write_core_reg;
 
+       mips32->ejtag_info.scan_delay = 2000000;        /* Initial default value */
+       mips32->ejtag_info.mode = 0;                    /* Initial default value */
+
        return ERROR_OK;
 }
 
@@ -466,13 +469,62 @@ int mips32_examine(struct target *target)
        return ERROR_OK;
 }
 
+static int mips32_configure_ibs(struct target *target)
+{
+       struct mips32_common *mips32 = target_to_mips32(target);
+       int retval, i;
+       uint32_t bpinfo;
+
+       /* get number of inst breakpoints */
+       retval = target_read_u32(target, EJTAG_IBS, &bpinfo);
+       if (retval != ERROR_OK)
+               return retval;
+
+       mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
+       mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;
+       mips32->inst_break_list = calloc(mips32->num_inst_bpoints,
+               sizeof(struct mips32_comparator));
+
+       for (i = 0; i < mips32->num_inst_bpoints; i++)
+               mips32->inst_break_list[i].reg_address =
+                       EJTAG_IBA1 + (0x100 * i);
+
+       /* clear IBIS reg */
+       retval = target_write_u32(target, EJTAG_IBS, 0);
+       return retval;
+}
+
+static int mips32_configure_dbs(struct target *target)
+{
+       struct mips32_common *mips32 = target_to_mips32(target);
+       int retval, i;
+       uint32_t bpinfo;
+
+       /* get number of data breakpoints */
+       retval = target_read_u32(target, EJTAG_DBS, &bpinfo);
+       if (retval != ERROR_OK)
+               return retval;
+
+       mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
+       mips32->num_data_bpoints_avail = mips32->num_data_bpoints;
+       mips32->data_break_list = calloc(mips32->num_data_bpoints,
+               sizeof(struct mips32_comparator));
+
+       for (i = 0; i < mips32->num_data_bpoints; i++)
+               mips32->data_break_list[i].reg_address =
+                       EJTAG_DBA1 + (0x100 * i);
+
+       /* clear DBIS reg */
+       retval = target_write_u32(target, EJTAG_DBS, 0);
+       return retval;
+}
+
 int mips32_configure_break_unit(struct target *target)
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
        int retval;
-       uint32_t dcr, bpinfo;
-       int i;
+       uint32_t dcr;
 
        if (mips32->bp_scanned)
                return ERROR_OK;
@@ -483,37 +535,13 @@ int mips32_configure_break_unit(struct target *target)
                return retval;
 
        if (dcr & EJTAG_DCR_IB) {
-               /* get number of inst breakpoints */
-               retval = target_read_u32(target, EJTAG_IBS, &bpinfo);
-               if (retval != ERROR_OK)
-                       return retval;
-
-               mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
-               mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;
-               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(struct mips32_comparator));
-               for (i = 0; i < mips32->num_inst_bpoints; i++)
-                       mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i);
-
-               /* clear IBIS reg */
-               retval = target_write_u32(target, EJTAG_IBS, 0);
+               retval = mips32_configure_ibs(target);
                if (retval != ERROR_OK)
                        return retval;
        }
 
        if (dcr & EJTAG_DCR_DB) {
-               /* get number of data breakpoints */
-               retval = target_read_u32(target, EJTAG_DBS, &bpinfo);
-               if (retval != ERROR_OK)
-                       return retval;
-
-               mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
-               mips32->num_data_bpoints_avail = mips32->num_data_bpoints;
-               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(struct mips32_comparator));
-               for (i = 0; i < mips32->num_data_bpoints; i++)
-                       mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i);
-
-               /* clear DBIS reg */
-               retval = target_write_u32(target, EJTAG_DBS, 0);
+               retval = mips32_configure_dbs(target);
                if (retval != ERROR_OK)
                        return retval;
        }
@@ -631,7 +659,7 @@ int mips32_checksum_memory(struct target *target, uint32_t address,
                destroy_reg_param(&reg_params[0]);
                destroy_reg_param(&reg_params[1]);
                target_free_working_area(target, crc_algorithm);
-               return 0;
+               return retval;
        }
 
        *checksum = buf_get_u32(reg_params[0].value, 0, 32);
@@ -688,14 +716,14 @@ int mips32_blank_check_memory(struct target *target,
 
        retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
                        erase_check_algorithm->address,
-                       erase_check_algorithm->address + (sizeof(erase_check_code)-2),
+                       erase_check_algorithm->address + (sizeof(erase_check_code)-4),
                        10000, &mips32_info);
        if (retval != ERROR_OK) {
                destroy_reg_param(&reg_params[0]);
                destroy_reg_param(&reg_params[1]);
                destroy_reg_param(&reg_params[2]);
                target_free_working_area(target, erase_check_algorithm);
-               return 0;
+               return retval;
        }
 
        *blank = buf_get_u32(reg_params[2].value, 0, 32);
@@ -758,12 +786,9 @@ COMMAND_HANDLER(mips32_handle_cp0_command)
                                                cp0_reg);
                                return ERROR_OK;
                        }
-                       retval = jtag_execute_queue();
-                       if (retval != ERROR_OK)
-                               return retval;
-
                        command_print(CMD_CTX, "cp0 reg %" PRIi32 ", select %" PRIi32 ": %8.8" PRIx32,
                                        cp0_reg, cp0_sel, value);
+
                } else if (CMD_ARGC == 3) {
                        uint32_t value;
                        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], value);
@@ -782,6 +807,29 @@ COMMAND_HANDLER(mips32_handle_cp0_command)
        return ERROR_OK;
 }
 
+COMMAND_HANDLER(mips32_handle_scan_delay_command)
+{
+       struct target *target = get_current_target(CMD_CTX);
+       struct mips32_common *mips32 = target_to_mips32(target);
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
+
+       if (CMD_ARGC == 1)
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], ejtag_info->scan_delay);
+       else if (CMD_ARGC > 1)
+                       return ERROR_COMMAND_SYNTAX_ERROR;
+
+       command_print(CMD_CTX, "scan delay: %d nsec", ejtag_info->scan_delay);
+       if (ejtag_info->scan_delay >= 2000000) {
+               ejtag_info->mode = 0;
+               command_print(CMD_CTX, "running in legacy mode");
+       } else {
+               ejtag_info->mode = 1;
+               command_print(CMD_CTX, "running in fast queued mode");
+       }
+
+       return ERROR_OK;
+}
+
 static const struct command_registration mips32_exec_command_handlers[] = {
        {
                .name = "cp0",
@@ -789,6 +837,13 @@ static const struct command_registration mips32_exec_command_handlers[] = {
                .mode = COMMAND_EXEC,
                .usage = "regnum select [value]",
                .help = "display/modify cp0 register",
+       },
+               {
+               .name = "scan_delay",
+               .handler = mips32_handle_scan_delay_command,
+               .mode = COMMAND_ANY,
+               .help = "display/set scan delay in nano seconds",
+               .usage = "[value]",
        },
        COMMAND_REGISTRATION_DONE
 };