From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH v7 12/28] xen/arm: ITS: Plumbing hw_irq_controller for LPIs Date: Fri, 18 Sep 2015 18:38:59 +0530 Message-ID: <1442581755-2668-13-git-send-email-vijay.kilari@gmail.com> References: <1442581755-2668-1-git-send-email-vijay.kilari@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1442581755-2668-1-git-send-email-vijay.kilari@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian.Campbell@citrix.com, julien.grall@citrix.com, stefano.stabellini@eu.citrix.com, stefano.stabellini@citrix.com, tim@xen.org, xen-devel@lists.xen.org Cc: Prasun.Kapoor@caviumnetworks.com, Vijaya Kumar K , Zoltan Kiss , manish.jaggi@caviumnetworks.com, vijay.kilari@gmail.com List-Id: xen-devel@lists.xenproject.org From: Vijaya Kumar K Change callbacks gic_host_irq_type and gic_guest_irq_type to gic_get_host_irq_type and gic_get_guest_irq_type in gic_hw_operations, which returns hw_irq_controller based on irq type (SPI or LPI). Signed-off-by: Vijaya Kumar K CC: Zoltan Kiss --- xen/arch/arm/gic-hip04.c | 14 ++++++++++++-- xen/arch/arm/gic-v2.c | 14 ++++++++++++-- xen/arch/arm/gic-v3.c | 21 +++++++++++++++++++-- xen/arch/arm/gic.c | 14 ++++++++++++-- xen/include/asm-arm/gic-its.h | 2 ++ xen/include/asm-arm/gic.h | 4 ++-- 6 files changed, 59 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 398881b..f0a4c0b 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -630,6 +630,16 @@ static hw_irq_controller hip04gic_guest_irq_type = { .set_affinity = hip04gic_irq_set_affinity, }; +static hw_irq_controller *hip04gic_get_host_irq_type(unsigned int irq) +{ + return &hip04gic_host_irq_type; +} + +static hw_irq_controller *hip04gic_get_guest_irq_type(unsigned int irq) +{ + return &hip04gic_guest_irq_type; +} + static int __init hip04gic_init(void) { int res; @@ -712,8 +722,8 @@ const static struct gic_hw_operations hip04gic_ops = { .save_state = hip04gic_save_state, .restore_state = hip04gic_restore_state, .dump_state = hip04gic_dump_state, - .gic_host_irq_type = &hip04gic_host_irq_type, - .gic_guest_irq_type = &hip04gic_guest_irq_type, + .gic_get_host_irq_type = hip04gic_get_host_irq_type, + .gic_get_guest_irq_type = hip04gic_get_guest_irq_type, .eoi_irq = hip04gic_eoi_irq, .deactivate_irq = hip04gic_dir_irq, .read_irq = hip04gic_read_irq, diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 6673f29..a214f3b 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -616,6 +616,16 @@ static hw_irq_controller gicv2_guest_irq_type = { .set_affinity = gicv2_irq_set_affinity, }; +static hw_irq_controller *gicv2_get_host_irq_type(unsigned int irq) +{ + return &gicv2_host_irq_type; +} + +static hw_irq_controller *gicv2_get_guest_irq_type(unsigned int irq) +{ + return &gicv2_guest_irq_type; +} + static int __init gicv2_init(void) { int res; @@ -698,8 +708,8 @@ const static struct gic_hw_operations gicv2_ops = { .save_state = gicv2_save_state, .restore_state = gicv2_restore_state, .dump_state = gicv2_dump_state, - .gic_host_irq_type = &gicv2_host_irq_type, - .gic_guest_irq_type = &gicv2_guest_irq_type, + .gic_get_host_irq_type = gicv2_get_host_irq_type, + .gic_get_guest_irq_type = gicv2_get_guest_irq_type, .eoi_irq = gicv2_eoi_irq, .deactivate_irq = gicv2_dir_irq, .read_irq = gicv2_read_irq, diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 4f0b28b..c4c77a7 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -40,6 +40,7 @@ #include #include #include +#include #include /* Global state */ @@ -1156,6 +1157,22 @@ static const hw_irq_controller gicv3_guest_irq_type = { .set_affinity = gicv3_irq_set_affinity, }; +static hw_irq_controller *gicv3_get_host_irq_type(unsigned int irq) +{ + if ( gic_is_lpi(irq) ) + return &its_host_lpi_type; + + return &gicv3_host_irq_type; +} + +static hw_irq_controller *gicv3_get_guest_irq_type(unsigned int irq) +{ + if ( gic_is_lpi(irq) ) + return &its_guest_lpi_type; + + return &gicv3_guest_irq_type; +} + static int __init cmp_rdist(const void *a, const void *b) { const struct rdist_region *l = a, *r = a; @@ -1309,8 +1326,8 @@ static const struct gic_hw_operations gicv3_ops = { .save_state = gicv3_save_state, .restore_state = gicv3_restore_state, .dump_state = gicv3_dump_state, - .gic_host_irq_type = &gicv3_host_irq_type, - .gic_guest_irq_type = &gicv3_guest_irq_type, + .gic_get_host_irq_type = gicv3_get_host_irq_type, + .gic_get_guest_irq_type = gicv3_get_guest_irq_type, .eoi_irq = gicv3_eoi_irq, .deactivate_irq = gicv3_dir_irq, .read_irq = gicv3_read_irq, diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index a0ed7df..cefd8fc 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -104,6 +104,16 @@ void gic_restore_state(struct vcpu *v) gic_restore_pending_irqs(v); } +static inline hw_irq_controller *get_host_hw_irq_controller(unsigned int irq) +{ + return gic_hw_ops->gic_get_host_irq_type(irq); +} + +static inline hw_irq_controller *get_guest_hw_irq_controller(unsigned int irq) +{ + return gic_hw_ops->gic_get_guest_irq_type(irq); +} + /* * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init @@ -128,7 +138,7 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, ASSERT(test_bit(_IRQ_DISABLED, &desc->status)); ASSERT(spin_is_locked(&desc->lock)); - desc->handler = gic_hw_ops->gic_host_irq_type; + desc->handler = get_host_hw_irq_controller(desc->irq); gic_set_irq_properties(desc, cpu_mask, priority); } @@ -159,7 +169,7 @@ int gic_route_irq_to_guest(struct domain *d, unsigned int virq, test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) ) goto out; - desc->handler = gic_hw_ops->gic_guest_irq_type; + desc->handler = get_guest_hw_irq_controller(desc->irq); set_bit(_IRQ_GUEST, &desc->status); gic_set_irq_properties(desc, cpumask_of(v_target->processor), priority); diff --git a/xen/include/asm-arm/gic-its.h b/xen/include/asm-arm/gic-its.h index f5fba49..4455178 100644 --- a/xen/include/asm-arm/gic-its.h +++ b/xen/include/asm-arm/gic-its.h @@ -275,6 +275,8 @@ struct its_device { struct rb_node node; }; +extern const hw_irq_controller its_host_lpi_type; +extern const hw_irq_controller its_guest_lpi_type; void irqdesc_set_lpi_event(struct irq_desc *desc, unsigned id); unsigned int irqdesc_get_lpi_event(struct irq_desc *desc); struct its_device *irqdesc_get_its_device(struct irq_desc *desc); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index ce2279e..2073759 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -317,10 +317,10 @@ struct gic_hw_operations { void (*dump_state)(const struct vcpu *); /* hw_irq_controller to enable/disable/eoi host irq */ - hw_irq_controller *gic_host_irq_type; + hw_irq_controller *(*gic_get_host_irq_type)(unsigned int irq); /* hw_irq_controller to enable/disable/eoi guest irq */ - hw_irq_controller *gic_guest_irq_type; + hw_irq_controller *(*gic_get_guest_irq_type)(unsigned int irq); /* End of Interrupt */ void (*eoi_irq)(struct irq_desc *irqd); -- 1.7.9.5