From 63a513edeccee1758bbfe5111ccc4fbec8f18a12 Mon Sep 17 00:00:00 2001 From: Atish Patra Date: Sat, 9 May 2020 16:47:23 -0700 Subject: [PATCH] lib: Rename unprivileged trap handler Unprivileged trap handler can be reused for any cases where the executing code expects a trap. Rename it to "expected" trap handler as it will be used in other cases in future. Signed-off-by: Atish Patra Tested-by: Jonathan Balkind Reviewed-by: Anup Patel --- include/sbi/sbi_hart.h | 6 +++--- lib/sbi/objects.mk | 2 +- lib/sbi/{sbi_unpriv_trap.S => sbi_expected_trap.S} | 12 ++++++------ lib/sbi/sbi_hart.c | 8 ++++---- lib/sbi/sbi_unpriv.c | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) rename lib/sbi/{sbi_unpriv_trap.S => sbi_expected_trap.S} (84%) diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h index 4b83b84b..6a2ba4ea 100644 --- a/include/sbi/sbi_hart.h +++ b/include/sbi/sbi_hart.h @@ -16,10 +16,10 @@ struct sbi_scratch; int sbi_hart_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot); -extern void (*sbi_hart_unpriv_trap)(void); -static inline ulong sbi_hart_unpriv_trap_addr(void) +extern void (*sbi_hart_expected_trap)(void); +static inline ulong sbi_hart_expected_trap_addr(void) { - return (ulong)sbi_hart_unpriv_trap; + return (ulong)sbi_hart_expected_trap; } void sbi_hart_delegation_dump(struct sbi_scratch *scratch); diff --git a/lib/sbi/objects.mk b/lib/sbi/objects.mk index 7e700fa9..190ee127 100644 --- a/lib/sbi/objects.mk +++ b/lib/sbi/objects.mk @@ -37,4 +37,4 @@ libsbi-objs-y += sbi_timer.o libsbi-objs-y += sbi_tlb.o libsbi-objs-y += sbi_trap.o libsbi-objs-y += sbi_unpriv.o -libsbi-objs-y += sbi_unpriv_trap.o +libsbi-objs-y += sbi_expected_trap.o diff --git a/lib/sbi/sbi_unpriv_trap.S b/lib/sbi/sbi_expected_trap.S similarity index 84% rename from lib/sbi/sbi_unpriv_trap.S rename to lib/sbi/sbi_expected_trap.S index 180c376d..24891c74 100644 --- a/lib/sbi/sbi_unpriv_trap.S +++ b/lib/sbi/sbi_expected_trap.S @@ -11,8 +11,8 @@ #include /* - * We assume that faulting unpriv load/store instruction is - * is 4-byte long and blindly increment SEPC by 4. + * We assume that faulting instruction is is 4-byte long and blindly + * increment SEPC by 4. * * The trap info will be saved as follows: * A3 <- pointer struct sbi_trap_info @@ -20,8 +20,8 @@ */ .align 3 - .global __sbi_unpriv_trap -__sbi_unpriv_trap: + .global __sbi_expected_trap +__sbi_expected_trap: /* Without H-extension so, MTVAL2 and MTINST CSRs not available */ csrr a4, CSR_MEPC REG_S a4, SBI_TRAP_INFO_OFFSET(epc)(a3) @@ -37,8 +37,8 @@ __sbi_unpriv_trap: mret .align 3 - .global __sbi_unpriv_trap_hext -__sbi_unpriv_trap_hext: + .global __sbi_expected_trap_hext +__sbi_expected_trap_hext: /* With H-extension so, MTVAL2 and MTINST CSRs available */ csrr a4, CSR_MEPC REG_S a4, SBI_TRAP_INFO_OFFSET(epc)(a3) diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 24c36378..00e593f0 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -17,10 +17,10 @@ #include #include -extern void __sbi_unpriv_trap(void); -extern void __sbi_unpriv_trap_hext(void); +extern void __sbi_expected_trap(void); +extern void __sbi_expected_trap_hext(void); -void (*sbi_hart_unpriv_trap)(void) = &__sbi_unpriv_trap; +void (*sbi_hart_expected_trap)(void) = &__sbi_expected_trap; static void mstatus_init(struct sbi_scratch *scratch, u32 hartid) { @@ -227,7 +227,7 @@ int sbi_hart_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot) if (cold_boot) { if (misa_extension('H')) - sbi_hart_unpriv_trap = &__sbi_unpriv_trap_hext; + sbi_hart_expected_trap = &__sbi_expected_trap_hext; } mstatus_init(scratch, hartid); diff --git a/lib/sbi/sbi_unpriv.c b/lib/sbi/sbi_unpriv.c index ea050c9e..fad720e3 100644 --- a/lib/sbi/sbi_unpriv.c +++ b/lib/sbi/sbi_unpriv.c @@ -21,7 +21,7 @@ register ulong tinfo asm("a3"); \ register ulong ttmp asm("a4"); \ register ulong mstatus asm("a5"); \ - register ulong mtvec asm("a6") = sbi_hart_unpriv_trap_addr(); \ + register ulong mtvec asm("a6") = sbi_hart_expected_trap_addr(); \ type ret = 0; \ trap->cause = 0; \ asm volatile( \ @@ -51,7 +51,7 @@ register ulong tinfo asm("a3"); \ register ulong ttmp asm("a4"); \ register ulong mstatus asm("a5"); \ - register ulong mtvec asm("a6") = sbi_hart_unpriv_trap_addr(); \ + register ulong mtvec asm("a6") = sbi_hart_expected_trap_addr(); \ trap->cause = 0; \ asm volatile( \ "add %[tinfo], %[taddr], zero\n" \ @@ -120,7 +120,7 @@ ulong sbi_get_insn(ulong mepc, struct sbi_trap_info *trap) register ulong tinfo asm("a3"); register ulong ttmp asm("a4"); register ulong mstatus asm("a5"); - register ulong mtvec asm("a6") = sbi_hart_unpriv_trap_addr(); + register ulong mtvec asm("a6") = sbi_hart_expected_trap_addr(); ulong insn = 0; trap->cause = 0;