diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-03-27 09:38:34 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-03-28 11:02:55 +0300 |
| commit | 0a28ea54dce4140593a55dd61606437595ebe53d (patch) | |
| tree | 3e9d366dc83b1b33ca46cb8ce4c21e2be79c4222 /lib/sbi/sbi_emulate_csr.c | |
| parent | ec0d80f5b4928ebedee8881be47f8c430db667af (diff) | |
| download | opensbi-0a28ea54dce4140593a55dd61606437595ebe53d.tar.xz | |
include: sbi_timer: Remove scratch parameter from most funcitons
This patch removes scratch parameter from most sbi_timer functions.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'lib/sbi/sbi_emulate_csr.c')
| -rw-r--r-- | lib/sbi/sbi_emulate_csr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/sbi/sbi_emulate_csr.c b/lib/sbi/sbi_emulate_csr.c index 41c92df..a85277e 100644 --- a/lib/sbi/sbi_emulate_csr.c +++ b/lib/sbi/sbi_emulate_csr.c @@ -22,7 +22,6 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, { int ret = 0; ulong cen = -1UL; - struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; #if __riscv_xlen == 32 bool virt = (regs->mstatusH & MSTATUSH_MPV) ? TRUE : FALSE; @@ -36,7 +35,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, switch (csr_num) { case CSR_HTIMEDELTA: if (prev_mode == PRV_S && !virt) - *csr_val = sbi_timer_get_delta(scratch); + *csr_val = sbi_timer_get_delta(); else ret = SBI_ENOTSUPP; break; @@ -48,8 +47,8 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, case CSR_TIME: if (!((cen >> (CSR_TIME - CSR_CYCLE)) & 1)) return -1; - *csr_val = (virt) ? sbi_timer_virt_value(scratch): - sbi_timer_value(scratch); + *csr_val = (virt) ? sbi_timer_virt_value(): + sbi_timer_value(); break; case CSR_INSTRET: if (!((cen >> (CSR_INSTRET - CSR_CYCLE)) & 1)) @@ -69,7 +68,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, #if __riscv_xlen == 32 case CSR_HTIMEDELTAH: if (prev_mode == PRV_S && !virt) - *csr_val = sbi_timer_get_delta(scratch) >> 32; + *csr_val = sbi_timer_get_delta() >> 32; else ret = SBI_ENOTSUPP; break; @@ -81,8 +80,8 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, case CSR_TIMEH: if (!((cen >> (CSR_TIME - CSR_CYCLE)) & 1)) return -1; - *csr_val = (virt) ? sbi_timer_virt_value(scratch) >> 32: - sbi_timer_value(scratch) >> 32; + *csr_val = (virt) ? sbi_timer_virt_value() >> 32: + sbi_timer_value() >> 32; break; case CSR_INSTRETH: if (!((cen >> (CSR_INSTRET - CSR_CYCLE)) & 1)) @@ -112,7 +111,8 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, }; if (ret) - sbi_dprintf(scratch, "%s: hartid%d: invalid csr_num=0x%x\n", + sbi_dprintf(sbi_scratch_thishart_ptr(), + "%s: hartid%d: invalid csr_num=0x%x\n", __func__, current_hartid(), csr_num); return ret; @@ -122,7 +122,6 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs, ulong csr_val) { int ret = 0; - struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; #if __riscv_xlen == 32 bool virt = (regs->mstatusH & MSTATUSH_MPV) ? TRUE : FALSE; @@ -133,7 +132,7 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs, switch (csr_num) { case CSR_HTIMEDELTA: if (prev_mode == PRV_S && !virt) - sbi_timer_set_delta(scratch, csr_val); + sbi_timer_set_delta(csr_val); else ret = SBI_ENOTSUPP; break; @@ -152,7 +151,7 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs, #if __riscv_xlen == 32 case CSR_HTIMEDELTAH: if (prev_mode == PRV_S && !virt) - sbi_timer_set_delta_upper(scratch, csr_val); + sbi_timer_set_delta_upper(csr_val); else ret = SBI_ENOTSUPP; break; @@ -181,7 +180,8 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs, }; if (ret) - sbi_dprintf(scratch, "%s: hartid%d: invalid csr_num=0x%x\n", + sbi_dprintf(sbi_scratch_thishart_ptr(), + "%s: hartid%d: invalid csr_num=0x%x\n", __func__, current_hartid(), csr_num); return ret; |