KVM: PPC: booke: add sregs support (5ce941ee) · Commits · e / devices / samsung / android_kernel_samsung_exynos7420

Documentation/kvm/api.txt

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -261,7 +261,7 @@ See KVM_GET_REGS for the data structure.
	4.13 KVM_GET_SREGS		4.13 KVM_GET_SREGS

	Capability: basic		Capability: basic
	Architectures: x86		Architectures: x86, ppc
	Type: vcpu ioctl		Type: vcpu ioctl
	Parameters: struct kvm_sregs (out)		Parameters: struct kvm_sregs (out)
	Returns: 0 on success, -1 on error		Returns: 0 on success, -1 on error
	@@ -279,6 +279,8 @@ struct kvm_sregs {
	__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];		__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];
	};		};

			/* ppc -- see arch/powerpc/include/asm/kvm.h */

	interrupt_bitmap is a bitmap of pending external interrupts. At most		interrupt_bitmap is a bitmap of pending external interrupts. At most
	one bit may be set. This interrupt has been acknowledged by the APIC		one bit may be set. This interrupt has been acknowledged by the APIC
	but not yet injected into the cpu core.		but not yet injected into the cpu core.
	@@ -286,7 +288,7 @@ but not yet injected into the cpu core.
	4.14 KVM_SET_SREGS		4.14 KVM_SET_SREGS

	Capability: basic		Capability: basic
	Architectures: x86		Architectures: x86, ppc
	Type: vcpu ioctl		Type: vcpu ioctl
	Parameters: struct kvm_sregs (in)		Parameters: struct kvm_sregs (in)
	Returns: 0 on success, -1 on error		Returns: 0 on success, -1 on error

arch/powerpc/include/asm/kvm.h

