michaelh/zephyr
1
0
Fork 0
Code Releases Activity

riscv: use standard MSTATUS

Browse source 
This is no longer needed, since all in-tree platforms are only using
the standard mstatus formats. Remove it to avoid the complexity.

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-01-03 18:18:24 -08:00 • committed by Anas Nashif
commit a6b3b616f5
11 changed files with 34 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/arch/riscv/arch.h
View file

@ -40,6 +40,24 @@
#define RV_REGSHIFT 2
#endif
/* Common mstatus bits. All supported cores today have the same
* layouts.
*/
#define MSTATUS_IEN (1UL << 3)
#define MSTATUS_MPP_M (3UL << 11)
#define MSTATUS_MPIE_EN (1UL << 7)
/* This comes from openisa_rv32m1, but doesn't seem to hurt on other
* platforms:
* - Preserve machine privileges in MPP. If you see any documentation
* telling you that MPP is read-only on this SoC, don't believe its
* lies.
* - Enable interrupts when exiting from exception into a new thread
* by setting MPIE now, so it will be copied into IE on mret.
*/
#define MSTATUS_DEF_RESTORE (MSTATUS_MPP_M | MSTATUS_MPIE_EN)
#ifndef _ASMLANGUAGE
#include <sys/util.h>
@ -96,10 +114,10 @@ static ALWAYS_INLINE unsigned int arch_irq_lock(void)
__asm__ volatile ("csrrc %0, mstatus, %1"
: "=r" (mstatus)
: "r" (SOC_MSTATUS_IEN)
: "r" (MSTATUS_IEN)
: "memory");
key = (mstatus & SOC_MSTATUS_IEN);
key = (mstatus & MSTATUS_IEN);
return key;
}
@ -113,7 +131,7 @@ static ALWAYS_INLINE void arch_irq_unlock(unsigned int key)
__asm__ volatile ("csrrs %0, mstatus, %1"
: "=r" (mstatus)
: "r" (key & SOC_MSTATUS_IEN)
: "r" (key & MSTATUS_IEN)
: "memory");
}
@ -126,7 +144,7 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
* that something elseswhere might try to set a bit? Do it
* the safe way for now.
*/
return (key & SOC_MSTATUS_IEN) == SOC_MSTATUS_IEN;
return (key & MSTATUS_IEN) == MSTATUS_IEN;
}
static ALWAYS_INLINE void arch_nop(void)