Commit 96e90389 authored by Ricardo Koller's avatar Ricardo Koller Committed by Marc Zyngier
Browse files

KVM: arm64: vgic: Drop vgic_check_ioaddr() 



There are no more users of vgic_check_ioaddr(). Move its checks to
vgic_check_iorange() and then remove it.

Signed-off-by: default avatarRicardo Koller <ricarkol@google.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211005011921.437353-6-ricarkol@google.com
parent 2ec02f6c

arch/arm64/kvm/vgic/vgic-kvm-device.c

+4 −22
Original line number Diff line number Diff line
@@ -14,38 +14,20 @@ 


/* common helpers */



int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr,

		      phys_addr_t addr, phys_addr_t alignment)

{

	if (addr & ~kvm_phys_mask(kvm))

		return -E2BIG;



	if (!IS_ALIGNED(addr, alignment))

		return -EINVAL;



	if (!IS_VGIC_ADDR_UNDEF(*ioaddr))

		return -EEXIST;



	return 0;

}



int vgic_check_iorange(struct kvm *kvm, phys_addr_t ioaddr,

		       phys_addr_t addr, phys_addr_t alignment,

		       phys_addr_t size)

{

	int ret;



	ret = vgic_check_ioaddr(kvm, &ioaddr, addr, alignment);

	if (ret)

		return ret;

	if (!IS_VGIC_ADDR_UNDEF(ioaddr))

		return -EEXIST;



	if (!IS_ALIGNED(size, alignment))

	if (!IS_ALIGNED(addr, alignment) || !IS_ALIGNED(size, alignment))

		return -EINVAL;



	if (addr + size < addr)

		return -EINVAL;



	if (addr + size > kvm_phys_size(kvm))

	if (addr & ~kvm_phys_mask(kvm) || addr + size > kvm_phys_size(kvm))

		return -E2BIG;



	return 0;

arch/arm64/kvm/vgic/vgic.h

+0 −3
Original line number Diff line number Diff line
@@ -172,9 +172,6 @@ void vgic_kick_vcpus(struct kvm *kvm); 
void vgic_irq_handle_resampling(struct vgic_irq *irq,

				bool lr_deactivated, bool lr_pending);



int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr,

		      phys_addr_t addr, phys_addr_t alignment);



int vgic_check_iorange(struct kvm *kvm, phys_addr_t ioaddr,

		       phys_addr_t addr, phys_addr_t alignment,

		       phys_addr_t size);