From patchwork Thu Apr 3 20:42:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27710 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5962C20490 for ; Thu, 3 Apr 2014 20:44:25 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id u57sf2400484wes.1 for ; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=BZmqFCeLbGKAS3mYd94yZRsSJqMkfwz+R6zM5dBLECQ=; b=XpcTKvWaW6ZDMpEoKbF2beaNTBqLb4XKCT7xWq2x6PNadSS/82REvGFTgHTfnsHLeD lY9+r58FjNgRDaKO14VGF1FJdtgP8MvQydMhHWlOp4qh/7mPCI2x5QKRb7fscVNkuwDr giGxIplsNDiIamYwlt7cZxD7FmZBi6iIZOZXgNsW+WHhbRl0J56rIE2t13g88VlrCejZ GXnop+n84N4StWpt0/DYUAteo4CteQNndPuLcpNmeV1Jsz490xxV59c3UqfhJ3o0VyZq IjnU+Y+sbthpaf0c2cC1snVd8sSwud65Ffz3B91il7SoI5mDaXOkns+voF25BFO+rGR/ Awgg== X-Gm-Message-State: ALoCoQlSO23+Fcaf8ycx5sOO9SVdnYt/RHPsjsiypdMwD76oBv0nO8WgqBMttb015p/givR6p68H X-Received: by 10.112.204.163 with SMTP id kz3mr2565281lbc.0.1396557864295; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.197 with SMTP id j63ls759617qgj.4.gmail; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr4643883vco.18.1396557864133; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id fv9si1409984vcb.128.2014.04.03.13.44.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 13:44:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so2455952vcb.11 for ; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) X-Received: by 10.58.161.101 with SMTP id xr5mr492247veb.36.1396557864023; Thu, 03 Apr 2014 13:44:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp59808vcv; Thu, 3 Apr 2014 13:44:22 -0700 (PDT) X-Received: by 10.140.105.181 with SMTP id c50mr9440146qgf.17.1396557846294; Thu, 03 Apr 2014 13:44:06 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e30si2638153qge.186.2014.04.03.13.44.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 03 Apr 2014 13:44:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WVoT8-0008Eq-Ri; Thu, 03 Apr 2014 20:42:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WVoT7-0008DZ-1C for xen-devel@lists.xenproject.org; Thu, 03 Apr 2014 20:42:37 +0000 Received: from [85.158.137.68:15679] by server-4.bemta-3.messagelabs.com id B0/39-17399-CB7CD335; Thu, 03 Apr 2014 20:42:36 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-9.tower-31.messagelabs.com!1396557755!4867262!1 X-Originating-IP: [209.85.212.172] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14937 invoked from network); 3 Apr 2014 20:42:35 -0000 Received: from mail-wi0-f172.google.com (HELO mail-wi0-f172.google.com) (209.85.212.172) by server-9.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 3 Apr 2014 20:42:35 -0000 Received: by mail-wi0-f172.google.com with SMTP id hi2so98771wib.5 for ; Thu, 03 Apr 2014 13:42:35 -0700 (PDT) X-Received: by 10.180.98.165 with SMTP id ej5mr14287394wib.33.1396557755003; Thu, 03 Apr 2014 13:42:35 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id t50sm14510572eev.28.2014.04.03.13.42.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Apr 2014 13:42:34 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 3 Apr 2014 21:42:01 +0100 Message-Id: <1396557727-19102-11-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396557727-19102-1-git-send-email-julien.grall@linaro.org> References: <1396557727-19102-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 10/16] xen/arm: IRQ: Don't need to have a specific function to route IRQ to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: When the IRQ is handling by Xen, the setup is done in 2 steps: - Route the IRQ to the current CPU and set priorities - Set up the handler For PPIs, these steps are called on every cpu. For SPIs, they are only called on the boot CPU. Dividing the setup in two step complicates the code when a new driver is added to Xen (for instance a SMMU driver). Xen can safely route the IRQ when the driver sets up the interrupt handler. Signed-off-by: Julien Grall --- Changes in v2: - Fix typo in commit message - s/SGI/SPI/ in comments - Rename gic_route_dt_irq into gic_route_irq_to_xen which is taking a desc now - Call setup_irq before initializing the GIC IRQ as the first one can fail. --- xen/arch/arm/gic.c | 63 +++++++------------------------------------- xen/arch/arm/irq.c | 24 ++++++++++++++++- xen/arch/arm/setup.c | 2 -- xen/arch/arm/smpboot.c | 2 -- xen/arch/arm/time.c | 11 -------- xen/include/asm-arm/gic.h | 10 +++---- xen/include/asm-arm/time.h | 3 --- 7 files changed, 36 insertions(+), 79 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 8c53e52..9127ecf 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -257,30 +257,20 @@ static void gic_set_irq_properties(unsigned int irq, bool_t level, spin_unlock(&gic.lock); } -/* Program the GIC to route an interrupt */ -static int gic_route_irq(unsigned int irq, bool_t level, - const cpumask_t *cpu_mask, unsigned int priority) +/* Program the GIC to route an interrupt to the host (eg Xen) + * - needs to be called with desc.lock held + */ +void gic_route_irq_to_xen(struct irq_desc *desc, bool_t level, + const cpumask_t *cpu_mask, unsigned int priority) { - struct irq_desc *desc = irq_to_desc(irq); - unsigned long flags; - ASSERT(priority <= 0xff); /* Only 8 bits of priority */ - ASSERT(irq < gic.lines); /* Can't route interrupts that don't exist */ - - if ( desc->action != NULL ) - return -EBUSY; - - spin_lock_irqsave(&desc->lock, flags); - - /* Disable interrupt */ - desc->handler->shutdown(desc); + ASSERT(desc->irq < gic.lines);/* Can't route interrupts that don't exist */ + ASSERT(desc->status & IRQ_DISABLED); + ASSERT(spin_is_locked(&desc->lock)); desc->handler = &gic_host_irq_type; - gic_set_irq_properties(irq, level, cpu_mask, priority); - - spin_unlock_irqrestore(&desc->lock, flags); - return 0; + gic_set_irq_properties(desc->irq, level, cpu_mask, priority); } /* Program the GIC to route an interrupt to a guest @@ -304,17 +294,6 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, p->desc = desc; } -/* Program the GIC to route an interrupt with a dt_irq */ -void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, - unsigned int priority) -{ - bool_t level; - - level = dt_irq_is_level_triggered(irq); - - gic_route_irq(irq->irq, level, cpu_mask, priority); -} - static void __init gic_dist_init(void) { uint32_t type; @@ -568,30 +547,6 @@ void gic_disable_cpu(void) spin_unlock(&gic.lock); } -void gic_route_ppis(void) -{ - /* GIC maintenance */ - gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), - GIC_PRI_IRQ); - /* Route timer interrupt */ - route_timer_interrupt(); -} - -void gic_route_spis(void) -{ - int seridx; - const struct dt_irq *irq; - - for ( seridx = 0; seridx <= SERHND_IDX; seridx++ ) - { - if ( (irq = serial_dt_irq(seridx)) == NULL ) - continue; - - gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), - GIC_PRI_IRQ); - } -} - static inline void gic_set_lr(int lr, struct pending_irq *p, unsigned int state) { diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 798353b..1262a9c 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -247,15 +247,37 @@ int setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) int rc; unsigned long flags; struct irq_desc *desc; + bool_t disabled = 0; desc = irq_to_desc(irq->irq); spin_lock_irqsave(&desc->lock, flags); + + disabled = (desc->action == NULL); + rc = __setup_irq(desc, new); + if ( rc ) + goto err; - if ( !rc ) + /* First time the IRQ is setup */ + if ( disabled ) + { + bool_t level; + + level = dt_irq_is_level_triggered(irq); + /* It's fine to use smp_processor_id() because: + * For PPI: irq_desc is banked + * For SPI: we don't care for now which CPU will receive the + * interrupt + * TODO: Handle case where SPI is setup on different CPU than + * the targeted CPU and the priority. + */ + gic_route_irq_to_xen(desc, level, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); desc->handler->startup(desc); + } +err: spin_unlock_irqrestore(&desc->lock, flags); return rc; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 0892a54..7b02282 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -718,8 +718,6 @@ void __init start_xen(unsigned long boot_phys_offset, init_IRQ(); - gic_route_ppis(); - gic_route_spis(); xsm_dt_init(); init_maintenance_interrupt(); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 7f28b68..cf149da 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -287,8 +287,6 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, init_secondary_IRQ(); - gic_route_ppis(); - init_maintenance_interrupt(); init_timer_interrupt(); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 7cad888..ce96337 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -218,17 +218,6 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq, 1); } -/* Route timer's IRQ on this CPU */ -void __cpuinit route_timer_interrupt(void) -{ - gic_route_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], - cpumask_of(smp_processor_id()), GIC_PRI_IRQ); - gic_route_dt_irq(&timer_irq[TIMER_HYP_PPI], - cpumask_of(smp_processor_id()), GIC_PRI_IRQ); - gic_route_dt_irq(&timer_irq[TIMER_VIRT_PPI], - cpumask_of(smp_processor_id()), GIC_PRI_IRQ); -} - /* Set up the timer interrupt on this CPU */ void __cpuinit init_timer_interrupt(void) { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 0e6e325..b750b17 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -167,15 +167,13 @@ extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); -/* Program the GIC to route an interrupt with a dt_irq */ -extern void gic_route_dt_irq(const struct dt_irq *irq, - const cpumask_t *cpu_mask, - unsigned int priority); +/* Program the GIC to route an interrupt */ +extern void gic_route_irq_to_xen(struct irq_desc *desc, bool_t level, + const cpumask_t *cpu_mask, + unsigned int priority); extern void gic_route_irq_to_guest(struct domain *, struct irq_desc *desc, bool_t level, const cpumask_t *cpu_mask, unsigned int priority); -extern void gic_route_ppis(void); -extern void gic_route_spis(void); extern void gic_inject(void); extern void gic_clear_pending_irqs(struct vcpu *v); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 9bbab0b..d544b5b 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -25,9 +25,6 @@ enum timer_ppi /* Get one of the timer IRQ number */ unsigned int timer_get_irq(enum timer_ppi ppi); -/* Route timer's IRQ on this CPU */ -extern void __cpuinit route_timer_interrupt(void); - /* Set up the timer interrupt on this CPU */ extern void __cpuinit init_timer_interrupt(void);