+184 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,114 @@ struct kvm_regs {
	__u64 gpr[32];		__u64 gpr[32];
	};		};

			#define KVM_SREGS_E_IMPL_NONE 0
			#define KVM_SREGS_E_IMPL_FSL 1

			#define KVM_SREGS_E_FSL_PIDn (1 << 0) /* PID1/PID2 */

			/*
			* Feature bits indicate which sections of the sregs struct are valid,
			* both in KVM_GET_SREGS and KVM_SET_SREGS. On KVM_SET_SREGS, registers
			* corresponding to unset feature bits will not be modified. This allows
			* restoring a checkpoint made without that feature, while keeping the
			* default values of the new registers.
			*
			* KVM_SREGS_E_BASE contains:
			* CSRR0/1 (refers to SRR2/3 on 40x)
			* ESR
			* DEAR
			* MCSR
			* TSR
			* TCR
			* DEC
			* TB
			* VRSAVE (USPRG0)
			*/
			#define KVM_SREGS_E_BASE (1 << 0)

			/*
			* KVM_SREGS_E_ARCH206 contains:
			*
			* PIR
			* MCSRR0/1
			* DECAR
			* IVPR
			*/
			#define KVM_SREGS_E_ARCH206 (1 << 1)

			/*
			* Contains EPCR, plus the upper half of 64-bit registers
			* that are 32-bit on 32-bit implementations.
			*/
			#define KVM_SREGS_E_64 (1 << 2)

			#define KVM_SREGS_E_SPRG8 (1 << 3)
			#define KVM_SREGS_E_MCIVPR (1 << 4)

			/*
			* IVORs are used -- contains IVOR0-15, plus additional IVORs
			* in combination with an appropriate feature bit.
			*/
			#define KVM_SREGS_E_IVOR (1 << 5)

			/*
			* Contains MAS0-4, MAS6-7, TLBnCFG, MMUCFG.
			* Also TLBnPS if MMUCFG[MAVN] = 1.
			*/
			#define KVM_SREGS_E_ARCH206_MMU (1 << 6)

			/* DBSR, DBCR, IAC, DAC, DVC */
			#define KVM_SREGS_E_DEBUG (1 << 7)

			/* Enhanced debug -- DSRR0/1, SPRG9 */
			#define KVM_SREGS_E_ED (1 << 8)

			/* Embedded Floating Point (SPE) -- IVOR32-34 if KVM_SREGS_E_IVOR */
			#define KVM_SREGS_E_SPE (1 << 9)

			/* External Proxy (EXP) -- EPR */
			#define KVM_SREGS_EXP (1 << 10)

			/* External PID (E.PD) -- EPSC/EPLC */
			#define KVM_SREGS_E_PD (1 << 11)

			/* Processor Control (E.PC) -- IVOR36-37 if KVM_SREGS_E_IVOR */
			#define KVM_SREGS_E_PC (1 << 12)

			/* Page table (E.PT) -- EPTCFG */
			#define KVM_SREGS_E_PT (1 << 13)

			/* Embedded Performance Monitor (E.PM) -- IVOR35 if KVM_SREGS_E_IVOR */
			#define KVM_SREGS_E_PM (1 << 14)

			/*
			* Special updates:
			*
			* Some registers may change even while a vcpu is not running.
			* To avoid losing these changes, by default these registers are
			* not updated by KVM_SET_SREGS. To force an update, set the bit
			* in u.e.update_special corresponding to the register to be updated.
			*
			* The update_special field is zero on return from KVM_GET_SREGS.
			*
			* When restoring a checkpoint, the caller can set update_special
			* to 0xffffffff to ensure that everything is restored, even new features
			* that the caller doesn't know about.
			*/
			#define KVM_SREGS_E_UPDATE_MCSR (1 << 0)
			#define KVM_SREGS_E_UPDATE_TSR (1 << 1)
			#define KVM_SREGS_E_UPDATE_DEC (1 << 2)
			#define KVM_SREGS_E_UPDATE_DBSR (1 << 3)

			/*
			* In KVM_SET_SREGS, reserved/pad fields must be left untouched from a
			* previous KVM_GET_REGS.
			*
			* Unless otherwise indicated, setting any register with KVM_SET_SREGS
			* directly sets its value. It does not trigger any special semantics such
			* as write-one-to-clear. Calling KVM_SET_SREGS on an unmodified struct
			* just received from KVM_GET_SREGS is always a no-op.
			*/
	struct kvm_sregs {		struct kvm_sregs {
	__u32 pvr;		__u32 pvr;
	union {		union {
	@@ -62,6 +170,82 @@ struct kvm_sregs {
	__u64 dbat[8];		__u64 dbat[8];
	} ppc32;		} ppc32;
	} s;		} s;
			struct {
			union {
			struct { /* KVM_SREGS_E_IMPL_FSL */
			__u32 features; /* KVM_SREGS_E_FSL_ */
			__u32 svr;
			__u64 mcar;
			__u32 hid0;

			/* KVM_SREGS_E_FSL_PIDn */
			__u32 pid1, pid2;
			} fsl;
			__u8 pad[256];
			} impl;

			__u32 features; /* KVM_SREGS_E_ */
			__u32 impl_id; /* KVM_SREGS_E_IMPL_ */
			__u32 update_special; /* KVM_SREGS_E_UPDATE_ */
			__u32 pir; /* read-only */
			__u64 sprg8;
			__u64 sprg9; /* E.ED */
			__u64 csrr0;
			__u64 dsrr0; /* E.ED */
			__u64 mcsrr0;
			__u32 csrr1;
			__u32 dsrr1; /* E.ED */
			__u32 mcsrr1;
			__u32 esr;
			__u64 dear;
			__u64 ivpr;
			__u64 mcivpr;
			__u64 mcsr; /* KVM_SREGS_E_UPDATE_MCSR */

			__u32 tsr; /* KVM_SREGS_E_UPDATE_TSR */
			__u32 tcr;
			__u32 decar;
			__u32 dec; /* KVM_SREGS_E_UPDATE_DEC */

			/*
			* Userspace can read TB directly, but the
			* value reported here is consistent with "dec".
			*
			* Read-only.
			*/
			__u64 tb;

			__u32 dbsr; /* KVM_SREGS_E_UPDATE_DBSR */
			__u32 dbcr[3];
			__u32 iac[4];
			__u32 dac[2];
			__u32 dvc[2];
			__u8 num_iac; /* read-only */
			__u8 num_dac; /* read-only */
			__u8 num_dvc; /* read-only */
			__u8 pad;

			__u32 epr; /* EXP */
			__u32 vrsave; /* a.k.a. USPRG0 */
			__u32 epcr; /* KVM_SREGS_E_64 */

			__u32 mas0;
			__u32 mas1;
			__u64 mas2;
			__u64 mas7_3;
			__u32 mas4;
			__u32 mas6;

			__u32 ivor_low[16]; /* IVOR0-15 */
			__u32 ivor_high[18]; /* IVOR32+, plus room to expand */

			__u32 mmucfg; /* read-only */
			__u32 eptcfg; /* E.PT, read-only */
			__u32 tlbcfg[4];/* read-only */
			__u32 tlbps[4]; /* read-only */

			__u32 eplc, epsc; /* E.PD */
			} e;
	__u8 pad[1020];		__u8 pad[1020];
	} u;		} u;
	};		};

arch/powerpc/include/asm/kvm_44x.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,6 @@ static inline struct kvmppc_vcpu_44x to_44x(struct kvm_vcpu vcpu)
	return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);		return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);
	}		}

	void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid);
	void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu);		void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu);
	void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu);		void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu);

arch/powerpc/include/asm/kvm_e500.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,7 @@ struct kvmppc_vcpu_e500 {
	u32 hid1;		u32 hid1;
	u32 tlb0cfg;		u32 tlb0cfg;
	u32 tlb1cfg;		u32 tlb1cfg;
			u64 mcar;

	struct kvm_vcpu vcpu;		struct kvm_vcpu vcpu;
	};		};

arch/powerpc/include/asm/kvm_host.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -233,6 +233,9 @@ struct kvm_vcpu_arch {
	ulong csrr1;		ulong csrr1;
	ulong dsrr0;		ulong dsrr0;
	ulong dsrr1;		ulong dsrr1;
			ulong mcsrr0;
			ulong mcsrr1;
			ulong mcsr;
	ulong esr;		ulong esr;
	u32 dec;		u32 dec;
	u32 decar;		u32 decar;