From patchwork Wed Aug 13 16:29:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 35380 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 830D820DCC for ; Wed, 13 Aug 2014 16:33:15 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id j7sf30303015qaq.5 for ; Wed, 13 Aug 2014 09:33:15 -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=e/yW6W4E09rkblk6XTZyx3nxP6zroqHryOLVjKfZq1r7iqscZOqMkvLLLh6wdErtf8 PZ5qj0kqDQAo8wbzJZLkj2Vz1T/8f3FHrM4toN3A4DYI+3ddRD4ioGfyAoklM6CLmpOD nEpsNZjTx70TyqH6viW0CZjMZ6NkMymR8kLbKF0csCzrpwlurzRITod1PniKBUSzh1TB 1nsiX6P7wd3S5j/DMNV/uxm9HSM06afdiygEzHr12MoHZhmP4wdk0VLLo63/KKS8MFYm 5moaURWSdBCpVKju2ivslcWgnSqPPKI/pAZDmnW7CbQx2G2cJJQSjyaZI1HLTBuJE9d4 nb4Q== X-Gm-Message-State: ALoCoQnQgEvtP69eiEj3ya1pH1LfAozgGTAc8T09CxF8vMlnXkx89VM3LNW5d+QujEfy3CskwElc X-Received: by 10.224.21.129 with SMTP id j1mr2880700qab.7.1407947595273; Wed, 13 Aug 2014 09:33:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.164 with SMTP id f33ls658207qgf.34.gmail; Wed, 13 Aug 2014 09:33:15 -0700 (PDT) X-Received: by 10.220.5.1 with SMTP id 1mr1877655vct.73.1407947595045; Wed, 13 Aug 2014 09:33:15 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id xk9si1412320vdc.48.2014.08.13.09.33.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Aug 2014 09:33:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so15307646vcb.31 for ; Wed, 13 Aug 2014 09:33:15 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr3970490vdb.27.1407947594972; Wed, 13 Aug 2014 09:33:14 -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 tc5csp344367vcb; Wed, 13 Aug 2014 09:33:14 -0700 (PDT) X-Received: by 10.50.97.101 with SMTP id dz5mr9345830igb.14.1407947594216; Wed, 13 Aug 2014 09:33:14 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id bt7si4885901icb.70.2014.08.13.09.33.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Aug 2014 09:33:14 -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 1XHbSD-0003Pq-Sm; Wed, 13 Aug 2014 16:31:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHbSC-0003PS-FU for xen-devel@lists.xensource.com; Wed, 13 Aug 2014 16:31:12 +0000 Received: from [85.158.143.35:55679] by server-3.bemta-4.messagelabs.com id 03/04-06192-FC29BE35; Wed, 13 Aug 2014 16:31:11 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1407947470!12876867!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20652 invoked from network); 13 Aug 2014 16:31:11 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Aug 2014 16:31:11 -0000 X-IronPort-AV: E=Sophos;i="5.01,857,1400025600"; d="scan'208";a="161414765" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 13 Aug 2014 12:31:09 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XHbS3-00059X-Vc; Wed, 13 Aug 2014 17:31:03 +0100 From: Stefano Stabellini To: Date: Wed, 13 Aug 2014 17:29:36 +0100 Message-ID: <1407947384-24279-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 v12 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.172 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 */