aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/processor.h
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-01-27 10:23:11 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:10 -0400
commit1db1af84d6df99a8e5d6ddea8c7b5c1327c9a620 (patch)
tree72865fad6fa4bcfabe94ae3642a58bf28a533181 /arch/mips/include/asm/processor.h
parenta5e9a69e2cb64c15246291fdc0e27134b9cdce37 (diff)
MIPS: Basic MSA context switching support
This patch adds support for context switching the MSA vector registers. These 128 bit vector registers are aliased with the FP registers - an FP register accesses the least significant bits of the vector register with which it is aliased (ie. the register with the same index). Due to both this & the requirement that the scalar FPU must be 64-bit (FR=1) if enabled at the same time as MSA the kernel will enable MSA & scalar FP at the same time for tasks which use MSA. If we restore the MSA vector context then we might as well enable the scalar FPU since the reason it was left disabled was to allow for lazy FP context restoring - but we just restored the FP context as it's a subset of the vector context. If we restore the FP context and have previously used MSA then we have to restore the whole vector context anyway (see comment in enable_restore_fp_context for details) so similarly we might as well enable MSA. Thus if a task does not use MSA then it will continue to behave as without this patch - the scalar FP context will be saved & restored as usual. But if a task executes an MSA instruction then it will save & restore the vector context forever more. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6431/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/processor.h')
-rw-r--r--arch/mips/include/asm/processor.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index 50cf4c343118..ad70cba8daff 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -96,7 +96,12 @@ extern unsigned int vced_count, vcei_count;
96 96
97 97
98#define NUM_FPU_REGS 32 98#define NUM_FPU_REGS 32
99#define FPU_REG_WIDTH 64 99
100#ifdef CONFIG_CPU_HAS_MSA
101# define FPU_REG_WIDTH 128
102#else
103# define FPU_REG_WIDTH 64
104#endif
100 105
101union fpureg { 106union fpureg {
102 __u32 val32[FPU_REG_WIDTH / 32]; 107 __u32 val32[FPU_REG_WIDTH / 32];
@@ -133,6 +138,7 @@ BUILD_FPR_ACCESS(64)
133struct mips_fpu_struct { 138struct mips_fpu_struct {
134 union fpureg fpr[NUM_FPU_REGS]; 139 union fpureg fpr[NUM_FPU_REGS];
135 unsigned int fcr31; 140 unsigned int fcr31;
141 unsigned int msacsr;
136}; 142};
137 143
138#define NUM_DSP_REGS 6 144#define NUM_DSP_REGS 6
@@ -310,6 +316,7 @@ struct thread_struct {
310 .fpu = { \ 316 .fpu = { \
311 .fpr = {{{0,},},}, \ 317 .fpr = {{{0,},},}, \
312 .fcr31 = 0, \ 318 .fcr31 = 0, \
319 .msacsr = 0, \
313 }, \ 320 }, \
314 /* \ 321 /* \
315 * FPU affinity state (null if not FPAFF) \ 322 * FPU affinity state (null if not FPAFF) \