Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d7f161 authored by Greg Kurz's avatar Greg Kurz Committed by Paul Mackerras
Browse files

KVM: PPC: Fix ONE_REG AltiVec support 



The get and set operations got exchanged by mistake when moving the
code from book3s.c to powerpc.c.

Fixes: 3840edc8
Cc: stable@vger.kernel.org # 3.18+
Signed-off-by: default avatarGreg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 696066f8

arch/powerpc/kvm/powerpc.c

+10 −10
Original line number Diff line number Diff line
@@ -919,21 +919,17 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) 
				r = -ENXIO;

				break;

			}

			vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0] = val.vval;

			val.vval = vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0];

			break;

		case KVM_REG_PPC_VSCR:

			if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {

				r = -ENXIO;

				break;

			}

			vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val);

			val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]);

			break;

		case KVM_REG_PPC_VRSAVE:

			if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {

				r = -ENXIO;

				break;

			}

			vcpu->arch.vrsave = set_reg_val(reg->id, val);

			val = get_reg_val(reg->id, vcpu->arch.vrsave);

			break;

#endif /* CONFIG_ALTIVEC */

		default:
@@ -974,17 +970,21 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) 
				r = -ENXIO;

				break;

			}

			val.vval = vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0];

			vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0] = val.vval;

			break;

		case KVM_REG_PPC_VSCR:

			if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {

				r = -ENXIO;

				break;

			}

			val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]);

			vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val);

			break;

		case KVM_REG_PPC_VRSAVE:

			val = get_reg_val(reg->id, vcpu->arch.vrsave);

			if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {

				r = -ENXIO;

				break;

			}

			vcpu->arch.vrsave = set_reg_val(reg->id, val);

			break;

#endif /* CONFIG_ALTIVEC */

		default: