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

Fix address translation when high bits are set. (#453) 

Fixes #452.
Also check that the high bits match the MSB of the virtual address.

Change-Id: Ib1d3d04db9ad9327ef71ea3736d5cf5d3b65b9c4
regcache
Tim Newsome 2020-03-05 11:33:51 -08:00 committed by GitHub
parent 1449af5bdb
commit 1ae21b3874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/target/riscv/riscv.c
View File

@ -276,6 +276,8 @@ static enum {
} resume_order; } resume_order;
virt2phys_info_t sv32 = { virt2phys_info_t sv32 = {
.name = "Sv32",
.va_bits = 32,
.level = 2, .level = 2,
.pte_shift = 2, .pte_shift = 2,
.vpn_shift = {12, 22}, .vpn_shift = {12, 22},
@ -287,6 +289,8 @@ virt2phys_info_t sv32 = {
}; };
virt2phys_info_t sv39 = { virt2phys_info_t sv39 = {
.name = "Sv39",
.va_bits = 39,
.level = 3, .level = 3,
.pte_shift = 3, .pte_shift = 3,
.vpn_shift = {12, 21, 30}, .vpn_shift = {12, 21, 30},
@ -298,6 +302,8 @@ virt2phys_info_t sv39 = {
}; };
virt2phys_info_t sv48 = { virt2phys_info_t sv48 = {
.name = "Sv48",
.va_bits = 48,
.level = 4, .level = 4,
.pte_shift = 3, .pte_shift = 3,
.vpn_shift = {12, 21, 30, 39}, .vpn_shift = {12, 21, 30, 39},
@ -1412,18 +1418,16 @@ static int riscv_address_translate(struct target *target,
if (result != ERROR_OK) if (result != ERROR_OK)
return result; return result;
mode = get_field(satp_value, RISCV_SATP_MODE(riscv_xlen(target))); unsigned xlen = riscv_xlen(target);
mode = get_field(satp_value, RISCV_SATP_MODE(xlen));
switch (mode) { switch (mode) {
case SATP_MODE_SV32: case SATP_MODE_SV32:
LOG_DEBUG("Translation mode: SV32");
info = &sv32; info = &sv32;
break; break;
case SATP_MODE_SV39: case SATP_MODE_SV39:
LOG_DEBUG("Translation mode: SV39");
info = &sv39; info = &sv39;
break; break;
case SATP_MODE_SV48: case SATP_MODE_SV48:
LOG_DEBUG("Translation mode: SV48");
info = &sv48; info = &sv48;
break; break;
case SATP_MODE_OFF: case SATP_MODE_OFF:
@ -1435,8 +1439,18 @@ static int riscv_address_translate(struct target *target,
" (satp: 0x%" PRIx64")", satp_value); " (satp: 0x%" PRIx64")", satp_value);
return ERROR_FAIL; return ERROR_FAIL;
} }
LOG_DEBUG("virtual=0x%" TARGET_PRIxADDR "; mode=%s", virtual, info->name);
ppn_value = get_field(satp_value, RISCV_SATP_PPN(riscv_xlen(target))); /* verify bits xlen-1:va_bits-1 are all equal */
target_addr_t mask = ((target_addr_t) 1 << (xlen - (info->va_bits-1))) - 1;
target_addr_t masked_msbs = (virtual >> (info->va_bits-1)) & mask;
if (masked_msbs != 0 && masked_msbs != mask) {
LOG_ERROR("Virtual address 0x%" TARGET_PRIxADDR " is not sign-extended "
"for %s mode.", virtual, info->name);
return ERROR_FAIL;
}
ppn_value = get_field(satp_value, RISCV_SATP_PPN(xlen));
table_address = ppn_value << RISCV_PGSHIFT; table_address = ppn_value << RISCV_PGSHIFT;
i = info->level - 1; i = info->level - 1;
while (i >= 0) { while (i >= 0) {
@ -1477,7 +1491,8 @@ static int riscv_address_translate(struct target *target,
return ERROR_FAIL; return ERROR_FAIL;
} }
*physical = virtual; /* Make sure to clear out the high bits that may be set. */
*physical = virtual & (((target_addr_t) 1 << info->va_bits) - 1);
while (i < info->level) { while (i < info->level) {
ppn_value = pte >> info->pte_ppn_shift[i]; ppn_value = pte >> info->pte_ppn_shift[i];

2
src/target/riscv/riscv.h
View File

@ -176,7 +176,9 @@ typedef struct {
} riscv_bscan_tunneled_scan_context_t; } riscv_bscan_tunneled_scan_context_t;
typedef struct { typedef struct {
const char *name;
int level; int level;
unsigned va_bits;
unsigned pte_shift; unsigned pte_shift;
unsigned vpn_shift[PG_MAX_LEVEL]; unsigned vpn_shift[PG_MAX_LEVEL];
unsigned vpn_mask[PG_MAX_LEVEL]; unsigned vpn_mask[PG_MAX_LEVEL];