zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix authentication for multi-core targets. 

When authdata_write sets the authenticated bit, examine() every OpenOCD
target that is connected to the DM that we were authenticated to.

Change-Id: I542a1e141e2bd23d085e507069a6767e66a196cd
sba_tests
Tim Newsome 2018-02-27 14:22:06 -08:00
parent 10108b623d
commit 39716b15ab
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/target/riscv/riscv-013.c
View File

@ -141,8 +141,15 @@ typedef struct {
int abs_chain_position; int abs_chain_position;
/* Indicates we already reset this DM, so don't need to do it again. */ /* Indicates we already reset this DM, so don't need to do it again. */
bool was_reset; bool was_reset;
/* Targets that are connected to this DM. */
struct list_head target_list;
} dm013_info_t; } dm013_info_t;
typedef struct {
struct list_head list;
struct target *target;
} target_list_t;
typedef struct { typedef struct {
/* Number of address bits in the dbus register. */ /* Number of address bits in the dbus register. */
unsigned abits; unsigned abits;
@ -198,6 +205,7 @@ typedef struct {
/* The width of the hartsel field. */ /* The width of the hartsel field. */
unsigned hartsellen; unsigned hartsellen;
/* DM that provides access to this target. */
dm013_info_t *dm; dm013_info_t *dm;
} riscv013_info_t; } riscv013_info_t;
@ -223,17 +231,31 @@ static dm013_info_t *get_dm(struct target *target)
int abs_chain_position = target->tap->abs_chain_position; int abs_chain_position = target->tap->abs_chain_position;
dm013_info_t *entry; dm013_info_t *entry;
dm013_info_t *dm = NULL;
list_for_each_entry(entry, &dm_list, list) { list_for_each_entry(entry, &dm_list, list) {
if (entry->abs_chain_position == abs_chain_position) { if (entry->abs_chain_position == abs_chain_position) {
info->dm = entry; dm = entry;
return entry; break;
} }
} }
dm013_info_t *dm = calloc(1, sizeof(dm013_info_t)); if (!dm) {
dm = calloc(1, sizeof(dm013_info_t));
dm->abs_chain_position = abs_chain_position; dm->abs_chain_position = abs_chain_position;
INIT_LIST_HEAD(&dm->target_list);
list_add(&dm->list, &dm_list); list_add(&dm->list, &dm_list);
}
info->dm = dm; info->dm = dm;
target_list_t *target_entry;
list_for_each_entry(target_entry, &dm->target_list, list) {
if (target_entry->target == target) {
return dm;
}
}
target_entry = calloc(1, sizeof(*target_entry));
target_entry->target = target;
list_add(&target_entry->list, &dm->target_list);
return dm; return dm;
} }
@ -1404,7 +1426,14 @@ int riscv013_authdata_write(struct target *target, uint32_t value)
if (!get_field(before, DMI_DMSTATUS_AUTHENTICATED) && if (!get_field(before, DMI_DMSTATUS_AUTHENTICATED) &&
get_field(after, DMI_DMSTATUS_AUTHENTICATED)) { get_field(after, DMI_DMSTATUS_AUTHENTICATED)) {
LOG_INFO("authdata_write resulted in successful authentication"); LOG_INFO("authdata_write resulted in successful authentication");
return examine(target); int result = ERROR_OK;
dm013_info_t *dm = get_dm(target);
target_list_t *entry;
list_for_each_entry(entry, &dm->target_list, list) {
if (examine(entry->target) != ERROR_OK)
result = ERROR_FAIL;
}
return result;
} }
return ERROR_OK; return ERROR_OK;