Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9b51bb6 authored by Eric Auger's avatar Eric Auger Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic-its: Check CBASER/BASER validity before enabling the ITS 



The spec says it is UNPREDICTABLE to enable the ITS
if any of the following conditions are true:

- GITS_CBASER.Valid == 0.
- GITS_BASER<n>.Valid == 0, for any GITS_BASER<n> register
  where the Type field indicates Device.
- GITS_BASER<n>.Valid == 0, for any GITS_BASER<n> register
  where the Type field indicates Interrupt Collection and
  GITS_TYPER.HCC == 0.

In that case, let's keep the ITS disabled.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reported-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent f31b98b5

virt/kvm/arm/vgic/vgic-its.c

+11 −0
Original line number Diff line number Diff line
@@ -1466,6 +1466,16 @@ static void vgic_mmio_write_its_ctlr(struct kvm *kvm, struct vgic_its *its, 
{

	mutex_lock(&its->cmd_lock);



	/*

	 * It is UNPREDICTABLE to enable the ITS if any of the CBASER or

	 * device/collection BASER are invalid

	 */

	if (!its->enabled && (val & GITS_CTLR_ENABLE) &&

		(!(its->baser_device_table & GITS_BASER_VALID) ||

		 !(its->baser_coll_table & GITS_BASER_VALID) ||

		 !(its->cbaser & GITS_CBASER_VALID)))

		goto out;



	its->enabled = !!(val & GITS_CTLR_ENABLE);



	/*
@@ -1474,6 +1484,7 @@ static void vgic_mmio_write_its_ctlr(struct kvm *kvm, struct vgic_its *its, 
	 */

	vgic_its_process_commands(kvm, its);



out:

	mutex_unlock(&its->cmd_lock);

}