KVM: PPC: Move ONE_REG AltiVec support to powerpc

Move ONE_REG AltiVec support to powerpc generic layer.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

2 files changed, 42 insertions, 42 deletions

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index 26868e207ff0..1b5adda2a224 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -558,25 +558,6 @@ int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id,
                 case KVM_REG_PPC_FPSCR:
                         *val = get_reg_val(id, vcpu->arch.fp.fpscr);
                         break;
-#ifdef CONFIG_ALTIVEC
-                case KVM_REG_PPC_VR0 ... KVM_REG_PPC_VR31:
-                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
-                                r = -ENXIO;
-                                break;
-                        }
-                        val->vval = vcpu->arch.vr.vr[id - KVM_REG_PPC_VR0];
-                        break;
-                case KVM_REG_PPC_VSCR:
-                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
-                                r = -ENXIO;
-                                break;
-                        }
-                        *val = get_reg_val(id, vcpu->arch.vr.vscr.u[3]);
-                        break;
-                case KVM_REG_PPC_VRSAVE:
-                        *val = get_reg_val(id, vcpu->arch.vrsave);
-                        break;
-#endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_VSX
                 case KVM_REG_PPC_VSR0 ... KVM_REG_PPC_VSR31:
                         if (cpu_has_feature(CPU_FTR_VSX)) {
@@ -653,29 +634,6 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id,
                 case KVM_REG_PPC_FPSCR:
                         vcpu->arch.fp.fpscr = set_reg_val(id, *val);
                         break;
-#ifdef CONFIG_ALTIVEC
-                case KVM_REG_PPC_VR0 ... KVM_REG_PPC_VR31:
-                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
-                                r = -ENXIO;
-                                break;
-                        }
-                        vcpu->arch.vr.vr[id - KVM_REG_PPC_VR0] = val->vval;
-                        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(id, *val);
-                        break;
-                case KVM_REG_PPC_VRSAVE:
-                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
-                                r = -ENXIO;
-                                break;
-                        }
-                        vcpu->arch.vrsave = set_reg_val(id, *val);
-                        break;
-#endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_VSX
                 case KVM_REG_PPC_VSR0 ... KVM_REG_PPC_VSR31:
                         if (cpu_has_feature(CPU_FTR_VSX)) {
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 8a26126db482..0c7d1917c23d 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -921,6 +921,29 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
         if (r == -EINVAL) {
                 r = 0;
                 switch (reg->id) {
+#ifdef CONFIG_ALTIVEC
+                case KVM_REG_PPC_VR0 ... KVM_REG_PPC_VR31:
+                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
+                                r = -ENXIO;
+                                break;
+                        }
+                        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;
+                        }
+                        vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val);
+                        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);
+                        break;
+#endif /* CONFIG_ALTIVEC */
                 default:
                         r = -EINVAL;
                         break;
@@ -953,6 +976,25 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
         if (r == -EINVAL) {
                 r = 0;
                 switch (reg->id) {
+#ifdef CONFIG_ALTIVEC
+                case KVM_REG_PPC_VR0 ... KVM_REG_PPC_VR31:
+                        if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
+                                r = -ENXIO;
+                                break;
+                        }
+                        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;
+                        }
+                        val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]);
+                        break;
+                case KVM_REG_PPC_VRSAVE:
+                        val = get_reg_val(reg->id, vcpu->arch.vrsave);
+                        break;
+#endif /* CONFIG_ALTIVEC */
                 default:
                         r = -EINVAL;
                         break;