From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 29 Jan 2014 17:29:01 +0000 (+0100)
Subject: Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=b73117c49364551ff789db7c424a115ac5b77850

Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue

Conflicts:
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/kvm/booke.c
---

b73117c49364551ff789db7c424a115ac5b77850
diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
index be4fa04a37c,dfa144cb199..e66d4ec04d9
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@@ -153,8 -160,71 +160,70 @@@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206
  
  13:	b	machine_check_fwnmi
  
 -
+ kvmppc_primary_no_guest:
+ 	/* We handle this much like a ceded vcpu */
+ 	/* set our bit in napping_threads */
+ 	ld	r5, HSTATE_KVM_VCORE(r13)
+ 	lbz	r7, HSTATE_PTID(r13)
+ 	li	r0, 1
+ 	sld	r0, r0, r7
+ 	addi	r6, r5, VCORE_NAPPING_THREADS
+ 1:	lwarx	r3, 0, r6
+ 	or	r3, r3, r0
+ 	stwcx.	r3, 0, r6
+ 	bne	1b
+ 	/* order napping_threads update vs testing entry_exit_count */
+ 	isync
+ 	li	r12, 0
+ 	lwz	r7, VCORE_ENTRY_EXIT(r5)
+ 	cmpwi	r7, 0x100
+ 	bge	kvm_novcpu_exit	/* another thread already exiting */
+ 	li	r3, NAPPING_NOVCPU
+ 	stb	r3, HSTATE_NAPPING(r13)
+ 	li	r3, 1
+ 	stb	r3, HSTATE_HWTHREAD_REQ(r13)
+ 
+ 	b	kvm_do_nap
+ 
+ kvm_novcpu_wakeup:
+ 	ld	r1, HSTATE_HOST_R1(r13)
+ 	ld	r5, HSTATE_KVM_VCORE(r13)
+ 	li	r0, 0
+ 	stb	r0, HSTATE_NAPPING(r13)
+ 	stb	r0, HSTATE_HWTHREAD_REQ(r13)
+ 
+ 	/* check the wake reason */
+ 	bl	kvmppc_check_wake_reason
+ 	
+ 	/* see if any other thread is already exiting */
+ 	lwz	r0, VCORE_ENTRY_EXIT(r5)
+ 	cmpwi	r0, 0x100
+ 	bge	kvm_novcpu_exit
+ 
+ 	/* clear our bit in napping_threads */
+ 	lbz	r7, HSTATE_PTID(r13)
+ 	li	r0, 1
+ 	sld	r0, r0, r7
+ 	addi	r6, r5, VCORE_NAPPING_THREADS
+ 4:	lwarx	r7, 0, r6
+ 	andc	r7, r7, r0
+ 	stwcx.	r7, 0, r6
+ 	bne	4b
+ 
+ 	/* See if the wake reason means we need to exit */
+ 	cmpdi	r3, 0
+ 	bge	kvm_novcpu_exit
+ 
+ 	/* Got an IPI but other vcpus aren't yet exiting, must be a latecomer */
+ 	ld	r4, HSTATE_KVM_VCPU(r13)
+ 	cmpdi	r4, 0
+ 	bne	kvmppc_got_guest
+ 
+ kvm_novcpu_exit:
+ 	b	hdec_soon
+ 
  /*
-  * We come in here when wakened from nap mode on a secondary hw thread.
+  * We come in here when wakened from nap mode.
   * Relocation is off and most register values are lost.
   * r13 points to the PACA.
   */
@@@ -223,24 -278,7 +277,12 @@@ kvm_start_guest
  	/* Clear our vcpu pointer so we don't come back in early */
  	li	r0, 0
  	std	r0, HSTATE_KVM_VCPU(r13)
 +	/*
 +	 * Make sure we clear HSTATE_KVM_VCPU(r13) before incrementing
 +	 * the nap_count, because once the increment to nap_count is
 +	 * visible we could be given another vcpu.
 +	 */
  	lwsync
- 	/* Clear any pending IPI - we're an offline thread */
- 	ld	r5, HSTATE_XICS_PHYS(r13)
- 	li	r7, XICS_XIRR
- 	lwzcix	r3, r5, r7		/* ack any pending interrupt */
- 	rlwinm.	r0, r3, 0, 0xffffff	/* any pending? */
- 	beq	37f
- 	sync
- 	li	r0, 0xff
- 	li	r6, XICS_MFRR
- 	stbcix	r0, r5, r6		/* clear the IPI */
- 	stwcix	r3, r5, r7		/* EOI it */
- 37:	sync
  
  	/* increment the nap count and then go to nap mode */
  	ld	r4, HSTATE_KVM_VCORE(r13)
@@@ -1641,11 -1914,10 +1917,10 @@@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206
  	bge	kvm_cede_exit
  	stwcx.	r4,0,r6
  	bne	31b
 +	/* order napping_threads update vs testing entry_exit_count */
 +	isync
- 	li	r0,1
+ 	li	r0,NAPPING_CEDE
  	stb	r0,HSTATE_NAPPING(r13)
- 	mr	r4,r3
 -	/* order napping_threads update vs testing entry_exit_count */
 -	lwsync
  	lwz	r7,VCORE_ENTRY_EXIT(r5)
  	cmpwi	r7,0x100
  	bge	33f		/* another thread already exiting */
diff --cc arch/powerpc/kvm/booke.c
index 0591e05db74,07b89c71189..ab62109fdfa
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@@ -681,11 -681,7 +681,7 @@@ int kvmppc_core_check_requests(struct k
  int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
  {
  	int ret, s;
 -	struct thread_struct thread;
 +	struct debug_reg debug;
- #ifdef CONFIG_PPC_FPU
- 	struct thread_fp_state fp;
- 	int fpexc_mode;
- #endif
  
  	if (!vcpu->arch.sane) {
  		kvm_run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
@@@ -723,11 -711,12 +711,12 @@@
  #endif
  
  	/* Switch to guest debug context */
 -	thread.debug = vcpu->arch.shadow_dbg_reg;
 -	switch_booke_debug_regs(&thread);
 -	thread.debug = current->thread.debug;
 +	debug = vcpu->arch.shadow_dbg_reg;
 +	switch_booke_debug_regs(&debug);
 +	debug = current->thread.debug;
  	current->thread.debug = vcpu->arch.shadow_dbg_reg;
  
+ 	vcpu->arch.pgdir = current->mm->pgd;
  	kvmppc_fix_ee_before_entry();
  
  	ret = __kvmppc_vcpu_run(kvm_run, vcpu);