hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIPS: Add missing VZ accessor microMIPS encodings 

Toolchains may be used which support microMIPS but not VZ instructions
(i.e. binutis 2.22 & 2.23), so extend the explicitly encoded versions of
the guest COP0 register & guest TLB access macros to support microMIPS
encodings too, using the new macros.

This prevents non-microMIPS instructions being executed in microMIPS
mode during CPU probe on cores supporting VZ (e.g. M5150), which cause
reserved instruction exceptions early during boot.

Fixes: bad50d7925 ("MIPS: Fix VZ probe gas errors with binutils <2.24")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13311/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
James Hogan 2016-05-20 23:28:38 +01:00 committed by Ralf Baechle
parent 0dfa1c12f3
commit 1c48a17735
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/mips/include/asm/mipsregs.h
View File

@ -1773,7 +1773,8 @@ do { \
".set\tpush\n\t" \ ".set\tpush\n\t" \
".set\tnoat\n\t" \ ".set\tnoat\n\t" \
"# mfgc0\t$1, $%1, %2\n\t" \ "# mfgc0\t$1, $%1, %2\n\t" \
".word\t(0x40610000 | %1 << 11 | %2)\n\t" \ _ASM_INSN_IF_MIPS(0x40610000 | %1 << 11 | %2) \
_ASM_INSN32_IF_MM(0x002004fc | %1 << 16 | %2 << 11) \
"move\t%0, $1\n\t" \ "move\t%0, $1\n\t" \
".set\tpop" \ ".set\tpop" \
: "=r" (__res) \ : "=r" (__res) \
@ -1787,7 +1788,8 @@ do { \
".set\tpush\n\t" \ ".set\tpush\n\t" \
".set\tnoat\n\t" \ ".set\tnoat\n\t" \
"# dmfgc0\t$1, $%1, %2\n\t" \ "# dmfgc0\t$1, $%1, %2\n\t" \
".word\t(0x40610100 | %1 << 11 | %2)\n\t" \ _ASM_INSN_IF_MIPS(0x40610100 | %1 << 11 | %2) \
_ASM_INSN32_IF_MM(0x582004fc | %1 << 16 | %2 << 11) \
"move\t%0, $1\n\t" \ "move\t%0, $1\n\t" \
".set\tpop" \ ".set\tpop" \
: "=r" (__res) \ : "=r" (__res) \
@ -1802,7 +1804,8 @@ do { \
".set\tnoat\n\t" \ ".set\tnoat\n\t" \
"move\t$1, %z0\n\t" \ "move\t$1, %z0\n\t" \
"# mtgc0\t$1, $%1, %2\n\t" \ "# mtgc0\t$1, $%1, %2\n\t" \
".word\t(0x40610200 | %1 << 11 | %2)\n\t" \ _ASM_INSN_IF_MIPS(0x40610200 | %1 << 11 | %2) \
_ASM_INSN32_IF_MM(0x002006fc | %1 << 16 | %2 << 11) \
".set\tpop" \ ".set\tpop" \
: : "Jr" ((unsigned int)(value)), \ : : "Jr" ((unsigned int)(value)), \
"i" (register), "i" (sel)); \ "i" (register), "i" (sel)); \
@ -1815,7 +1818,8 @@ do { \
".set\tnoat\n\t" \ ".set\tnoat\n\t" \
"move\t$1, %z0\n\t" \ "move\t$1, %z0\n\t" \
"# dmtgc0\t$1, $%1, %2\n\t" \ "# dmtgc0\t$1, $%1, %2\n\t" \
".word\t(0x40610300 | %1 << 11 | %2)\n\t" \ _ASM_INSN_IF_MIPS(0x40610300 | %1 << 11 | %2) \
_ASM_INSN32_IF_MM(0x582006fc | %1 << 16 | %2 << 11) \
".set\tpop" \ ".set\tpop" \
: : "Jr" (value), \ : : "Jr" (value), \
"i" (register), "i" (sel)); \ "i" (register), "i" (sel)); \
@ -2586,28 +2590,32 @@ static inline void guest_tlb_probe(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"# tlbgp\n\t" "# tlbgp\n\t"
".word 0x42000010"); _ASM_INSN_IF_MIPS(0x42000010)
_ASM_INSN32_IF_MM(0x0000017c));
} }
static inline void guest_tlb_read(void) static inline void guest_tlb_read(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"# tlbgr\n\t" "# tlbgr\n\t"
".word 0x42000009"); _ASM_INSN_IF_MIPS(0x42000009)
_ASM_INSN32_IF_MM(0x0000117c));
} }
static inline void guest_tlb_write_indexed(void) static inline void guest_tlb_write_indexed(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"# tlbgwi\n\t" "# tlbgwi\n\t"
".word 0x4200000a"); _ASM_INSN_IF_MIPS(0x4200000a)
_ASM_INSN32_IF_MM(0x0000217c));
} }
static inline void guest_tlb_write_random(void) static inline void guest_tlb_write_random(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"# tlbgwr\n\t" "# tlbgwr\n\t"
".word 0x4200000e"); _ASM_INSN_IF_MIPS(0x4200000e)
_ASM_INSN32_IF_MM(0x0000317c));
} }
/* /*
@ -2617,7 +2625,8 @@ static inline void guest_tlbinvf(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"# tlbginvf\n\t" "# tlbginvf\n\t"
".word 0x4200000c"); _ASM_INSN_IF_MIPS(0x4200000c)
_ASM_INSN32_IF_MM(0x0000517c));
} }
#endif /* !TOOLCHAIN_SUPPORTS_VIRT */ #endif /* !TOOLCHAIN_SUPPORTS_VIRT */