Commit 6ac4a5ac authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Drop kvm_coproc.h 



kvm_coproc.h used to serve as a compatibility layer for the files
shared between the 32 and 64 bit ports.

Another one bites the dust...

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 5f7e02ae

arch/arm64/include/asm/kvm_coproc.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2012,2013 - ARM Ltd

 * Author: Marc Zyngier <marc.zyngier@arm.com>

 *

 * Derived from arch/arm/include/asm/kvm_coproc.h

 * Copyright (C) 2012 Rusty Russell IBM Corporation

 */



#ifndef __ARM64_KVM_COPROC_H__

#define __ARM64_KVM_COPROC_H__



#include <linux/kvm_host.h>



void kvm_reset_sys_regs(struct kvm_vcpu *vcpu);



struct kvm_sys_reg_table {

	const struct sys_reg_desc *table;

	size_t num;

};



int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu);



#define kvm_coproc_table_init kvm_sys_reg_table_init

void kvm_sys_reg_table_init(void);



struct kvm_one_reg;

int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);

int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);

unsigned long kvm_arm_num_sys_reg_descs(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_COPROC_H__ */

arch/arm64/include/asm/kvm_host.h

+17 −0
Original line number Diff line number Diff line
@@ -533,6 +533,12 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); 
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);



unsigned long kvm_arm_num_sys_reg_descs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);

int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);



int __kvm_arm_vcpu_get_events(struct kvm_vcpu *vcpu,

			      struct kvm_vcpu_events *events);
@@ -595,6 +601,17 @@ void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot); 
int handle_exit(struct kvm_vcpu *vcpu, int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);



int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu);



void kvm_reset_sys_regs(struct kvm_vcpu *vcpu);



void kvm_sys_reg_table_init(void);



/* MMIO helpers */

void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);

arch/arm64/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/kvm_asm.h>

#include <asm/kvm_mmu.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_coproc.h>

#include <asm/sections.h>



#include <kvm/arm_hypercalls.h>
@@ -1525,7 +1524,7 @@ static int init_subsystems(void) 
		goto out;



	kvm_perf_init();

	kvm_coproc_table_init();

	kvm_sys_reg_table_init();



out:

	on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);

arch/arm64/kvm/guest.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/fpsimd.h>

#include <asm/kvm.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_coproc.h>

#include <asm/sigcontext.h>



#include "trace.h"

arch/arm64/kvm/handle_exit.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/esr.h>

#include <asm/exception.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_coproc.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_mmu.h>

#include <asm/debug-monitors.h>