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

Commit fb848db3 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic-new: Add GICv2 MMIO handling framework 



Create vgic-mmio-v2.c to describe GICv2 emulation specific handlers
using the initializer macros provided by the VGIC MMIO framework.
Provide a function to register the GICv2 distributor registers to
the kvm_io_bus framework.
The actual handler functions are still stubs in this patch.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 4493b1c4

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

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * VGICv2 MMIO handling functions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/irqchip/arm-gic.h>

#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include <kvm/iodev.h>

#include <kvm/arm_vgic.h>



#include "vgic.h"

#include "vgic-mmio.h"



static const struct vgic_register_region vgic_v2_dist_registers[] = {

	REGISTER_DESC_WITH_LENGTH(GIC_DIST_CTRL,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 12,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_IGROUP,

		vgic_mmio_read_rao, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ENABLE_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ENABLE_CLEAR,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_CLEAR,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_CLEAR,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 1,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PRI,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 8,

		VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_TARGET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 8,

		VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),

	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_CONFIG,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 2,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GIC_DIST_SOFTINT,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 4,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GIC_DIST_SGI_PENDING_CLEAR,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 16,

		VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),

	REGISTER_DESC_WITH_LENGTH(GIC_DIST_SGI_PENDING_SET,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 16,

		VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),

};



unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev)

{

	dev->regions = vgic_v2_dist_registers;

	dev->nr_regions = ARRAY_SIZE(vgic_v2_dist_registers);



	kvm_iodevice_init(&dev->dev, &kvm_io_gic_ops);



	return SZ_4K;

}

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

+26 −0
Original line number Diff line number Diff line
@@ -182,3 +182,29 @@ struct kvm_io_device_ops kvm_io_gic_ops = { 
	.read = dispatch_mmio_read,

	.write = dispatch_mmio_write,

};



int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address,

			     enum vgic_type type)

{

	struct vgic_io_device *io_device = &kvm->arch.vgic.dist_iodev;

	int ret = 0;

	unsigned int len;



	switch (type) {

	case VGIC_V2:

		len = vgic_v2_init_dist_iodev(io_device);

		break;

	default:

		BUG_ON(1);

	}



	io_device->base_addr = dist_base_address;

	io_device->redist_vcpu = NULL;



	mutex_lock(&kvm->slots_lock);

	ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, dist_base_address,

				      len, &io_device->dev);

	mutex_unlock(&kvm->slots_lock);



	return ret;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -96,4 +96,6 @@ unsigned long vgic_mmio_read_rao(struct kvm_vcpu *vcpu, 
void vgic_mmio_write_wi(struct kvm_vcpu *vcpu, gpa_t addr,

			unsigned int len, unsigned long val);



unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev);



#endif

virt/kvm/arm/vgic/vgic.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu); 
void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);

void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr);

void vgic_v2_set_underflow(struct kvm_vcpu *vcpu);

int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address,

			     enum vgic_type);



#ifdef CONFIG_KVM_ARM_VGIC_V3

void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu);