Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (57d1da87) · Commits · e / devices / android_kernel_fairphone_FP4

arch/powerpc/include/asm/asm-prototypes.h

+0 −44

Original line number	Diff line number	Diff line
		@@ -14,9 +14,6 @@

		#include <linux/threads.h>
		#include <linux/kprobes.h>
		#ifdef CONFIG_KVM
		#include <linux/kvm_host.h>
		#endif

		#include <uapi/asm/ucontext.h>

		@@ -112,45 +109,4 @@ void early_setup_secondary(void);
		/* time */
		void accumulate_stolen_time(void);

		/* kvm */
		#ifdef CONFIG_KVM
		long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,
		unsigned long ioba, unsigned long tce);
		long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
		unsigned long liobn, unsigned long ioba,
		unsigned long tce_list, unsigned long npages);
		long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu,
		unsigned long liobn, unsigned long ioba,
		unsigned long tce_value, unsigned long npages);
		long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target,
		unsigned int yield_count);
		long kvmppc_h_random(struct kvm_vcpu *vcpu);
		void kvmhv_commence_exit(int trap);
		long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);
		void kvmppc_subcore_enter_guest(void);
		void kvmppc_subcore_exit_guest(void);
		long kvmppc_realmode_hmi_handler(void);
		long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,
		long pte_index, unsigned long pteh, unsigned long ptel);
		long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index, unsigned long avpn);
		long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu);
		long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index, unsigned long avpn,
		unsigned long va);
		long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,
		unsigned long slb_v, unsigned int status, bool data);
		unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);
		int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,
		unsigned long mfrr);
		int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);
		int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);
		#endif

		#endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */

arch/powerpc/include/asm/kvm_ppc.h

+42 −0

Original line number	Diff line number	Diff line
		@@ -510,6 +510,48 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd)
		{ return 0; }
		#endif

		/*
		* Prototypes for functions called only from assembler code.
		* Having prototypes reduces sparse errors.
		*/
		long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,
		unsigned long ioba, unsigned long tce);
		long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
		unsigned long liobn, unsigned long ioba,
		unsigned long tce_list, unsigned long npages);
		long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu,
		unsigned long liobn, unsigned long ioba,
		unsigned long tce_value, unsigned long npages);
		long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target,
		unsigned int yield_count);
		long kvmppc_h_random(struct kvm_vcpu *vcpu);
		void kvmhv_commence_exit(int trap);
		long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);
		void kvmppc_subcore_enter_guest(void);
		void kvmppc_subcore_exit_guest(void);
		long kvmppc_realmode_hmi_handler(void);
		long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,
		long pte_index, unsigned long pteh, unsigned long ptel);
		long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index, unsigned long avpn);
		long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu);
		long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index, unsigned long avpn,
		unsigned long va);
		long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,
		unsigned long pte_index);
		long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,
		unsigned long slb_v, unsigned int status, bool data);
		unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);
		int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,
		unsigned long mfrr);
		int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);
		int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);

		/*
		* Host-side operations we want to set up while running in real
		* mode in the guest operating on the xics.

arch/powerpc/kvm/book3s_64_vio_hv.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		#include <asm/udbg.h>
		#include <asm/iommu.h>
		#include <asm/tce.h>
		#include <asm/asm-prototypes.h>

		#define TCES_PER_PAGE (PAGE_SIZE / sizeof(u64))

arch/powerpc/kvm/book3s_hv_builtin.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include <asm/dbell.h>
		#include <asm/cputhreads.h>
		#include <asm/io.h>
		#include <asm/asm-prototypes.h>
		#include <asm/opal.h>
		#include <asm/smp.h>

arch/powerpc/kvm/book3s_hv_ras.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		#include <asm/machdep.h>
		#include <asm/cputhreads.h>
		#include <asm/hmi.h>
		#include <asm/asm-prototypes.h>
		#include <asm/kvm_ppc.h>

		/* SRR1 bits for machine check on POWER7 */
		#define SRR1_MC_LDSTERR (1ul << (63-42))