From patchwork Thu Mar 27 15:13: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: 27198 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 34FA4202FA for ; Thu, 27 Mar 2014 15:16:45 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id if11sf8081464vcb.0 for ; Thu, 27 Mar 2014 08:16:44 -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=QtXsdEbjEykajOtxGcTcSBehAHFQNQrWZ/VuxnFwA/Y=; b=f+5qg7pnjjljghyUKXxihsKQRi4FN5wJRmEC0se3NywEBphnC3ceD/PAnpRPzR75gG ZqQKmFuto84CLt5DNyd/fa7cSaC8Wy1s0PqRLtJd19kyjXqkZpkiyZ40c+J64fCFbcNX 0vBbdQ6aMkKGq8ROFs7Q7bJMNP3ySxyEQAWF53iLvxx3eGZmcY8i2suFbvyfVO9Z6YKk MPgOiknRD37o0s3Q1y/ZBYtZueivsCj2XulkR4UCQY37UGDm/AitNIa8mll6ak/3l5RN T1drc+E21CjTyhwvxnVtshSajcwkrPOgTU7c/a6HuGDigtFJEOEjXxmlq6G5TKWBwIe6 EcKw== X-Gm-Message-State: ALoCoQlQEpqGczTxmvhlIW1lQPochGmQfL87wRNdatIWaB3YDIy/8ZlLpZ9LyCmZGVzWXIALRc05 X-Received: by 10.52.61.197 with SMTP id s5mr807018vdr.8.1395933404904; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.8 with SMTP id e8ls1088784qgd.39.gmail; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) X-Received: by 10.52.171.68 with SMTP id as4mr1637259vdc.0.1395933404792; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id iy9si564188vec.87.2014.03.27.08.16.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Mar 2014 08:16:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so4178760veb.19 for ; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) X-Received: by 10.220.96.70 with SMTP id g6mr1888155vcn.19.1395933404688; Thu, 27 Mar 2014 08:16:44 -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.78.9 with SMTP id i9csp36042vck; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr1600646vdc.13.1395933404164; Thu, 27 Mar 2014 08:16:44 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id at8si618443vec.37.2014.03.27.08.16.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 08:16:44 -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 1WTC1A-00047w-GS; Thu, 27 Mar 2014 15:14:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTC0z-0003zB-Sm for xen-devel@lists.xensource.com; Thu, 27 Mar 2014 15:14:46 +0000 Received: from [193.109.254.147:64334] by server-10.bemta-14.messagelabs.com id 28/CD-04546-56044335; Thu, 27 Mar 2014 15:14:45 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1395933282!4591070!2 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 12846 invoked from network); 27 Mar 2014 15:14:44 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 27 Mar 2014 15:14:44 -0000 X-IronPort-AV: E=Sophos;i="4.97,743,1389744000"; d="scan'208";a="114189369" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 27 Mar 2014 15:14:21 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Thu, 27 Mar 2014 11:14:19 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WTC0U-0004xQ-El; Thu, 27 Mar 2014 15:14:14 +0000 From: Stefano Stabellini To: Date: Thu, 27 Mar 2014 15:13:36 +0000 Message-ID: <1395933219-18495-7-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 v6 07/10] xen/arm: s/gic_set_guest_irq/gic_raise_guest_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.174 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: Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state parameter. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/gic.c | 8 ++++---- xen/arch/arm/vgic.c | 4 ++-- xen/include/asm-arm/gic.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index de5eadf..40e768e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -675,8 +675,8 @@ void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) spin_unlock_irqrestore(&gic.lock, flags); } -void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, - unsigned int state, unsigned int priority) +void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, + unsigned int priority) { int i; unsigned long flags; @@ -688,7 +688,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); - gic_set_lr(i, irq_to_pending(v, virtual_irq), state); + gic_set_lr(i, irq_to_pending(v, virtual_irq), GICH_LR_PENDING); goto out; } } @@ -727,7 +727,7 @@ static void gic_clear_one_lr(struct vcpu *v, int i) test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { inflight = 1; - gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + gic_raise_guest_irq(v, irq, p->priority); } spin_unlock(&gic.lock); if ( !inflight ) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 566f0ff..3913cf5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -390,7 +390,7 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) p = irq_to_pending(v, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + gic_raise_guest_irq(v, irq, p->priority); if ( p->desc != NULL ) p->desc->handler->enable(p->desc); i++; @@ -719,7 +719,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) /* the irq is enabled */ if ( test_bit(GIC_IRQ_GUEST_ENABLED, &n->status) ) - gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); + gic_raise_guest_irq(v, irq, priority); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index ebb90c6..5a9dc77 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -178,8 +178,8 @@ extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); extern void __cpuinit init_maintenance_interrupt(void); -extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq, - unsigned int state, unsigned int priority); +extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, + unsigned int priority); extern void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq); extern int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq,