Unverified Commit 92add5ff authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14130 [virtcca] delete unused interfaces: tmi_data_destroy and tmi_ttt_unmap_range 

Merge Pull Request from: @restricted-band-tree 
 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/14130

 

Reviewed-by: default avatarHe Jingxian <hejingxian@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents aed150e2 406deb27

arch/arm64/include/asm/kvm_tmi.h

+0 −2
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ static inline bool is_armv8_4_sel2_present(void) 


u64 tmi_version(void);

u64 tmi_data_create(u64 data, u64 rd, u64 map_addr, u64 src, u64 level);

u64 tmi_data_destroy(u64 rd, u64 map_addr, u64 level);

u64 tmi_cvm_activate(u64 rd);

u64 tmi_cvm_create(u64 params_ptr, u64 numa_set);

u64 tmi_cvm_destroy(u64 rd);
@@ -393,7 +392,6 @@ u64 tmi_ttt_create(u64 numa_set, u64 rd, u64 map_addr, u64 level); 
u64 tmi_psci_complete(u64 calling_tec, u64 target_tec);

u64 tmi_features(u64 index);

u64 tmi_ttt_map_range(u64 rd, u64 map_addr, u64 size, u64 cur_node, u64 target_node);

u64 tmi_ttt_unmap_range(u64 rd, u64 map_addr, u64 size, u64 node_id);

u64 tmi_mem_info_show(u64 mem_info_addr);



u64 tmi_dev_ttt_create(u64 numa_set, u64 rd, u64 map_addr, u64 level);

arch/arm64/kvm/tmi.c

+0 −15
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ u64 tmi_data_create(u64 numa_set, u64 rd, u64 map_addr, u64 src, u64 level) 
	return res.a1;

}



u64 tmi_data_destroy(u64 rd, u64 map_addr, u64 level)

{

	struct arm_smccc_res res;



	arm_smccc_1_1_smc(TMI_TMM_DATA_DESTROY, rd, map_addr, level, &res);

	return res.a1;

}



u64 tmi_cvm_activate(u64 rd)

{
@@ -151,14 +144,6 @@ u64 tmi_ttt_map_range(u64 rd, u64 map_addr, u64 size, u64 cur_node, u64 target_n 
	return res.a1;

}



u64 tmi_ttt_unmap_range(u64 rd, u64 map_addr, u64 size, u64 node_id)

{

	struct arm_smccc_res res;



	arm_smccc_1_1_smc(TMI_TMM_TTT_UNMAP_RANGE, rd, map_addr, size, node_id, &res);

	return res.a1;

}



/* Used to create smmu command queue and event queue */

u64 tmi_smmu_queue_create(u64 params_ptr)

{

arch/arm64/kvm/virtcca_cvm.c

+5 −0
Original line number Diff line number Diff line
@@ -735,6 +735,11 @@ int kvm_tec_enter(struct kvm_vcpu *vcpu) 
	if (READ_ONCE(cvm->state) != CVM_STATE_ACTIVE)

		return -EINVAL;



	if (cpumask_weight(&current->cpus_mask) > 1) {

		kvm_err("cvm only support running with binding cpu\n");

		return -EINVAL;

	}



	run = tec->tec_run;

	/* set/clear TWI TWE flags */

	if (vcpu->arch.hcr_el2 & HCR_TWI)