diff for duplicates of <53B54AAD.4040609@suse.de> diff --git a/a/1.txt b/N1/1.txt index cd6bd8a..d4127ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -188,17 +188,25 @@ Alex > > - sregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL]; > - sregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA]; -> + sregs->u.e.ivor_high[0] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL]; -> + sregs->u.e.ivor_high[1] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; +> + sregs->u.e.ivor_high[0] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL]; +> + sregs->u.e.ivor_high[1] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; > sregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND]; -> sregs->u.e.ivor_high[3] > vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR]; +> sregs->u.e.ivor_high[3] = +> vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR]; > @@ -414,9 +416,9 @@ static int kvmppc_core_set_sregs_e500(struct kvm_vcpu *vcpu, > return 0; > > if (sregs->u.e.features & KVM_SREGS_E_SPE) { -> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] > sregs->u.e.ivor_high[0]; -> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > sregs->u.e.ivor_high[1]; -> vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] > sregs->u.e.ivor_high[2]; +> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] = +> sregs->u.e.ivor_high[0]; +> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] = +> sregs->u.e.ivor_high[1]; +> vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = +> sregs->u.e.ivor_high[2]; > diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c > index 98a22e5..6a6833f 100644 > --- a/arch/powerpc/kvm/e500_emulate.c @@ -212,7 +220,8 @@ Alex > break; > case SPRN_IVOR33: > - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = spr_val; -> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > + spr_val; +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] = +> + spr_val; > break; > case SPRN_IVOR34: > vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = spr_val; @@ -225,7 +234,8 @@ Alex > break; > case SPRN_IVOR33: > - *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA]; -> + *spr_val > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; +> + *spr_val = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; > break; > case SPRN_IVOR34: > *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND]; diff --git a/a/content_digest b/N1/content_digest index d882e5b..7c26437 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01404142497-6430-2-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 1/6 v2] KVM: PPC: Book3E: Use common defines for SPE/FP/AltiVec int numbers\0" - "Date\0Thu, 03 Jul 2014 12:21:01 +0000\0" + "Date\0Thu, 03 Jul 2014 14:21:01 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" - "Cc\0kvm@vger.kernel.org" - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0linuxppc-dev@lists.ozlabs.org" + " kvm@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -199,17 +199,25 @@ "> \n" "> -\tsregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];\n" "> -\tsregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];\n" - "> +\tsregs->u.e.ivor_high[0] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL];\n" - "> +\tsregs->u.e.ivor_high[1] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" + "> +\tsregs->u.e.ivor_high[0] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL];\n" + "> +\tsregs->u.e.ivor_high[1] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" "> \tsregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];\n" - "> \tsregs->u.e.ivor_high[3] > \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];\n" + "> \tsregs->u.e.ivor_high[3] =\n" + "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];\n" "> @@ -414,9 +416,9 @@ static int kvmppc_core_set_sregs_e500(struct kvm_vcpu *vcpu,\n" "> \t\treturn 0;\n" "> \n" "> \tif (sregs->u.e.features & KVM_SREGS_E_SPE) {\n" - "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] > \t\t\tsregs->u.e.ivor_high[0];\n" - "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > \t\t\tsregs->u.e.ivor_high[1];\n" - "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] > \t\t\tsregs->u.e.ivor_high[2];\n" + "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] =\n" + "> \t\t\tsregs->u.e.ivor_high[0];\n" + "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] =\n" + "> \t\t\tsregs->u.e.ivor_high[1];\n" + "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] =\n" + "> \t\t\tsregs->u.e.ivor_high[2];\n" "> diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c\n" "> index 98a22e5..6a6833f 100644\n" "> --- a/arch/powerpc/kvm/e500_emulate.c\n" @@ -223,7 +231,8 @@ "> \t\tbreak;\n" "> \tcase SPRN_IVOR33:\n" "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = spr_val;\n" - "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > +\t\t\tspr_val;\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] =\n" + "> +\t\t\tspr_val;\n" "> \t\tbreak;\n" "> \tcase SPRN_IVOR34:\n" "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = spr_val;\n" @@ -236,9 +245,10 @@ "> \t\tbreak;\n" "> \tcase SPRN_IVOR33:\n" "> -\t\t*spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];\n" - "> +\t\t*spr_val > +\t\t vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" + "> +\t\t*spr_val =\n" + "> +\t\t vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" "> \t\tbreak;\n" "> \tcase SPRN_IVOR34:\n" "> \t\t*spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];" -576ec73f9aa47ee938e86485ae3eb0a349e85760c5f73b9a8576740e81fd74e5 +c693be01aa4c0ec581701fdf9de2902928f3d830b8005c68cd59e1acb6b60660
diff --git a/a/1.txt b/N2/1.txt index cd6bd8a..d4127ed 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -188,17 +188,25 @@ Alex > > - sregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL]; > - sregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA]; -> + sregs->u.e.ivor_high[0] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL]; -> + sregs->u.e.ivor_high[1] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; +> + sregs->u.e.ivor_high[0] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL]; +> + sregs->u.e.ivor_high[1] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; > sregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND]; -> sregs->u.e.ivor_high[3] > vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR]; +> sregs->u.e.ivor_high[3] = +> vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR]; > @@ -414,9 +416,9 @@ static int kvmppc_core_set_sregs_e500(struct kvm_vcpu *vcpu, > return 0; > > if (sregs->u.e.features & KVM_SREGS_E_SPE) { -> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] > sregs->u.e.ivor_high[0]; -> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > sregs->u.e.ivor_high[1]; -> vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] > sregs->u.e.ivor_high[2]; +> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] = +> sregs->u.e.ivor_high[0]; +> - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] = +> sregs->u.e.ivor_high[1]; +> vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = +> sregs->u.e.ivor_high[2]; > diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c > index 98a22e5..6a6833f 100644 > --- a/arch/powerpc/kvm/e500_emulate.c @@ -212,7 +220,8 @@ Alex > break; > case SPRN_IVOR33: > - vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = spr_val; -> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > + spr_val; +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] = +> + spr_val; > break; > case SPRN_IVOR34: > vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = spr_val; @@ -225,7 +234,8 @@ Alex > break; > case SPRN_IVOR33: > - *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA]; -> + *spr_val > + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; +> + *spr_val = +> + vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST]; > break; > case SPRN_IVOR34: > *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND]; diff --git a/a/content_digest b/N2/content_digest index d882e5b..49c27e3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01404142497-6430-2-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 1/6 v2] KVM: PPC: Book3E: Use common defines for SPE/FP/AltiVec int numbers\0" - "Date\0Thu, 03 Jul 2014 12:21:01 +0000\0" + "Date\0Thu, 03 Jul 2014 14:21:01 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org" @@ -199,17 +199,25 @@ "> \n" "> -\tsregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];\n" "> -\tsregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];\n" - "> +\tsregs->u.e.ivor_high[0] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL];\n" - "> +\tsregs->u.e.ivor_high[1] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" + "> +\tsregs->u.e.ivor_high[0] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL];\n" + "> +\tsregs->u.e.ivor_high[1] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" "> \tsregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];\n" - "> \tsregs->u.e.ivor_high[3] > \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];\n" + "> \tsregs->u.e.ivor_high[3] =\n" + "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];\n" "> @@ -414,9 +416,9 @@ static int kvmppc_core_set_sregs_e500(struct kvm_vcpu *vcpu,\n" "> \t\treturn 0;\n" "> \n" "> \tif (sregs->u.e.features & KVM_SREGS_E_SPE) {\n" - "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] > \t\t\tsregs->u.e.ivor_high[0];\n" - "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] > +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > \t\t\tsregs->u.e.ivor_high[1];\n" - "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] > \t\t\tsregs->u.e.ivor_high[2];\n" + "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_ALTIVEC_UNAVAIL] =\n" + "> \t\t\tsregs->u.e.ivor_high[0];\n" + "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] =\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] =\n" + "> \t\t\tsregs->u.e.ivor_high[1];\n" + "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] =\n" + "> \t\t\tsregs->u.e.ivor_high[2];\n" "> diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c\n" "> index 98a22e5..6a6833f 100644\n" "> --- a/arch/powerpc/kvm/e500_emulate.c\n" @@ -223,7 +231,8 @@ "> \t\tbreak;\n" "> \tcase SPRN_IVOR33:\n" "> -\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] = spr_val;\n" - "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] > +\t\t\tspr_val;\n" + "> +\t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST] =\n" + "> +\t\t\tspr_val;\n" "> \t\tbreak;\n" "> \tcase SPRN_IVOR34:\n" "> \t\tvcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] = spr_val;\n" @@ -236,9 +245,10 @@ "> \t\tbreak;\n" "> \tcase SPRN_IVOR33:\n" "> -\t\t*spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];\n" - "> +\t\t*spr_val > +\t\t vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" + "> +\t\t*spr_val =\n" + "> +\t\t vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA_ALTIVEC_ASSIST];\n" "> \t\tbreak;\n" "> \tcase SPRN_IVOR34:\n" "> \t\t*spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];" -576ec73f9aa47ee938e86485ae3eb0a349e85760c5f73b9a8576740e81fd74e5 +7cc8aec85a074b29f757f1d2ef141927f800c18b835244a789cefe7c74cffb95
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.