Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a6d220 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge branch 'kvm-ppc-next' of... 

Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into next

PPC KVM updates for 4.9.

- Fix for the bug that Thomas Huth found which caused guests to falsely
  report soft lockups,
- other minor fixes from Thomas Huth and Dan Carpenter,
- and a small optimization from Balbir Singh.
parents 45ca877a fa73c3b2

arch/powerpc/include/asm/kvm_book3s.h

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct kvmppc_vcore { 
	u32 arch_compat;

	ulong pcr;

	ulong dpdes;		/* doorbell state (POWER8) */

	ulong vtb;		/* virtual timebase */

	ulong conferring_threads;

	unsigned int halt_poll_ns;

};
@@ -119,6 +120,7 @@ struct kvmppc_vcpu_book3s { 
	u64 sdr1;

	u64 hior;

	u64 msr_mask;

	u64 vtb;

#ifdef CONFIG_PPC_BOOK3S_32

	u32 vsid_pool[VSID_POOL_SIZE];

	u32 vsid_next;

arch/powerpc/include/asm/kvm_book3s_64.h

+1 −2
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
	/* This covers 14..54 bits of va*/

	rb = (v & ~0x7fUL) << 16;		/* AVA field */



	rb |= (v >> HPTE_V_SSIZE_SHIFT) << 8;	/*  B field */

	/*

	 * AVA in v had cleared lower 23 bits. We need to derive

	 * that from pteg index
@@ -177,7 +176,7 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
		break;

	}

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	rb |= (v >> HPTE_V_SSIZE_SHIFT) << 8;	/* B field */

	return rb;

}

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -475,7 +475,6 @@ struct kvm_vcpu_arch { 
	ulong purr;

	ulong spurr;

	ulong ic;

	ulong vtb;

	ulong dscr;

	ulong amr;

	ulong uamor;

arch/powerpc/include/asm/reg.h

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ 
#define   MMCR0_FCHV	0x00000001UL /* freeze conditions in hypervisor mode */

#define SPRN_MMCR1	798

#define SPRN_MMCR2	785

#define SPRN_UMMCR2	769

#define SPRN_MMCRA	0x312

#define   MMCRA_SDSYNC	0x80000000UL /* SDAR synced with SIAR */

#define   MMCRA_SDAR_DCACHE_MISS 0x40000000UL

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ int main(void) 
	DEFINE(VCPU_PURR, offsetof(struct kvm_vcpu, arch.purr));

	DEFINE(VCPU_SPURR, offsetof(struct kvm_vcpu, arch.spurr));

	DEFINE(VCPU_IC, offsetof(struct kvm_vcpu, arch.ic));

	DEFINE(VCPU_VTB, offsetof(struct kvm_vcpu, arch.vtb));

	DEFINE(VCPU_DSCR, offsetof(struct kvm_vcpu, arch.dscr));

	DEFINE(VCPU_AMR, offsetof(struct kvm_vcpu, arch.amr));

	DEFINE(VCPU_UAMOR, offsetof(struct kvm_vcpu, arch.uamor));
@@ -557,6 +556,7 @@ int main(void) 
	DEFINE(VCORE_LPCR, offsetof(struct kvmppc_vcore, lpcr));

	DEFINE(VCORE_PCR, offsetof(struct kvmppc_vcore, pcr));

	DEFINE(VCORE_DPDES, offsetof(struct kvmppc_vcore, dpdes));

	DEFINE(VCORE_VTB, offsetof(struct kvmppc_vcore, vtb));

	DEFINE(VCPU_SLB_E, offsetof(struct kvmppc_slb, orige));

	DEFINE(VCPU_SLB_V, offsetof(struct kvmppc_slb, origv));

	DEFINE(VCPU_SLB_SIZE, sizeof(struct kvmppc_slb));