Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2024-12-18 04:14:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Be consistent and check for errors first

Browse Source
This commit is contained in:
Daniel Lublin 2022-09-21 10:56:15 +02:00
parent c0334a77da
commit df67966d8f
No known key found for this signature in database
GPG Key ID: 75BD0FEB8D3E7830
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hw/application_fpga/fw/mta1_mkdf/main.c
View File

@ -205,44 +205,40 @@ int main()
case FW_CMD_RUN_APP: case FW_CMD_RUN_APP:
puts("request: run-app\n"); puts("request: run-app\n");
if (hdr.len != 1) { if (hdr.len != 1 || *app_size == 0 || *app_addr == 0) {
// Bad length // Bad cmd length, or app_size and app_addr are
// not both set
rsp[0] = STATUS_BAD; rsp[0] = STATUS_BAD;
fwreply(hdr, FW_RSP_RUN_APP, rsp); fwreply(hdr, FW_RSP_RUN_APP, rsp);
break; break;
} }
if (*app_size > 0 && *app_addr != 0) { rsp[0] = STATUS_OK;
rsp[0] = STATUS_OK;
fwreply(hdr, FW_RSP_RUN_APP, rsp);
// Flip over to application mode
*switch_app = 1;
// Jump to app - doesn't return
// First clears memory of firmware remains
puts("Jumping to ");
putinthex(*app_addr);
lf();
// clang-format off
asm volatile(
"li a0, 0x40000000;" // MTA1_MKDF_RAM_BASE
"li a1, 0x40010000;"
"loop:;"
"sw zero, 0(a0);"
"addi a0, a0, 4;"
"blt a0, a1, loop;"
// Get value at MTA1_MKDF_MMIO_MTA1_APP_ADDR
"lui a0,0xff000;"
"lw a0,0x030(a0);"
"jalr x0,0(a0);"
::: "memory");
// clang-format on
}
rsp[0] = STATUS_BAD;
fwreply(hdr, FW_RSP_RUN_APP, rsp); fwreply(hdr, FW_RSP_RUN_APP, rsp);
break;
// Flip over to application mode
*switch_app = 1;
// Jump to app - doesn't return
// First clears memory of firmware remains
puts("Jumping to ");
putinthex(*app_addr);
lf();
// clang-format off
asm volatile(
"li a0, 0x40000000;" // MTA1_MKDF_RAM_BASE
"li a1, 0x40010000;"
"loop:;"
"sw zero, 0(a0);"
"addi a0, a0, 4;"
"blt a0, a1, loop;"
// Get value at MTA1_MKDF_MMIO_MTA1_APP_ADDR
"lui a0,0xff000;"
"lw a0,0x030(a0);"
"jalr x0,0(a0);"
::: "memory");
// clang-format on
break; // This is never reached!
case FW_CMD_GET_APP_DIGEST: case FW_CMD_GET_APP_DIGEST:
puts("request: get-app-digest\n"); puts("request: get-app-digest\n");