| From 808be4b6912b7fa62e9e9d5c01de95584fba3790 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 27 May 2020 14:11:30 +0800 |
| Subject: MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() |
| |
| From: YuanJunQing <yuanjunqing66@163.com> |
| |
| [ Upstream commit 31e1b3efa802f97a17628dde280006c4cee4ce5e ] |
| |
| Register "a1" is unsaved in this function, |
| when CONFIG_TRACE_IRQFLAGS is enabled, |
| the TRACE_IRQS_OFF macro will call trace_hardirqs_off(), |
| and this may change register "a1". |
| The changed register "a1" as argument will be send |
| to do_fpe() and do_msa_fpe(). |
| |
| Signed-off-by: YuanJunQing <yuanjunqing66@163.com> |
| Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/mips/kernel/genex.S | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S |
| index 0a43c9125267..5b7c67a3f78f 100644 |
| --- a/arch/mips/kernel/genex.S |
| +++ b/arch/mips/kernel/genex.S |
| @@ -476,20 +476,20 @@ NESTED(nmi_handler, PT_SIZE, sp) |
| .endm |
| |
| .macro __build_clear_fpe |
| + CLI |
| + TRACE_IRQS_OFF |
| .set push |
| /* gas fails to assemble cfc1 for some archs (octeon).*/ \ |
| .set mips1 |
| SET_HARDFLOAT |
| cfc1 a1, fcr31 |
| .set pop |
| - CLI |
| - TRACE_IRQS_OFF |
| .endm |
| |
| .macro __build_clear_msa_fpe |
| - _cfcmsa a1, MSA_CSR |
| CLI |
| TRACE_IRQS_OFF |
| + _cfcmsa a1, MSA_CSR |
| .endm |
| |
| .macro __build_clear_ade |
| -- |
| 2.25.1 |
| |
