[PATCH 4/5] irqchip/gic-v3: Parse and export virtual GIC information
From: Julien Grall <hidden>
Date: 2016-02-08 16:49:00
Also in:
kvm, kvmarm, lkml
Subsystem:
arm generic interrupt controller drivers, irqchip drivers, the rest · Maintainers:
Marc Zyngier, Thomas Gleixner, Linus Torvalds
Fill up the recently introduced gic_kvm_info with the virtual GIC information. Signed-off-by: Julien Grall <redacted> --- Cc: Thomas Gleixner <redacted> Cc: Jason Cooper <redacted> Cc: Marc Zyngier <redacted> drivers/irqchip/irq-gic-v3.c | 43 ++++++++++++++++++++++++++++++++++ include/linux/irqchip/arm-gic-common.h | 1 + 2 files changed, 44 insertions(+)
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index d7be6dd..35f11ce 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c@@ -26,6 +26,7 @@ #include <linux/slab.h> #include <linux/irqchip.h> +#include <linux/irqchip/arm-gic-common.h> #include <linux/irqchip/arm-gic-v3.h> #include <asm/cputype.h>
@@ -53,6 +54,8 @@ struct gic_chip_data { static struct gic_chip_data gic_data __read_mostly; static struct static_key supports_deactivate = STATIC_KEY_INIT_TRUE; +static struct gic_kvm_info gic_v3_kvm_info; + #define gic_data_rdist() (this_cpu_ptr(gic_data.rdists.rdist)) #define gic_data_rdist_rd_base() (gic_data_rdist()->rd_base) #define gic_data_rdist_sgi_base() (gic_data_rdist_rd_base() + SZ_64K)
@@ -811,6 +814,44 @@ static void gicv3_enable_quirks(void) #endif } +static void __init gic_of_setup_kvm_info(struct device_node *node) +{ + int ret; + struct resource r; + u32 gicv_idx; + unsigned int irq; + + gic_v3_kvm_info.type = GIC_V3; + + irq = irq_of_parse_and_map(node, 0); + if (!irq) + gic_v3_kvm_info.maint_irq = -1; + else + gic_v3_kvm_info.maint_irq = irq; + + if (of_property_read_u32(node, "#redistributor-regions", + &gicv_idx)) + gicv_idx = 1; + + gicv_idx += 3; /* Also skip GICD, GICC, GICH */ + ret = of_address_to_resource(node, gicv_idx, &r); + if (!ret) { + if (!PAGE_ALIGNED(r.start)) + pr_warn("GICV physical address 0x%llx not page aligned\n", + (unsigned long long)r.start); + else if (!PAGE_ALIGNED(resource_size(&r))) + pr_warn("GICV size 0x%llx not a multiple of page size 0x%lx\n", + (unsigned long long)resource_size(&r), + PAGE_SIZE); + else { + gic_v3_kvm_info.vcpu_base = r.start; + gic_v3_kvm_info.vcpu_size = resource_size(&r); + } + } + + gic_set_kvm_info(&gic_v3_kvm_info); +} + static int __init gic_of_init(struct device_node *node, struct device_node *parent) { void __iomem *dist_base;
@@ -908,6 +949,8 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare gic_cpu_init(); gic_cpu_pm_init(); + gic_of_setup_kvm_info(node); + return 0; out_free:
diff --git a/include/linux/irqchip/arm-gic-common.h b/include/linux/irqchip/arm-gic-common.h
index 30972b1..bfb10d0 100644
--- a/include/linux/irqchip/arm-gic-common.h
+++ b/include/linux/irqchip/arm-gic-common.h@@ -14,6 +14,7 @@ enum gic_type { GIC_V2, + GIC_V3, }; struct gic_kvm_info {
--
1.9.1