From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexander Graf <agraf@suse.de>
Date: Tue, 17 Jun 2014 16:05:45 +0000
Subject: Re: [PATCH 3/4] KVM: PPC: Book3S HV: Fix ABIv2 indirect branch issue
Message-Id: <53A06759.9050601@suse.de>
List-Id: <kvm-ppc.vger.kernel.org>
References: <20140612181420.65b05675@kryten> <20140612181610.3479c3f2@kryten>
In-Reply-To: <20140612181610.3479c3f2@kryten>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: Anton Blanchard <anton@samba.org>, benh@kernel.crashing.org, paulus@samba.org, clg@fr.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org


On 12.06.14 10:16, Anton Blanchard wrote:
> To establish addressability quickly, ABIv2 requires the target
> address of the function being called to be in r12.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>

Thanks, applied to kvm-ppc-queue.


Alex

> ---
>
> Index: b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> =================================> --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> @@ -1920,8 +1920,8 @@ hcall_try_real_mode:
>   	lwax	r3,r3,r4
>   	cmpwi	r3,0
>   	beq	guest_exit_cont
> -	add	r3,r3,r4
> -	mtctr	r3
> +	add	r12,r3,r4
> +	mtctr	r12
>   	mr	r3,r9		/* get vcpu pointer */
>   	ld	r4,VCPU_GPR(R4)(r9)
>   	bctrl