Commit efbc7417 authored by yangxiangkai's avatar yangxiangkai
Browse files

virtcca bugfix: compile warning clean 

virtcca inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0E6P



--------------------------------

VirtCCA compile warning clean: Excess-function-parameter in
find_arm_smmu_domain, Function-parameter-or-member not described
in find_arm_smmu_domain, no-previous-prototype for function
kvm_cvm_create_dev_ttt_levels

Fixes: 6ae1290a ("virtcca feature: vfio driver dma map")

Signed-off-by: default avataryangxiangkai <yangxiangkai@huawei.com>
parent 91b1e9a1

arch/arm64/include/asm/kvm_tmi.h

+0 −4
Original line number Diff line number Diff line
@@ -366,10 +366,6 @@ static inline bool is_armv8_4_sel2_present(void) 
			ID_AA64PFR0_SEL2_MASK) == 1UL;

}



#ifndef CONFIG_ARM_PMU

#define arm_pmu_set_phys_irq(x)	do {} while (0)

#endif



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);

arch/arm64/kvm/virtcca_cvm.c

+2 −5
Original line number Diff line number Diff line
@@ -960,11 +960,8 @@ static int kvm_cvm_dev_ttt_create(struct virtcca_cvm *cvm, 
}



/* CVM create ttt level information about device */

int kvm_cvm_create_dev_ttt_levels(struct kvm *kvm, struct virtcca_cvm *cvm,

			unsigned long ipa,

			int level,

			int max_level,

			struct kvm_mmu_memory_cache *mc)

static int kvm_cvm_create_dev_ttt_levels(struct kvm *kvm, struct virtcca_cvm *cvm,

	unsigned long ipa, int level, int max_level, struct kvm_mmu_memory_cache *mc)

{

	int ret = 0;

include/linux/perf/arm_pmu.h

+6 −4
Original line number Diff line number Diff line
@@ -167,10 +167,6 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn); 
static inline int arm_pmu_acpi_probe(armpmu_init_fn init_fn) { return 0; }

#endif



#ifdef CONFIG_HISI_VIRTCCA_HOST

void arm_pmu_set_phys_irq(bool enable);

#endif



#ifdef CONFIG_KVM

void kvm_host_pmu_init(struct arm_pmu *pmu);

#else
@@ -190,6 +186,12 @@ void armpmu_free_irq(int irq, int cpu); 


#endif /* CONFIG_ARM_PMU */



#if defined(CONFIG_ARM_PMU) && defined(CONFIG_HISI_VIRTCCA_HOST)

void arm_pmu_set_phys_irq(bool enable);

#else

#define arm_pmu_set_phys_irq(x)	do {} while (0)

#endif



#define ARMV8_SPE_PDEV_NAME "arm,spe-v1"

#define ARMV8_TRBE_PDEV_NAME "arm,trbe"

virt/kvm/vfio.c

+3 −3
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void kvm_vfio_ops_exit(void) 
 * cvm_vfio_add_kvm_to_smmu_domain - Bind the confidential

 * virtual machine to smmu domain

 * @filp: The handle of file

 * @kvm: The kvm belone to confidential virtual machine

 * @kv: The kvm_vfio belong to confidential virtual machine

 *

 * Returns:

 * %-ENXIO if set kvm failed or iommu group is null
@@ -512,8 +512,8 @@ EXPORT_SYMBOL_GPL(virtcca_arm_smmu_get_kvm); 


/**

 * find_arm_smmu_domain - Find smmu domain list from kvm vfio file

 * @kvf: Kvm vfio file

 * @smmu_domain_group_list: List of smmu domain group

 * @dev: The handle of device

 * @data: List of smmu domain group

 */

int find_arm_smmu_domain(struct device *dev, void *data)

{