diff options
Diffstat (limited to 'debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c')
| -rw-r--r-- | debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c b/debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c index d23b00c..9b4f98a 100644 --- a/debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c +++ b/debug/risc-v-gsp-rm-vm/firmware/uproc_demo/main.c @@ -21,12 +21,13 @@ typedef struct { u64 rpc_count; /* +0x10 */ u64 last_rpc; /* +0x18 */ u64 mailbox; /* +0x20 */ - u64 arg0; /* +0x28 */ + u64 arg0; /* +0x28 service command for injected dispatch */ u64 arg1; /* +0x30 */ - u64 result; /* +0x38 */ - char buf[256]; /* +0x40 */ - u64 handler_count; /* +0x140 */ - u64 handlers[8]; /* +0x148 */ + u64 arg2; /* +0x38 */ + u64 result; /* +0x40 */ + char buf[256]; /* +0x48 */ + u64 handler_count; /* +0x148 */ + u64 handlers[8]; /* +0x150 */ } gsp_ctrl_t; volatile gsp_ctrl_t gsp_ctrl __attribute__((section(".gsp_data"), aligned(64))); @@ -134,8 +135,9 @@ __attribute__((noinline)) u64 rpc_fault(u64 a0, u64 a1) /* ---- dispatcher ---- */ typedef u64 (*rpc_fn)(u64, u64); +typedef u64 (*ge_inject_fn)(u64, u64, u64); -void rpc_dispatch(u64 cmd, u64 a0, u64 a1) +void rpc_dispatch(u64 cmd, u64 a0, u64 a1, u64 a2) { u64 result; switch (cmd) { @@ -158,7 +160,17 @@ void rpc_dispatch(u64 cmd, u64 a0, u64 a1) result = rpc_fault(a0, a1); break; default: - result = ~cmd; + /* Injected-service dispatch: commands 16..23 call handler slots 0..7. + * A debugger can load a new service and store its entry in + * gsp_ctrl.handlers[n] while the firmware is running; this is the + * demo's stand-in for injecting an RM engine/service. */ + if (cmd >= 16 && cmd < 24) { + ge_inject_fn injected = (ge_inject_fn)(unsigned long)gsp_ctrl.handlers[cmd - 16]; + /* a0 carries the service command; a1/a2 are its parameters. */ + result = injected ? injected(a0, a1, a2) : ~cmd; + } else { + result = ~cmd; + } break; } gsp_ctrl.result = result; @@ -187,6 +199,7 @@ int main(void) ctl->rpc_count = 0; ctl->last_rpc = 0; ctl->mailbox = 0; + ctl->arg2 = 0; ctl->result = 0; ctl->buf[0] = '\0'; install_handlers(); @@ -199,13 +212,13 @@ int main(void) uart_puts("\n"); /* Deterministic self-test so freshly attached instrumentation sees events. */ - rpc_dispatch(1, 0x1111, 0); - rpc_dispatch(2, (u64)(unsigned long)"hello-green-eye", 0); - rpc_dispatch(3, 0x5a, 32); - rpc_dispatch(4, (u64)(unsigned long)ctl->buf, 16); - rpc_dispatch(5, 0, 0); - rpc_dispatch(5, 0, 0); - rpc_dispatch(5, 0, 0); + rpc_dispatch(1, 0x1111, 0, 0); + rpc_dispatch(2, (u64)(unsigned long)"hello-green-eye", 0, 0); + rpc_dispatch(3, 0x5a, 32, 0); + rpc_dispatch(4, (u64)(unsigned long)ctl->buf, 16, 0); + rpc_dispatch(5, 0, 0, 0); + rpc_dispatch(5, 0, 0, 0); + rpc_dispatch(5, 0, 0, 0); uart_puts("SELFTEST DONE\n"); for (;;) { @@ -213,7 +226,7 @@ int main(void) u64 cmd = ctl->mailbox; if (cmd != 0) { ctl->mailbox = 0; - rpc_dispatch(cmd, ctl->arg0, ctl->arg1); + rpc_dispatch(cmd, ctl->arg0, ctl->arg1, ctl->arg2); } for (volatile int i = 0; i < 2000; i++) { __asm__ volatile(""); |