lib: sbi: Remove epc from struct sbi_trap_info

In the only places this value is used, it duplicates mepc from
struct sbi_trap_regs.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>

diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h
index 2727bdbcffda4bae482545ad2e610f189076ebf2..37576942d492bcc14be1539fbee8c39a9b2a574e 100644 (file)
--- a/include/sbi/sbi_trap.h
+++ b/include/sbi/sbi_trap.h
@@ -87,20 +87,18 @@
 /** Last member index in sbi_trap_regs */
 #define SBI_TRAP_REGS_last                     35
 
-/** Index of epc member in sbi_trap_info */
-#define SBI_TRAP_INFO_epc                      0
 /** Index of cause member in sbi_trap_info */
-#define SBI_TRAP_INFO_cause                    1
+#define SBI_TRAP_INFO_cause                    0
 /** Index of tval member in sbi_trap_info */
-#define SBI_TRAP_INFO_tval                     2
+#define SBI_TRAP_INFO_tval                     1
 /** Index of tval2 member in sbi_trap_info */
-#define SBI_TRAP_INFO_tval2                    3
+#define SBI_TRAP_INFO_tval2                    2
 /** Index of tinst member in sbi_trap_info */
-#define SBI_TRAP_INFO_tinst                    4
+#define SBI_TRAP_INFO_tinst                    3
 /** Index of gva member in sbi_trap_info */
-#define SBI_TRAP_INFO_gva                      5
+#define SBI_TRAP_INFO_gva                      4
 /** Last member index in sbi_trap_info */
-#define SBI_TRAP_INFO_last                     6
+#define SBI_TRAP_INFO_last                     5
 
 /* clang-format on */
 
@@ -194,8 +192,6 @@ struct sbi_trap_regs {
 
 /** Representation of trap details */
 struct sbi_trap_info {
-       /** epc Trap program counter */
-       unsigned long epc;
        /** cause Trap exception cause */
        unsigned long cause;
        /** tval Trap value */

diff --git a/lib/sbi/sbi_ecall_legacy.c b/lib/sbi/sbi_ecall_legacy.c
index 14913c962a991a89314a29613530960dd73a192c..9a1ae1e481a865b3aeb2a1fde3f3a4ad00f63f4c 100644 (file)
--- a/lib/sbi/sbi_ecall_legacy.c
+++ b/lib/sbi/sbi_ecall_legacy.c
@@ -74,7 +74,6 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
                                                &hmask, &trap)) {
                        ret = sbi_ipi_send_smode(hmask, 0);
                } else {
-                       trap.epc = regs->mepc;
                        sbi_trap_redirect(regs, &trap);
                        out->skip_regs_update = true;
                }
@@ -86,7 +85,6 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
                                          SBI_TLB_FENCE_I, source_hart);
                        ret = sbi_tlb_request(hmask, 0, &tlb_info);
                } else {
-                       trap.epc = regs->mepc;
                        sbi_trap_redirect(regs, &trap);
                        out->skip_regs_update = true;
                }
@@ -98,7 +96,6 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
                                          SBI_TLB_SFENCE_VMA, source_hart);
                        ret = sbi_tlb_request(hmask, 0, &tlb_info);
                } else {
-                       trap.epc = regs->mepc;
                        sbi_trap_redirect(regs, &trap);
                        out->skip_regs_update = true;
                }
@@ -112,7 +109,6 @@ static int sbi_ecall_legacy_handler(unsigned long extid, unsigned long funcid,
                                          source_hart);
                        ret = sbi_tlb_request(hmask, 0, &tlb_info);
                } else {
-                       trap.epc = regs->mepc;
                        sbi_trap_redirect(regs, &trap);
                        out->skip_regs_update = true;
                }

diff --git a/lib/sbi/sbi_expected_trap.S b/lib/sbi/sbi_expected_trap.S
index 1f2d6b97d09adfb391338a556b9bc28783d83c39..99dede5f37be10ea82adb9751231002e6fce144b 100644 (file)
--- a/lib/sbi/sbi_expected_trap.S
+++ b/lib/sbi/sbi_expected_trap.S
@@ -23,8 +23,6 @@
        .global __sbi_expected_trap
 __sbi_expected_trap:
        /* Without H-extension so, MTVAL2 and MTINST CSRs and GVA not available */
-       csrr    a4, CSR_MEPC
-       REG_S   a4, SBI_TRAP_INFO_OFFSET(epc)(a3)
        csrr    a4, CSR_MCAUSE
        REG_S   a4, SBI_TRAP_INFO_OFFSET(cause)(a3)
        csrr    a4, CSR_MTVAL
@@ -41,8 +39,6 @@ __sbi_expected_trap:
        .global __sbi_expected_trap_hext
 __sbi_expected_trap_hext:
        /* With H-extension so, MTVAL2 and MTINST CSRs and GVA available */
