X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_adi_v5.h;h=675a1736602efe4376d4a8ccb7073366e08cddbb;hb=bc088b302bd0bb43cc9097a9f0b2e7369b0e04e2;hp=99e557570664cb9921a8e787447dcd79230b2145;hpb=a644bc11a56b32b68688ebc65b56f5d166ab2e2d;p=openocd.git diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h index 99e5575706..675a173660 100644 --- a/src/target/arm_adi_v5.h +++ b/src/target/arm_adi_v5.h @@ -23,51 +23,80 @@ #ifndef ARM_ADI_V5_H #define ARM_ADI_V5_H -#include "target.h" -#include "register.h" +/** + * @file + * This defines formats and data structures used to talk to ADIv5 entities. + * Those include a DAP, different types of Debug Port (DP), and memory mapped + * resources accessed through a MEM-AP. + */ + #include "arm_jtag.h" -#define SWJDP_IR_DPACC 0xA -#define SWJDP_IR_APACC 0xB +/* JTAG instructions/registers for JTAG-DP and SWJ-DP */ +#define JTAG_DP_ABORT 0x8 +#define JTAG_DP_DPACC 0xA +#define JTAG_DP_APACC 0xB +#define JTAG_DP_IDCODE 0xE + +/* three-bit ACK values for DPACC and APACC reads */ +#define JTAG_ACK_OK_FAULT 0x2 +#define JTAG_ACK_WAIT 0x1 #define DPAP_WRITE 0 #define DPAP_READ 1 + +/* A[3:0] for DP registers (for JTAG, stored in DPACC) */ #define DP_ZERO 0 #define DP_CTRL_STAT 0x4 #define DP_SELECT 0x8 #define DP_RDBUFF 0xC -#define CORUNDETECT (1<<0) -#define SSTICKYORUN (1<<1) -#define SSTICKYERR (1<<5) -#define CDBGRSTREQ (1<<26) -#define CDBGRSTACK (1<<27) -#define CDBGPWRUPREQ (1<<28) -#define CDBGPWRUPACK (1<<29) -#define CSYSPWRUPREQ (1<<30) -#define CSYSPWRUPACK (1<<31) - -#define AP_REG_CSW 0x00 +/* Fields of the DP's CTRL/STAT register */ +#define CORUNDETECT (1 << 0) +#define SSTICKYORUN (1 << 1) +/* 3:2 - transaction mode (e.g. pushed compare) */ +#define SSTICKYERR (1 << 5) +#define READOK (1 << 6) +#define WDATAERR (1 << 7) +/* 11:8 - mask lanes for pushed compare or verify ops */ +/* 21:12 - transaction counter */ +#define CDBGRSTREQ (1 << 26) +#define CDBGRSTACK (1 << 27) +#define CDBGPWRUPREQ (1 << 28) +#define CDBGPWRUPACK (1 << 29) +#define CSYSPWRUPREQ (1 << 30) +#define CSYSPWRUPACK (1 << 31) + +/* MEM-AP register addresses */ +/* TODO: rename as MEM_AP_REG_* */ +#define AP_REG_CSW 0x00 #define AP_REG_TAR 0x04 #define AP_REG_DRW 0x0C #define AP_REG_BD0 0x10 #define AP_REG_BD1 0x14 #define AP_REG_BD2 0x18 #define AP_REG_BD3 0x1C -#define AP_REG_DBGROMA 0xF8 +#define AP_REG_CFG 0xF4 /* big endian? */ +#define AP_REG_BASE 0xF8 + +/* Generic AP register address */ #define AP_REG_IDR 0xFC +/* Fields of the MEM-AP's CSW register */ #define CSW_8BIT 0 #define CSW_16BIT 1 #define CSW_32BIT 2 - -#define CSW_ADDRINC_MASK (3<<4) +#define CSW_ADDRINC_MASK (3 << 4) #define CSW_ADDRINC_OFF 0 -#define CSW_ADDRINC_SINGLE (1<<4) -#define CSW_ADDRINC_PACKED (2<<4) -#define CSW_HPROT (1<<25) -#define CSW_MASTER_DEBUG (1<<29) -#define CSW_DBGSWENABLE (1<<31) +#define CSW_ADDRINC_SINGLE (1 << 4) +#define CSW_ADDRINC_PACKED (2 << 4) +#define CSW_DEVICE_EN (1 << 6) +#define CSW_TRIN_PROG (1 << 7) +#define CSW_SPIDEN (1 << 23) +/* 30:24 - implementation-defined! */ +#define CSW_HPROT (1 << 25) /* ? */ +#define CSW_MASTER_DEBUG (1 << 29) /* ? */ +#define CSW_DBGSWENABLE (1 << 31) /* transaction mode */ #define TRANS_MODE_NONE 0 @@ -76,69 +105,92 @@ /* Freerunning transactions with delays and overrun checking */ #define TRANS_MODE_COMPOSITE 2 -typedef struct swjdp_reg_s -{ - int addr; - arm_jtag_t *jtag_info; -} swjdp_reg_t; - -typedef struct swjdp_common_s +/** + * This represents an ARM Debug Interface (v5) Debug Access Port (DAP). + * A DAP has two types of component: one Debug Port (DP), which is a + * transport agent; and at least one Access Port (AP), controlling + * resource access. Most common is a MEM-AP, for memory access. + * + * @todo Rename "swjdp_common" as "dap". Use of SWJ-DP is optional! + */ +struct swjdp_common { - arm_jtag_t *jtag_info; + struct arm_jtag *jtag_info; /* Control config */ - u32 dp_ctrl_stat; + uint32_t dp_ctrl_stat; /* Support for several AP's in one DAP */ - u32 apsel; + uint32_t apsel; /* Register select cache */ - u32 dp_select_value; - u32 ap_csw_value; - u32 ap_tar_value; + uint32_t dp_select_value; + uint32_t ap_csw_value; + uint32_t ap_tar_value; /* information about current pending SWjDP-AHBAP transaction */ - u8 trans_mode; - u8 trans_rw; - u8 ack; -} swjdp_common_t; - -/* Internal functions used in the module, partial transactions, use with caution */ -extern int dap_dp_write_reg(swjdp_common_t *swjdp, u32 value, u8 reg_addr); -/* extern int swjdp_write_apacc(swjdp_common_t *swjdp, u32 value, u8 reg_addr); */ -extern int dap_dp_read_reg(swjdp_common_t *swjdp, u32 *value, u8 reg_addr); -/* extern int swjdp_read_apacc(swjdp_common_t *swjdp, u32 *value, u8 reg_addr); */ -extern int dap_setup_accessport(swjdp_common_t *swjdp, u32 csw, u32 tar); -extern int dap_ap_select(swjdp_common_t *swjdp,u8 apsel); - -extern int dap_ap_write_reg(swjdp_common_t *swjdp, u32 reg_addr, u8* out_value_buf); -extern int dap_ap_write_reg_u32(swjdp_common_t *swjdp, u32 reg_addr, u32 value); -extern int dap_ap_read_reg(swjdp_common_t *swjdp, u32 reg_addr, u8 *in_value_buf); -extern int dap_ap_read_reg_u32(swjdp_common_t *swjdp, u32 reg_addr, u32 *value); - -/* External interface, partial operations must be completed with swjdp_transaction_endcheck() */ -extern int swjdp_transaction_endcheck(swjdp_common_t *swjdp); - -/* MEM-AP memory mapped bus single u32 register transfers, without endcheck */ -extern int mem_ap_read_u32(swjdp_common_t *swjdp, u32 address, u32 *value); -extern int mem_ap_write_u32(swjdp_common_t *swjdp, u32 address, u32 value); + uint8_t trans_mode; + uint8_t trans_rw; + uint8_t ack; + /* extra tck clocks for memory bus access */ + uint32_t memaccess_tck; + /* Size of TAR autoincrement block, ARM ADI Specification requires at least 10 bits */ + uint32_t tar_autoincr_block; + +}; + +/* Accessor function for currently selected DAP-AP number */ +static inline uint8_t dap_ap_get_select(struct swjdp_common *swjdp) +{ + return (uint8_t)(swjdp ->apsel >> 24); +} + +/* Queued transactions -- use with care */ +int dap_setup_accessport(struct swjdp_common *swjdp, + uint32_t csw, uint32_t tar); +int dap_ap_select(struct swjdp_common *swjdp,uint8_t apsel); +int dap_ap_write_reg_u32(struct swjdp_common *swjdp, + uint32_t addr, uint32_t value); +int dap_ap_read_reg_u32(struct swjdp_common *swjdp, + uint32_t addr, uint32_t *value); + +/* Queued transactions must be completed with swjdp_transaction_endcheck() */ +int swjdp_transaction_endcheck(struct swjdp_common *swjdp); + +/* MEM-AP memory mapped bus single uint32_t register transfers, without endcheck */ +int mem_ap_read_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t *value); +int mem_ap_write_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t value); /* MEM-AP memory mapped bus transfers, single registers, complete transactions */ -extern int mem_ap_read_atomic_u32(swjdp_common_t *swjdp, u32 address, u32 *value); -extern int mem_ap_write_atomic_u32(swjdp_common_t *swjdp, u32 address, u32 value); +int mem_ap_read_atomic_u32(struct swjdp_common *swjdp, + uint32_t address, uint32_t *value); +int mem_ap_write_atomic_u32(struct swjdp_common *swjdp, + uint32_t address, uint32_t value); /* MEM-AP memory mapped bus block transfers */ -extern int mem_ap_read_buf_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_read_buf_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_read_buf_u32(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u32(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); +int mem_ap_read_buf_u8(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); +int mem_ap_read_buf_u16(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); +int mem_ap_read_buf_u32(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); + +int mem_ap_write_buf_u8(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); +int mem_ap_write_buf_u16(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); +int mem_ap_write_buf_u32(struct swjdp_common *swjdp, + uint8_t *buffer, int count, uint32_t address); /* Initialisation of the debug system, power domains and registers */ -extern int ahbap_debugport_init(swjdp_common_t *swjdp); +int ahbap_debugport_init(struct swjdp_common *swjdp); + -extern int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, int apsel); /* Commands for user dap access */ -/* Currently implemented in armv7m, needs armv7m target structure to find jtag and swjdp structures */ -extern int handle_dap_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -extern int handle_dap_apsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -extern int handle_dap_apid_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -extern int handle_dap_baseaddr_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int dap_info_command(struct command_context *cmd_ctx, + struct swjdp_common *swjdp, int apsel); + +#define DAP_COMMAND_HANDLER(name) \ + COMMAND_HELPER(name, struct swjdp_common *swjdp) +DAP_COMMAND_HANDLER(dap_baseaddr_command); +DAP_COMMAND_HANDLER(dap_memaccess_command); +DAP_COMMAND_HANDLER(dap_apsel_command); +DAP_COMMAND_HANDLER(dap_apid_command); + #endif