From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH v6 27/31] xen/arm: ITS: Route LPIs Date: Mon, 31 Aug 2015 16:36:44 +0530 Message-ID: <1441019208-2764-28-git-send-email-vijay.kilari@gmail.com> References: <1441019208-2764-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: <1441019208-2764-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 , manish.jaggi@caviumnetworks.com, vijay.kilari@gmail.com List-Id: xen-devel@lists.xenproject.org From: Vijaya Kumar K Allocate and initialize irq descriptor for LPIs and route LPIs to guest For LPIs deactivation is not required. Hence GICH_LR.HW is not required to set. Signed-off-by: Vijaya Kumar K --- v6: - Moved ITS specific code from irq.c to vgic.c and introduced vgic_vcpu_raise_lpi() - Renamed gicv3_set_properties to gicv3_set_irq_properties - Always Inject LPI to vcpu0 - Changed route_lpi_to_guest definition --- xen/arch/arm/gic-v3-its.c | 17 ++++++- xen/arch/arm/gic-v3.c | 16 ++++-- xen/arch/arm/gic.c | 32 +++++++++++- xen/arch/arm/irq.c | 112 ++++++++++++++++++++++++++++++++++++++--- xen/arch/arm/vgic-v3-its.c | 2 +- xen/arch/arm/vgic-v3.c | 41 +++++++++++++-- xen/arch/arm/vgic.c | 64 +++++++++++++++++++++++ xen/include/asm-arm/gic-its.h | 3 ++ xen/include/asm-arm/gic.h | 7 ++- xen/include/asm-arm/irq.h | 2 + xen/include/asm-arm/vgic.h | 3 ++ 11 files changed, 278 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c index d9ec044..e825d1e 100644 --- a/xen/arch/arm/gic-v3-its.c +++ b/xen/arch/arm/gic-v3-its.c @@ -464,6 +464,21 @@ static void its_flush_and_invalidate_prop(struct irq_desc *desc, u8 *cfg) its_send_inv(its_dev, vid); } +void its_set_lpi_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + unsigned long flags; + u8 *cfg; + + spin_lock_irqsave(&its_lock, flags); + cfg = gic_rdists->prop_page + desc->irq - FIRST_GIC_LPI; + *cfg = (*cfg & 3) | (priority & LPI_PRIORITY_MASK) ; + + its_flush_and_invalidate_prop(desc, cfg); + spin_unlock_irqrestore(&its_lock, flags); +} + static void its_set_lpi_state(struct irq_desc *desc, int enable) { u8 *cfg; @@ -869,7 +884,7 @@ int its_assign_device(struct domain *d, u32 vdevid, u32 pdevid) ASSERT(i < gic_nr_event_ids()); plpi = its_get_plpi(pdev, i); - /* TODO: Route lpi */ + route_lpi_to_guest(d, plpi, "LPI"); } return 0; diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 538f9f4..9260c6d 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -471,9 +471,9 @@ static inline uint64_t gicv3_mpidr_to_affinity(int cpu) MPIDR_AFFINITY_LEVEL(mpidr, 0)); } -static void gicv3_set_irq_properties(struct irq_desc *desc, - const cpumask_t *cpu_mask, - unsigned int priority) +static void gicv3_set_line_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) { uint32_t cfg, actual, edgebit; uint64_t affinity; @@ -532,6 +532,16 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, spin_unlock(&gicv3.lock); } +static void gicv3_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + if ( gic_is_lpi(desc->irq) ) + its_set_lpi_properties(desc, cpu_mask, priority); + else + gicv3_set_line_properties(desc, cpu_mask, priority); +} + static void __init gicv3_dist_init(void) { uint32_t type; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 2f23a14..d91623a 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -71,11 +71,18 @@ bool_t gic_is_lpi(unsigned int irq) bool_t gic_is_lpi(unsigned int irq) { return 0; } #endif +/* Returns number of PPIs/SGIs/SPIs supported */ unsigned int gic_number_lines(void) { return gic_hw_ops->info->nr_lines; } +/* Validates PPIs/SGIs/SPIs/LPIs supported */ +bool_t gic_is_valid_irq(unsigned int irq) +{ + return (irq < gic_hw_ops->info->nr_lines || gic_is_lpi(irq)); +} + bool_t gic_lpi_supported(void) { return gic_hw_ops->info->lpi_supported; @@ -143,7 +150,8 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { ASSERT(priority <= 0xff); /* Only 8 bits of priority */ - ASSERT(desc->irq < gic_number_lines());/* Can't route interrupts that don't exist */ + /* Can't route interrupts that don't exist */ + ASSERT(gic_is_valid_irq(desc->irq)); ASSERT(test_bit(_IRQ_DISABLED, &desc->status)); ASSERT(spin_is_locked(&desc->lock)); @@ -192,6 +200,26 @@ out: return res; } +int gic_route_lpi_to_guest(struct domain *d, struct irq_desc *desc, + unsigned int priority) +{ + ASSERT(spin_is_locked(&desc->lock)); + + desc->handler = get_guest_hw_irq_controller(desc->irq); + set_bit(_IRQ_GUEST, &desc->status); + + /* Set cpumask to current processor */ + gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), priority); + + /* + * Enable LPI by default. Each pLPI is enabled and routed + * when device is assigned. + */ + desc->handler->enable(desc); + + return 0; +} + /* This function only works with SPIs for now */ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, struct irq_desc *desc) @@ -672,7 +700,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1020) ) + if ( likely((irq >= 16 && irq < 1020) || gic_is_lpi(irq)) ) { local_irq_enable(); do_IRQ(regs, irq, is_fiq); diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 2a37521..7ba90d1 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -214,7 +214,7 @@ int request_irq(unsigned int irq, unsigned int irqflags, * which interrupt is which (messes up the interrupt freeing * logic etc). */ - if ( irq >= nr_irqs ) + if ( !gic_is_valid_irq(irq) ) return -EINVAL; if ( !handler ) return -EINVAL; @@ -272,11 +272,16 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) set_bit(_IRQ_INPROGRESS, &desc->status); - /* - * The irq cannot be a PPI, we only support delivery of SPIs to - * guests. - */ - vgic_vcpu_inject_spi(info->d, info->virq); +#ifdef HAS_GICV3 + if ( gic_is_lpi(irq) ) + vgic_vcpu_raise_lpi(info->d, desc); + else +#endif + /* + * The irq cannot be a PPI, we only support delivery of SPIs to + * guests + */ + vgic_vcpu_inject_spi(info->d, info->virq); goto out_no_end; } @@ -361,6 +366,9 @@ void release_irq(unsigned int irq, const void *dev_id) /* Wait to make sure it's not being used on another CPU */ do { smp_mb(); } while ( test_bit(_IRQ_INPROGRESS, &desc->status) ); + if ( gic_is_lpi(irq) ) + xfree(desc->msi_desc); + if ( action->free_on_release ) xfree(action); } @@ -442,9 +450,97 @@ err: bool_t is_assignable_irq(unsigned int irq) { - /* For now, we can only route SPIs to the guest */ - return ((irq >= NR_LOCAL_IRQS) && (irq < gic_number_lines())); + /* For now, we can only route SPI/LPIs to the guest */ + return (((irq >= NR_LOCAL_IRQS) && (irq < gic_number_lines())) || + gic_is_lpi(irq)); +} + +#ifdef HAS_GICV3 +/* + * Route an LPI to a specific guest. + */ +int route_lpi_to_guest(struct domain *d, unsigned int plpi, const char *devname) +{ + struct irqaction *action; + struct irq_guest *info; + struct irq_desc *desc; + unsigned long flags; + int retval = 0; + + if ( !gic_is_lpi(plpi) ) + { + printk(XENLOG_G_ERR "Only LPI can be routed \n"); + return -EINVAL; + } + + action = xmalloc(struct irqaction); + if ( !action ) + return -ENOMEM; + + info = xmalloc(struct irq_guest); + if ( !info ) + { + xfree(action); + return -ENOMEM; + } + info->d = d; + + action->dev_id = info; + action->name = devname; + action->free_on_release = 1; + + desc = irq_to_desc(plpi); + spin_lock_irqsave(&desc->lock, flags); + + ASSERT(desc->msi_desc != NULL); + + if ( desc->arch.type == DT_IRQ_TYPE_INVALID ) + { + printk(XENLOG_G_ERR "LPI %u has not been configured\n", plpi); + retval = -EIO; + goto out; + } + + /* If the IRQ is already used by same domain, do not setup again.*/ + if ( desc->action != NULL ) + { + struct domain *ad = irq_get_domain(desc); + + if ( test_bit(_IRQ_GUEST, &desc->status) && d == ad ) + { + printk(XENLOG_G_ERR + "d%u: LPI %u is already assigned to domain %u\n", + d->domain_id, plpi, d->domain_id); + retval = -EBUSY; + goto out; + } + } + + retval = __setup_irq(desc, 0, action); + if ( retval ) + goto out; + + retval = gic_route_lpi_to_guest(d, desc, GIC_PRI_IRQ); + + spin_unlock_irqrestore(&desc->lock, flags); + + if ( retval ) + { + release_irq(desc->irq, info); + goto free_info; + } + + return 0; + +out: + spin_unlock_irqrestore(&desc->lock, flags); + xfree(action); +free_info: + xfree(info); + + return retval; } +#endif /* * Route an IRQ to a specific guest. diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 1d1fd64..6334ca3 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -358,7 +358,7 @@ static int vits_process_int(struct vcpu *v, struct vgic_its *vits, DPRINTK("%pv: vITS: INT: Device 0x%"PRIx32" id %"PRIu32"\n", v, dev_id, event); - /* TODO: Inject LPI */ + vgic_vcpu_inject_lpi(v->domain, dev_id, event); return 0; } diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index dd7dc32..f69f323 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1439,14 +1439,45 @@ static const struct mmio_handler_ops vgic_distr_mmio_handler = { static int vgic_v3_get_irq_priority(struct vcpu *v, unsigned int irq) { - int priority; + int priority = 0; unsigned long flags; - struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + struct vgic_irq_rank *rank; - vgic_lock_rank(v, rank, flags); - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, + if ( !gic_is_lpi(irq) ) + { + rank = vgic_rank_irq(v, irq); + + vgic_lock_rank(v, rank, flags); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); - vgic_unlock_rank(v, rank, flags); + vgic_unlock_rank(v, rank, flags); + } + else if ( vgic_is_domain_lpi(v->domain, irq) ) + { + struct vgic_its *vits = v->domain->arch.vgic.vits; + + /* + * Guest can receive LPI before availability of LPI property table. + * Hence assert is wrong. + * TODO: Handle LPI which is valid and does not have LPI property + * table entry and remove below assert. + */ + ASSERT(irq < vits->prop_size); + + spin_lock_irqsave(&vits->prop_lock, flags); + /* + * LPI property table always starts from 0 and LPI information + * is availeble above 8192 index. + * So, We don't subtract FIRST_GIC_LPI from irq value. + */ + priority = *((u8*)vits->prop_page + irq); + /* + * Bits[7:2] specify priority with bits[1:0] of priority + * is set to zero. Hence only mask bits[7:2] + */ + priority &= LPI_PRIORITY_MASK; + spin_unlock_irqrestore(&vits->prop_lock, flags); + } return priority; } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 6e7ae9e..e7341f5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -30,6 +30,7 @@ #include #include +#include #include static inline struct vgic_irq_rank *vgic_get_rank(struct vcpu *v, int rank) @@ -499,6 +500,69 @@ void vgic_vcpu_inject_spi(struct domain *d, unsigned int virq) vgic_vcpu_inject_irq(v, virq); } +#ifdef HAS_GICV3 +void vgic_vcpu_inject_lpi(struct domain *d, unsigned int vdevid, + unsigned int eventID) +{ + struct vdevice_table dt_entry; + struct vitt vitt_entry; + uint32_t col_id; + + if ( vits_get_vdevice_entry(d, vdevid, &dt_entry) ) + { + dprintk(XENLOG_WARNING, + "Failed to read dt entry for dev 0x%"PRIx32" ..dropping\n", + vdevid); + return; + } + + if ( dt_entry.vitt_ipa == INVALID_PADDR ) + { + dprintk(XENLOG_WARNING, + "Event %"PRId32" of dev 0x%"PRIx32" is invalid..dropping\n", + eventID, vdevid); + return; + } + + if ( vits_get_vitt_entry(d, vdevid, eventID, &vitt_entry) ) + { + dprintk(XENLOG_WARNING, + "Event %"PRId32" of dev 0x%"PRIx32" is invalid..dropping\n", + eventID, vdevid); + return; + } + + col_id = vitt_entry.vcollection; + + if ( !vitt_entry.valid || !is_valid_collection(d, col_id) || + !vgic_is_domain_lpi(d, vitt_entry.vlpi) ) + { + dprintk(XENLOG_WARNING, + "vlpi %"PRId32" for dev 0x%"PRIx32" is not valid..dropping\n", + vitt_entry.vlpi, vdevid); + return; + } + + /* + * We don't have vlpi to plpi mapping and hence we cannot + * have target on which corresponding vlpi is enabled. + * So for now we are always injecting vlpi on vcpu0. + * (See vgic_vcpu_inject_lpi() function) and so we get pending_irq + * structure on vcpu0. + * TODO: Get correct target vcpu + */ + vgic_vcpu_inject_irq(d->vcpu[0], vitt_entry.vlpi); +} + +void vgic_vcpu_raise_lpi(struct domain *d, struct irq_desc *desc) +{ + struct its_device *dev = irqdesc_get_its_device(desc); + unsigned int eventID = irqdesc_get_lpi_event(desc); + + vgic_vcpu_inject_lpi(d, dev->virt_device_id, eventID); +} +#endif + void arch_evtchn_inject(struct vcpu *v) { vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); diff --git a/xen/include/asm-arm/gic-its.h b/xen/include/asm-arm/gic-its.h index 11f1cd9..75a9c95 100644 --- a/xen/include/asm-arm/gic-its.h +++ b/xen/include/asm-arm/gic-its.h @@ -360,6 +360,9 @@ int its_init(struct rdist_prop *rdists); int its_cpu_init(void); int its_add_device(u32 devid, u32 nr_ites, struct dt_device_node *dt_its); int its_assign_device(struct domain *d, u32 vdevid, u32 pdevid); +void its_set_lpi_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority); int vits_access_guest_table(struct domain *d, paddr_t entry, void *addr, uint32_t size, bool_t set); int vits_domain_init(struct domain *d); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 2b26e28..abb8616 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -225,6 +225,9 @@ extern void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mas extern int gic_route_irq_to_guest(struct domain *, unsigned int virq, struct irq_desc *desc, unsigned int priority); +extern int gic_route_lpi_to_guest(struct domain *d, + struct irq_desc *desc, + unsigned int priority); /* Remove an IRQ passthrough to a guest */ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, @@ -281,8 +284,10 @@ extern void send_SGI_allbutself(enum gic_sgi sgi); /* print useful debug info */ extern void gic_dump_info(struct vcpu *v); -/* Number of interrupt lines */ +/* Number of interrupt lines (PPIs + SGIs + SPIs)*/ extern unsigned int gic_number_lines(void); +/* Check if irq is valid */ +bool_t gic_is_valid_irq(unsigned int irq); /* Number of event ids supported */ extern unsigned int gic_nr_event_ids(void); /* LPI support info */ diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index 437f99b..cf13d88 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -52,6 +52,8 @@ bool_t is_assignable_irq(unsigned int irq); void init_IRQ(void); void init_secondary_IRQ(void); +int route_lpi_to_guest(struct domain *d, unsigned int irq, + const char *devname); int route_irq_to_guest(struct domain *d, unsigned int virq, unsigned int irq, const char *devname); int release_guest_irq(struct domain *d, unsigned int irq); diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index e971cab..71ce6c3 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -322,6 +322,9 @@ extern int vcpu_vgic_init(struct vcpu *v); extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq); extern void vgic_vcpu_inject_spi(struct domain *d, unsigned int virq); +extern void vgic_vcpu_inject_lpi(struct domain *d, unsigned int devid, + unsigned int eventID); +extern void vgic_vcpu_raise_lpi(struct domain *d, struct irq_desc *desc); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct pending_irq *spi_to_pending(struct domain *d, unsigned int irq); -- 1.7.9.5