-       csrr    a4, CSR_MEPC
-       REG_S   a4, SBI_TRAP_INFO_OFFSET(epc)(a3)
        csrr    a4, CSR_MCAUSE
        REG_S   a4, SBI_TRAP_INFO_OFFSET(cause)(a3)
        csrr    a4, CSR_MTVAL

diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c
index 2be47575a365437f92178fc13d895d3aaa3d0107..dd0b3c126ce301af565f58fb44acbe504ff36245 100644 (file)
--- a/lib/sbi/sbi_illegal_insn.c
+++ b/lib/sbi/sbi_illegal_insn.c
@@ -25,7 +25,6 @@ static int truly_illegal_insn(ulong insn, struct sbi_trap_regs *regs)
 {
        struct sbi_trap_info trap;
 
-       trap.epc = regs->mepc;
        trap.cause = CAUSE_ILLEGAL_INSTRUCTION;
        trap.tval = insn;
        trap.tval2 = 0;
@@ -156,7 +155,6 @@ int sbi_illegal_insn_handler(ulong insn, struct sbi_trap_regs *regs)
        if (unlikely((insn & 3) != 3)) {
                insn = sbi_get_insn(regs->mepc, &uptrap);
                if (uptrap.cause) {
-                       uptrap.epc = regs->mepc;
                        return sbi_trap_redirect(regs, &uptrap);
                }
                if ((insn & 3) != 3)

diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
index c665013049717250c23f4a52ab732197c310e800..c9db73f9530d1effbaf4c3d745c8eab7780535fe 100644 (file)
--- a/lib/sbi/sbi_trap.c
+++ b/lib/sbi/sbi_trap.c
@@ -140,7 +140,7 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
        if (next_virt) {
                /* Update VS-mode exception info */
                csr_write(CSR_VSTVAL, trap->tval);
-               csr_write(CSR_VSEPC, trap->epc);
+               csr_write(CSR_VSEPC, regs->mepc);
                csr_write(CSR_VSCAUSE, trap->cause);
 
                /* Set MEPC to VS-mode exception vector base */
@@ -171,7 +171,7 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
        } else {
                /* Update S-mode exception info */
                csr_write(CSR_STVAL, trap->tval);
-               csr_write(CSR_SEPC, trap->epc);
+               csr_write(CSR_SEPC, regs->mepc);
                csr_write(CSR_SCAUSE, trap->cause);
 
                /* Set MEPC to S-mode exception vector base */
@@ -286,7 +286,6 @@ struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs)
                return regs;
        }
        /* Original trap_info */
-       trap.epc   = regs->mepc;
        trap.cause = mcause;
        trap.tval  = mtval;
        trap.tval2 = mtval2;

diff --git a/lib/sbi/sbi_trap_ldst.c b/lib/sbi/sbi_trap_ldst.c
index d864ad19297b04cfa260fe1ece233c0164567181..5a0537b1be1124e98c5b36e00cc07eaeb9522b88 100644 (file)
--- a/lib/sbi/sbi_trap_ldst.c
+++ b/lib/sbi/sbi_trap_ldst.c
@@ -70,7 +70,6 @@ static int sbi_trap_emulate_load(struct sbi_trap_regs *regs,
                 */
                insn = sbi_get_insn(regs->mepc, &uptrap);
                if (uptrap.cause) {
-                       uptrap.epc = regs->mepc;
                        return sbi_trap_redirect(regs, &uptrap);
                }
                insn_len = INSN_LEN(insn);
@@ -193,7 +192,6 @@ static int sbi_trap_emulate_store(struct sbi_trap_regs *regs,
                 */
                insn = sbi_get_insn(regs->mepc, &uptrap);
                if (uptrap.cause) {
-                       uptrap.epc = regs->mepc;
                        return sbi_trap_redirect(regs, &uptrap);
                }
                insn_len = INSN_LEN(insn);
@@ -277,7 +275,6 @@ static int sbi_misaligned_ld_emulator(int rlen, union sbi_ldst_data *out_val,
                out_val->data_bytes[i] =
                        sbi_load_u8((void *)(orig_trap->tval + i), &uptrap);
                if (uptrap.cause) {
-                       uptrap.epc   = regs->mepc;
                        uptrap.tinst = sbi_misaligned_tinst_fixup(
                                orig_trap->tinst, uptrap.tinst, i);
                        return sbi_trap_redirect(regs, &uptrap);
@@ -304,7 +301,6 @@ static int sbi_misaligned_st_emulator(int wlen, union sbi_ldst_data in_val,
                sbi_store_u8((void *)(orig_trap->tval + i),
                             in_val.data_bytes[i], &uptrap);
                if (uptrap.cause) {
-                       uptrap.epc   = regs->mepc;
                        uptrap.tinst = sbi_misaligned_tinst_fixup(
                                orig_trap->tinst, uptrap.tinst, i);
                        return sbi_trap_redirect(regs, &uptrap);