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

Commit 9d5fcb9d authored by Eric Auger's avatar Eric Auger Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Fix vGICv2 KVM_DEV_ARM_VGIC_GRP_CPU/DIST_REGS 



For VGICv2 save and restore the CPU interface registers
are accessed. Restore the modality which has been altered.
Also explicitly set the iodev_type for both the DIST and CPU
interface.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 0e4e82f1

virt/kvm/arm/vgic/vgic-mmio-v2.c

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ int vgic_v2_cpuif_uaccess(struct kvm_vcpu *vcpu, bool is_write, 
	struct vgic_io_device dev = {

		.regions = vgic_v2_cpu_registers,

		.nr_regions = ARRAY_SIZE(vgic_v2_cpu_registers),

		.iodev_type = IODEV_CPUIF,

	};



	return vgic_uaccess(vcpu, &dev, is_write, offset, val);
@@ -448,6 +449,7 @@ int vgic_v2_dist_uaccess(struct kvm_vcpu *vcpu, bool is_write, 
	struct vgic_io_device dev = {

		.regions = vgic_v2_dist_registers,

		.nr_regions = ARRAY_SIZE(vgic_v2_dist_registers),

		.iodev_type = IODEV_DIST,

	};



	return vgic_uaccess(vcpu, &dev, is_write, offset, val);

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

+3 −1
Original line number Diff line number Diff line
@@ -484,7 +484,8 @@ static int dispatch_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 


	switch (iodev->iodev_type) {

	case IODEV_CPUIF:

		return 1;

		data = region->read(vcpu, addr, len);

		break;

	case IODEV_DIST:

		data = region->read(vcpu, addr, len);

		break;
@@ -517,6 +518,7 @@ static int dispatch_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 


	switch (iodev->iodev_type) {

	case IODEV_CPUIF:

		region->write(vcpu, addr, len, data);

		break;

	case IODEV_DIST:

		region->write(vcpu, addr, len, data);