From: wanghaibin <wanghaibin.wang@huawei.com> Move the set_owner callback into irqchip_flow. It's not that useful an API anyway, and we should consider getting rid of it. Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: wanghaibin <wanghaibin.wang@huawei.com> --- arch/arm64/include/asm/kvm_irq.h | 4 ++++ arch/arm64/kvm/arch_timer.c | 2 +- arch/arm64/kvm/pmu-emul.c | 4 ++-- arch/arm64/kvm/vgic/vgic-init.c | 1 + arch/arm64/kvm/vgic/vgic.h | 1 + include/kvm/arm_vgic.h | 2 -- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 40fe9e826ee4..5665bb668c19 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -40,6 +40,7 @@ struct kvm_irqchip_flow { int (*irqchip_map_phys_irq)(struct kvm_vcpu *, unsigned int, u32, struct irq_ops *); int (*irqchip_unmap_phys_irq)(struct kvm_vcpu *, unsigned int); + int (*irqchip_set_owner)(struct kvm_vcpu *, unsigned int, void *); }; /* @@ -120,4 +121,7 @@ struct kvm_irqchip_flow { #define kvm_irqchip_unmap_phys_irq(v, ...) \ __vcpu_irqchip_action_ret((v), unmap_phys_irq, (v), __VA_ARGS__) +#define kvm_irqchip_set_owner(v, ...) \ + __vcpu_irqchip_action_ret((v), set_owner, (v), __VA_ARGS__) + #endif diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c index cb652edb04a7..5548d04b0bf9 100644 --- a/arch/arm64/kvm/arch_timer.c +++ b/arch/arm64/kvm/arch_timer.c @@ -1746,7 +1746,7 @@ static bool timer_irqs_are_valid(struct kvm_vcpu *vcpu) ctx = vcpu_get_timer(vcpu, i); irq = timer_irq(ctx); - if (kvm_vgic_set_owner(vcpu, irq, ctx)) + if (kvm_irqchip_set_owner(vcpu, irq, ctx)) break; /* diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 9b7c3cb9f76b..fdc27f16e157 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -859,8 +859,8 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) if (!kvm_arm_pmu_irq_initialized(vcpu)) return -ENXIO; - ret = kvm_vgic_set_owner(vcpu, vcpu->arch.pmu.irq_num, - &vcpu->arch.pmu); + ret = kvm_irqchip_set_owner(vcpu, vcpu->arch.pmu.irq_num, + &vcpu->arch.pmu); if (ret) return ret; } diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index e2667f8c5002..8e584fefe768 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -41,6 +41,7 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = { .irqchip_reset_mapped_irq = kvm_vgic_reset_mapped_irq, .irqchip_map_phys_irq = kvm_vgic_map_phys_irq, .irqchip_unmap_phys_irq = kvm_vgic_unmap_phys_irq, + .irqchip_set_owner = kvm_vgic_set_owner, }; /* diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index 612d161dc409..c759bef004ba 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -383,6 +383,7 @@ void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid); int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq, u32 vintid, struct irq_ops *ops); int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int vintid); +int kvm_vgic_set_owner(struct kvm_vcpu *vcpu, unsigned int intid, void *owner); int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu); diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 9bd83bc8e1aa..45a4d786b75a 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -481,8 +481,6 @@ static inline int kvm_vgic_get_max_vcpus(void) */ int kvm_vgic_setup_default_irq_routing(struct kvm *kvm); -int kvm_vgic_set_owner(struct kvm_vcpu *vcpu, unsigned int intid, void *owner); - struct kvm_kernel_irq_routing_entry; int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int irq, -- 2.33.0