davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: Loongson-3: Fix fp register access if MSA enabled

Browse Source 
If MSA is enabled, FPU_REG_WIDTH is 128 rather than 64, then get_fpr64()
/set_fpr64() in the original unaligned instruction emulation code access
the wrong fp registers. This is because the current code doesn't specify
the correct index field, so fix it.

Fixes: f83e4f9896 ("MIPS: Loongson-3: Add some unaligned instructions emulation")
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Pei Huang <huangpei@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Huacai Chen 2020-08-24 15:44:03 +08:00 committed by Thomas Bogendoerfer
parent b959b97860
commit 01ce6d4d2c
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/mips/loongson64/cop2-ex.c
View File

@ -95,10 +95,8 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
if (res) if (res)
goto fault; goto fault;
set_fpr64(current->thread.fpu.fpr, set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rt], 0, value);
insn.loongson3_lswc2_format.rt, value); set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rq], 0, value_next);
set_fpr64(current->thread.fpu.fpr,
insn.loongson3_lswc2_format.rq, value_next);
compute_return_epc(regs); compute_return_epc(regs);
own_fpu(1); own_fpu(1);
} }
@ -130,15 +128,13 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
goto sigbus; goto sigbus;
lose_fpu(1); lose_fpu(1);
value_next = get_fpr64(current->thread.fpu.fpr, value_next = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rq], 0);
insn.loongson3_lswc2_format.rq);
StoreDW(addr + 8, value_next, res); StoreDW(addr + 8, value_next, res);
if (res) if (res)
goto fault; goto fault;
value = get_fpr64(current->thread.fpu.fpr, value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rt], 0);
insn.loongson3_lswc2_format.rt);
StoreDW(addr, value, res); StoreDW(addr, value, res);
if (res) if (res)
@ -204,8 +200,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
if (res) if (res)
goto fault; goto fault;
set_fpr64(current->thread.fpu.fpr, set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0, value);
insn.loongson3_lsdc2_format.rt, value);
compute_return_epc(regs); compute_return_epc(regs);
own_fpu(1); own_fpu(1);
@ -221,8 +216,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
if (res) if (res)
goto fault; goto fault;
set_fpr64(current->thread.fpu.fpr, set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0, value);
insn.loongson3_lsdc2_format.rt, value);
compute_return_epc(regs); compute_return_epc(regs);
own_fpu(1); own_fpu(1);
break; break;
@ -286,8 +280,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
goto sigbus; goto sigbus;
lose_fpu(1); lose_fpu(1);
value = get_fpr64(current->thread.fpu.fpr, value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0);
insn.loongson3_lsdc2_format.rt);
StoreW(addr, value, res); StoreW(addr, value, res);
if (res) if (res)
@ -305,8 +298,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
goto sigbus; goto sigbus;
lose_fpu(1); lose_fpu(1);
value = get_fpr64(current->thread.fpu.fpr, value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0);
insn.loongson3_lsdc2_format.rt);
StoreDW(addr, value, res); StoreDW(addr, value, res);
if (res) if (res)