From patchwork Tue Apr 8 15:12:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 28009 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C819720447 for ; Tue, 8 Apr 2014 15:15:39 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rp16sf3327639pbb.9 for ; Tue, 08 Apr 2014 08:15:39 -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:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=inGf1DZ3NX76fUguU+rURY0kui5ksAf7oG/4Zz6c0Rg=; b=EFf+MeFU6O5yLmAVqlfuzN5RbZafRkgpAKLj0nnnVagpKw3zqGW1FRyGnAnGiN/Tf7 OO01pzLQ0h6Ubnk3wby/VtuRDnoOh2oIb7HT1lIi5aYMOIFdh6pd17nO8230repBeOa4 hC4xQIty3WGhlU2A93+C2kH1lw22oTuzhYKmyuC2xkYQqwGV0UF1ElGyXtNUvmxq2HyR 1D5VJNLFiG/aA1NuTejZMmUVUZq7uTgWEK8ZmJUA91gD6FU+RYygckb7Acix6GVeOyc+ nn6vuskXv+ildmz7kMMfDd2UUiXRgGm0qBvyUCg84xxSBeekTSdxcFEQ34H6j1CKvYZC 2Dzw== X-Gm-Message-State: ALoCoQmJyOrre5dQAN8ldvlCWZsJZ91Mrn0l0CutdSwZn78TowlN94RCrRcjd1GJVWIa90zTvV8Q X-Received: by 10.66.192.232 with SMTP id hj8mr2032627pac.2.1396970138918; Tue, 08 Apr 2014 08:15:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.69 with SMTP id e63ls243646qgd.29.gmail; Tue, 08 Apr 2014 08:15:38 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr3739401vcb.0.1396970138715; Tue, 08 Apr 2014 08:15:38 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id jb7si449764vec.89.2014.04.08.08.15.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 08:15:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so915999veb.32 for ; Tue, 08 Apr 2014 08:15:38 -0700 (PDT) X-Received: by 10.52.130.225 with SMTP id oh1mr3097628vdb.8.1396970138628; Tue, 08 Apr 2014 08:15:38 -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 v8csp254073vcv; Tue, 8 Apr 2014 08:15:38 -0700 (PDT) X-Received: by 10.229.176.72 with SMTP id bd8mr5338318qcb.12.1396970138011; Tue, 08 Apr 2014 08:15:38 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id b6si963490qae.237.2014.04.08.08.15.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 08:15:38 -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 1WXXih-0005Nh-1f; Tue, 08 Apr 2014 15:13:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXXif-0005KR-21 for xen-devel@lists.xensource.com; Tue, 08 Apr 2014 15:13:49 +0000 Received: from [85.158.143.35:54505] by server-1.bemta-4.messagelabs.com id 18/68-09853-C2214435; Tue, 08 Apr 2014 15:13:48 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1396970023!7802972!5 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8085 invoked from network); 8 Apr 2014 15:13:47 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2014 15:13:47 -0000 X-IronPort-AV: E=Sophos;i="4.97,818,1389744000"; d="scan'208";a="117915011" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 08 Apr 2014 15:12:52 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 8 Apr 2014 11:12:52 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WXXhj-0005Ms-Th; Tue, 08 Apr 2014 16:12:51 +0100 From: Stefano Stabellini To: Date: Tue, 8 Apr 2014 16:12:43 +0100 Message-ID: <1396969969-18973-6-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v7 06/12] xen/arm: keep track of the GICH_LR used for the irq in struct pending_irq 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: , 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: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 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: Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- Changes in v5: - don't print p->lr in case the irq is in lr_pending, as it doesn't have an LR associate to it; - improve packing of struct pending_irq; - #define GIC_INVALID_LR and use it instead of nr_lrs. --- xen/arch/arm/gic.c | 4 +++- xen/include/asm-arm/domain.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f1ce9b7..dd63f70 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -643,6 +643,7 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_PENDING, &p->status); + p->lr = lr; } static inline void gic_add_to_lr_pending(struct vcpu *v, struct pending_irq *n) @@ -721,6 +722,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) if ( p->desc != NULL ) p->desc->status &= ~IRQ_INPROGRESS; clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); + p->lr = GIC_INVALID_LR; if ( test_bit(GIC_IRQ_GUEST_PENDING, &p->status) && test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { @@ -974,7 +976,7 @@ void gic_dump_info(struct vcpu *v) list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight ) { - printk("Inflight irq=%d\n", p->irq); + printk("Inflight irq=%d lr=%u\n", p->irq, p->lr); } list_for_each_entry( p, &v->arch.vgic.lr_pending, lr_queue ) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bc20a15..2d94d59 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -21,7 +21,6 @@ struct vgic_irq_rank { struct pending_irq { - int irq; /* * The following two states track the lifecycle of the guest irq. * However because we are not sure and we don't want to track @@ -60,6 +59,9 @@ struct pending_irq #define GIC_IRQ_GUEST_ENABLED 2 unsigned long status; struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ + int irq; +#define GIC_INVALID_LR ~(uint8_t)0 + uint8_t lr; uint8_t priority; /* inflight is used to append instances of pending_irq to * vgic.inflight_irqs */