shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: KVM: arm64: vgic: Drop vgic_check_ioaddr()

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

Signed-off-by: Ricardo Koller <ricarkol@google.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211005011921.437353-6-ricarkol@google.com
(cherry picked from commit 96e9038969)
Bug: 204960018
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib6716c451f76bd80d7596f2c9837df4f2ecfcf7a
This commit is contained in:
Ricardo Koller
2021-10-04 18:19:15 -07:00
committed by Will Deacon
parent 3f1fe7fc1e
commit ed0f76e844
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm64/kvm/vgic/vgic-kvm-device.c
View File

@@ -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;
if (!IS_VGIC_ADDR_UNDEF(ioaddr))
return -EEXIST;
ret = vgic_check_ioaddr(kvm, &ioaddr, addr, alignment);
if (ret)
return ret;
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;

3
arch/arm64/kvm/vgic/vgic.h
View File

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