Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: Remove unused mepc arg from load_xyz() and store_xyz() functions

Browse Source 
This patch removes unused mepc arg from load_xyz() and store_xyz()
unpriviledge access functions.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Anup Patel
2019-03-30 17:35:48 +05:30
committed by Anup Patel
parent f9cfe301c9
commit cfff0126ab
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/sbi/sbi_unpriv.h
View File

@@ -15,29 +15,27 @@
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>
#define DECLARE_UNPRIVILEGED_LOAD_FUNCTION(type, insn) \ #define DECLARE_UNPRIVILEGED_LOAD_FUNCTION(type, insn) \
static inline type load_##type(const type *addr, ulong mepc) \ static inline type load_##type(const type *addr) \
{ \ { \
register ulong __mepc asm ("a2") = mepc; \ register ulong __mstatus asm ("a2"); \
register ulong __mstatus asm ("a3"); \
type val; \ type val; \
asm ("csrrs %0, "STR(CSR_MSTATUS)", %3\n" \ asm ("csrrs %0, "STR(CSR_MSTATUS)", %3\n" \
#insn " %1, %2\n" \ #insn " %1, %2\n" \
"csrw "STR(CSR_MSTATUS)", %0" \ "csrw "STR(CSR_MSTATUS)", %0" \
: "+&r" (__mstatus), "=&r" (val) \ : "+&r" (__mstatus), "=&r" (val) \
: "m" (*addr), "r" (MSTATUS_MPRV), "r" (__mepc)); \ : "m" (*addr), "r" (MSTATUS_MPRV)); \
return val; \ return val; \
} }
#define DECLARE_UNPRIVILEGED_STORE_FUNCTION(type, insn) \ #define DECLARE_UNPRIVILEGED_STORE_FUNCTION(type, insn) \
static inline void store_##type(type *addr, type val, ulong mepc) \ static inline void store_##type(type *addr, type val) \
{ \ { \
register ulong __mepc asm ("a2") = mepc; \
register ulong __mstatus asm ("a3"); \ register ulong __mstatus asm ("a3"); \
asm volatile ("csrrs %0, "STR(CSR_MSTATUS)", %3\n" \ asm volatile ("csrrs %0, "STR(CSR_MSTATUS)", %3\n" \
#insn " %1, %2\n" \ #insn " %1, %2\n" \
"csrw "STR(CSR_MSTATUS)", %0" \ "csrw "STR(CSR_MSTATUS)", %0" \
: "+&r" (__mstatus) \ : "+&r" (__mstatus) \
: "r" (val), "m" (*addr), "r" (MSTATUS_MPRV), "r" (__mepc)); \ : "r" (val), "m" (*addr), "r" (MSTATUS_MPRV)); \
} }
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u8, lbu) DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u8, lbu)
@@ -57,16 +55,16 @@ DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong, ld)
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u32, lw) DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u32, lw)
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong, lw) DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong, lw)
static inline u64 load_u64(const u64 *addr, ulong mepc) static inline u64 load_u64(const u64 *addr)
{ {
return load_u32((u32 *)addr, mepc) return load_u32((u32 *)addr)
+ ((u64)load_u32((u32 *)addr + 1, mepc) << 32); + ((u64)load_u32((u32 *)addr + 1) << 32);
} }
static inline void store_u64(u64 *addr, u64 val, ulong mepc) static inline void store_u64(u64 *addr, u64 val)
{ {
store_u32((u32 *)addr, val, mepc); store_u32((u32 *)addr, val);
store_u32((u32 *)addr + 1, val >> 32, mepc); store_u32((u32 *)addr + 1, val >> 32);
} }
#endif #endif

2
lib/sbi_ipi.c
View File

@@ -58,7 +58,7 @@ int sbi_ipi_send_many(struct sbi_scratch *scratch,
u32 hartid = sbi_current_hartid(); u32 hartid = sbi_current_hartid();
if (pmask) if (pmask)
mask &= load_ulong(pmask, csr_read(CSR_MEPC)); mask &= load_ulong(pmask);
/* send IPIs to every other hart on the set */ /* send IPIs to every other hart on the set */
for (i = 0, m = mask; m; i++, m >>= 1) for (i = 0, m = mask; m; i++, m >>= 1)

4
lib/sbi_misaligned_ldst.c
View File

@@ -93,7 +93,7 @@ int sbi_misaligned_load_handler(u32 hartid, ulong mcause,
val.data_u64 = 0; val.data_u64 = 0;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
val.data_bytes[i] = load_u8((void *)(addr + i), regs->mepc); val.data_bytes[i] = load_u8((void *)(addr + i));
if (!fp) if (!fp)
SET_RD(insn, regs, val.data_ulong << shift >> shift); SET_RD(insn, regs, val.data_ulong << shift >> shift);
@@ -169,7 +169,7 @@ int sbi_misaligned_store_handler(u32 hartid, ulong mcause,
return SBI_EILL; return SBI_EILL;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
store_u8((void *)(addr + i), val.data_bytes[i], regs->mepc); store_u8((void *)(addr + i), val.data_bytes[i]);
regs->mepc += INSN_LEN(insn); regs->mepc += INSN_LEN(insn);