Skip to contentSkip to conversation

FAILED: patch "[PATCH] powerpc: Fix VSX enabling/flushing to also test MSR_FP and" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Aug 20, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 5a69aec945d27e78abac9fd032533d3aaebf7c1e Mon Sep 17 00:00:00 2001

From: Benjamin Herrenschmidt <[email protected]>
Date: Wed, 16 Aug 2017 16:01:14 +1000
Subject: [PATCH] powerpc: Fix VSX enabling/flushing to also test MSR_FP and
MSR_VEC

VSX uses a combination of the old vector registers, the old FP registers and new "second halves" of the FP registers.

Thus when we need to see the VSX state in the thread struct (flush_vsx_to_thread()) or when we'll use the VSX in the kernel (enable_kernel_vsx()) we need to ensure they are all flushed into the thread struct if either of them is individually enabled.

Unfortunately we only tested if the whole VSX was enabled, not if they were individually enabled.

Fixes 72cd7b44bc99 ("powerpc: Uncomment and make enable_kernel_vsx() routine available")
arch/powerpc/kernel/process.c +3 -2
index ec480966f9bf..1f0fd361e09b 100644
@@ -362,7 +362,8 @@ void enable_kernel_vsx(void)
 
 	cpumsr = msr_check_and_set(MSR_FP|MSR_VEC|MSR_VSX);
 
-	if (current->thread.regs && (current->thread.regs->msr & MSR_VSX)) {
+	if (current->thread.regs &&
+	    (current->thread.regs->msr & (MSR_VSX|MSR_VEC|MSR_FP))) {
 		check_if_tm_restore_required(current);
 		/*
 		 * If a thread has already been reclaimed then the
@@ -386,7 +387,7 @@ void flush_vsx_to_thread(struct task_struct *tsk)
 {
 	if (tsk->thread.regs) {
 		preempt_disable();
-		if (tsk->thread.regs->msr & MSR_VSX) {
+		if (tsk->thread.regs->msr & (MSR_VSX|MSR_VEC|MSR_FP)) {
 			BUG_ON(tsk != current);
 			giveup_vsx(tsk);
 		}