From patchwork Fri Aug 8 17:13:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 35156 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A62A82118A for ; Fri, 8 Aug 2014 17:16:56 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id tr6sf23374646ieb.10 for ; Fri, 08 Aug 2014 10:16:56 -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=M6kUhpqHTiyRArlE28VyoJNDdkAdK0Ypd3yymelUsPg=; b=b6U9W2S6jmlB74OUvJ6JMotJPxWEhtxF+1MZqm4sXCW4dhkMdcPGHDBaN/HCAoxYkY hOHLt1dK+QWmUu92ozwXHMB/Ues+mpW1wnHh18gLPSx8JwCXZ+22CsHEJzQ0NQVGrj/n LXJ4XBrC++yJFXnqfUBztFiibSrjRXFjpFSdebYnaZ4Rb7uu4wwLS8wIyYu6aOepKO0S L2Ubk6t7ihvemKCi/kOhr2RXdWw53QgrjD+Ra716KDdEKn5gMuq1TIkO0X7qw0G0qnHK QxbKeiGJbQen91FZuqfrSEujmro02y3R65M29hnBNgalGZpftHQcZqNl1dHK4TeBWWSb wJ1Q== X-Gm-Message-State: ALoCoQlonWTU0rdxFXJjK71S/uCiQs6kR/k305tnyxY+ygMcJD2GOnukcP62Z7NlI+KbJ62Vy4re X-Received: by 10.42.26.12 with SMTP id d12mr5155660icc.24.1407518216192; Fri, 08 Aug 2014 10:16:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.137 with SMTP id b9ls615745qgb.75.gmail; Fri, 08 Aug 2014 10:16:56 -0700 (PDT) X-Received: by 10.52.248.232 with SMTP id yp8mr1122501vdc.83.1407518216013; Fri, 08 Aug 2014 10:16:56 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id o2si3097433vca.94.2014.08.08.10.16.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Aug 2014 10:16:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so8787777vcb.9 for ; Fri, 08 Aug 2014 10:16:55 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr2228115vca.45.1407518215923; Fri, 08 Aug 2014 10:16:55 -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.221.37.5 with SMTP id tc5csp140479vcb; Fri, 8 Aug 2014 10:16:55 -0700 (PDT) X-Received: by 10.43.156.20 with SMTP id lk20mr11194462icc.17.1407518214897; Fri, 08 Aug 2014 10:16:54 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e1si4797952igg.62.2014.08.08.10.16.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Aug 2014 10:16:54 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1XFnlf-00015W-Q6; Fri, 08 Aug 2014 17:15:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFnle-00013a-KA for xen-devel@lists.xensource.com; Fri, 08 Aug 2014 17:15:50 +0000 Received: from [85.158.139.211:60312] by server-1.bemta-5.messagelabs.com id F4/3A-17892-5C505E35; Fri, 08 Aug 2014 17:15:49 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1407518145!5123459!3 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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12000 invoked from network); 8 Aug 2014 17:15:49 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Aug 2014 17:15:49 -0000 X-IronPort-AV: E=Sophos;i="5.01,826,1400025600"; d="scan'208";a="160746976" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 8 Aug 2014 13:15:13 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XFnky-0001op-DD; Fri, 08 Aug 2014 18:15:08 +0100 From: Stefano Stabellini To: Date: Fri, 8 Aug 2014 18:13:45 +0100 Message-ID: <1407518033-10694-2-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 Subject: [Xen-devel] [PATCH v11 02/10] xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) 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: It makes the code cleaner, especially with the following patches. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index ebfec83..9947e8c 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -321,13 +321,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) spin_lock_irqsave(&v->arch.vgic.lock, flags); - if ( !list_empty(&n->inflight) ) - { - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); - gic_raise_inflight_irq(v, irq); - goto out; - } - /* vcpu offline */ if ( test_bit(_VPF_down, &v->pause_flags) ) { @@ -335,10 +328,17 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } + set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); + + if ( !list_empty(&n->inflight) ) + { + gic_raise_inflight_irq(v, irq); + goto out; + } + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); n->irq = irq; - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); n->priority = priority; /* the irq is enabled */