new file mode 100644
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015, 2016 ARM Ltd.
+ * Imported from Linux ("new" KVM VGIC) and heavily adapted to Xen.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <xen/sched.h>
+#include <asm/new_vgic.h>
+
+#include "vgic.h"
+
+/* CREATION */
+
+/**
+ * domain_vgic_register: create a virtual GIC
+ * @d: domain pointer
+ * @mmio_count: pointer to add number of required MMIO regions
+ *
+ * was: kvm_vgic_create
+ */
+int domain_vgic_register(struct domain *d, int *mmio_count)
+{
+ switch ( d->arch.vgic.version )
+ {
+ case GIC_V2:
+ *mmio_count = 1;
+ break;
+ default:
+ BUG();
+ }
+
+ if ( d->max_vcpus > domain_max_vcpus(d) )
+ return -E2BIG;
+
+ d->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF;
+ d->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF;
+ d->arch.vgic.vgic_redist_base = VGIC_ADDR_UNDEF;
+
+ return 0;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
@@ -956,6 +956,28 @@ void vgic_sync_hardware_irq(struct domain *d,
spin_unlock_irqrestore(&desc->lock, flags);
}
+unsigned int domain_max_vcpus(const struct domain *d)
+{
+ unsigned int vgic_vcpu_limit;
+
+ switch ( d->arch.vgic.version )
+ {
+#ifdef CONFIG_HAS_GICV3
+ case GIC_V3:
+ vgic_vcpu_limit = VGIC_V3_MAX_CPUS;
+ break;
+#endif
+ case GIC_V2:
+ vgic_vcpu_limit = VGIC_V2_MAX_CPUS;
+ break;
+ default:
+ vgic_vcpu_limit = MAX_VIRT_CPUS;
+ break;
+ }
+
+ return min_t(unsigned int, MAX_VIRT_CPUS, vgic_vcpu_limit);
+}
+
/*
* Local variables:
* mode: C
@@ -20,6 +20,9 @@
#define PRODUCT_ID_XEN 0x58 /* ASCII code X */
#define IMPLEMENTER_ARM 0x43b
+#define VGIC_ADDR_UNDEF INVALID_PADDR
+#define IS_VGIC_ADDR_UNDEF(_x) ((_x) == VGIC_ADDR_UNDEF)
+
#define VGIC_PRI_BITS 5
#define vgic_irq_is_sgi(intid) ((intid) < VGIC_NR_SGIS)
This patch implements the function which is called by Xen when it wants to register the virtual GIC. This also implements domain_max_vcpus() for the new VGIC, which reports back the maximum number of VCPUs a certain GIC model supports. Signed-off-by: Andre Przywara <andre.przywara@linaro.org> --- Changelog RFC ... v1: - split off definition of domain_max_vcpus() xen/arch/arm/vgic/vgic-init.c | 60 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic/vgic.c | 22 ++++++++++++++++ xen/arch/arm/vgic/vgic.h | 3 +++ 3 files changed, 85 insertions(+) create mode 100644 xen/arch/arm/vgic/vgic-init.c