[Android-virt] [RFC PATCH 5/6] fixup! ARM: KVM: World-switch implementation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Christoffer,

On 26/06/12 23:24, Christoffer Dall wrote:
> Signed-off-by: Christoffer Dall <c.dall at virtualopensystems.com>
> ---
>  arch/arm/kvm/interrupts.S |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
> index 625ba6c..d1a9b75 100644
> --- a/arch/arm/kvm/interrupts.S
> +++ b/arch/arm/kvm/interrupts.S
> @@ -271,9 +271,9 @@ ENDPROC(__kvm_flush_vm_context)
>   * (hardware reset value is 0) */
>  .macro set_hstr entry
>  	mrc	p15, 4, r2, c1, c1, 3
> -	ldr	r3, =0x8e00
> +	ldr	r3, =0x00108e00

Where does this value comes from? In my copy of the ARM ARM, bits
31:18,14,4 of HSTR are reserved.

>  	.if \entry == 1
> -	orr	r2, r2, r3		@ Trap CR{9,10,11,15}
> +	orr	r2, r2, r3		@ Trap TTA, CR{9,10,11,15}

Did you want to set HCPTR.TTA bit instead?

>  	.else
>  	bic	r2, r2, r3		@ Don't trap any CRx accesses
>  	.endif
> @@ -326,7 +326,7 @@ ENTRY(__kvm_vcpu_run)
>  	@ Configure Hyp-role
>  	configure_hyp_role 1, r0
>  
> -	@ Trap coprocessor CRx for all x except 2 and 14
> +	@ Trap coprocessor CRx accesses
>  	set_hstr 1
>  
>  	@ Write configured ID register into MIDR alias

Cheers,

	M.
-- 
Jazz is not dead. It just smells funny...




[Index of Archives]     [Linux KVM]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux