From patchwork Wed Feb 26 18:39:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 25400 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 39A62203C4 for ; Wed, 26 Feb 2014 18:41:39 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id o6sf4530108oag.10 for ; Wed, 26 Feb 2014 10:41:38 -0800 (PST) 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=H/zXKS8wZNUney5eQq1x8cXi8lY1CIhyoJ59/a1REpI=; b=Ccw9uhouGWQCXMTLq1g0/egWOpsDOIUqXK6zA3xC/De44hZO+8JcF7jml3CAQDW3nv OfF3SNNZHjmyV+ltFYtrkqbGqZ1sUyuG0WINsayjoDwANhFcCny2KZQvi2hXy+iqIW30 6Jt5qavGVQkMjg2w9/HMOZdiHtHpki209u/h60Piz+LBSACPX5lERJ7v+bQpkADkoHpl qpFsOX+WdknHx1tSdrQYuCm3qykvlEO0Luwkq1hhrRHr1/zVzYZmTx4LfHpFCyV8WHBD YrQTKhWYCIpg10b9DA+GXRC9mAw6HAdl6uBxqGT+sFqRC6DU5LONlqych/+uym0+7poV Whgg== X-Gm-Message-State: ALoCoQl31MUlU2dZVeJ2mBpLyOQsPHt3aTbWb5uDWyC7gfJoAouzFKXjYZc3VSnBtEeFsjXg6yaV X-Received: by 10.182.129.129 with SMTP id nw1mr2049004obb.34.1393440098744; Wed, 26 Feb 2014 10:41:38 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.20 with SMTP id e20ls341107qgd.58.gmail; Wed, 26 Feb 2014 10:41:38 -0800 (PST) X-Received: by 10.221.53.194 with SMTP id vr2mr354184vcb.41.1393440098616; Wed, 26 Feb 2014 10:41:38 -0800 (PST) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id uo16si452175veb.124.2014.02.26.10.41.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:41:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.178 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.178; Received: by mail-vc0-f178.google.com with SMTP id ik5so1342915vcb.23 for ; Wed, 26 Feb 2014 10:41:38 -0800 (PST) X-Received: by 10.58.236.234 with SMTP id ux10mr92822vec.60.1393440098512; Wed, 26 Feb 2014 10:41:38 -0800 (PST) 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.174.196 with SMTP id u4csp46845vcz; Wed, 26 Feb 2014 10:41:38 -0800 (PST) X-Received: by 10.58.209.36 with SMTP id mj4mr360533vec.47.1393440098045; Wed, 26 Feb 2014 10:41:38 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id si7si452139vdc.115.2014.02.26.10.41.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:41:38 -0800 (PST) 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 1WIjPD-00083r-Mh; Wed, 26 Feb 2014 18:40:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WIjP1-0007ua-NU for xen-devel@lists.xensource.com; Wed, 26 Feb 2014 18:40:20 +0000 Received: from [85.158.143.35:7725] by server-3.bemta-4.messagelabs.com id 32/EE-11539-1153E035; Wed, 26 Feb 2014 18:40:17 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1393440011!8519574!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.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28761 invoked from network); 26 Feb 2014 18:40:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 26 Feb 2014 18:40:15 -0000 X-IronPort-AV: E=Sophos;i="4.97,549,1389744000"; d="scan'208";a="104388734" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 26 Feb 2014 18:40:12 +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; Wed, 26 Feb 2014 13:40:10 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WIjOm-0004S3-9B; Wed, 26 Feb 2014 18:40:04 +0000 From: Stefano Stabellini To: Date: Wed, 26 Feb 2014 18:39:52 +0000 Message-ID: <1393439997-26936-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, jtd@galois.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH-4.5 v3 07/12] 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.220.178 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 --- 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 9293c16..d1e7ed3 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(&gic.lock); } -void gic_set_guest_irq(struct vcpu *v, unsigned int irq, - unsigned int state, unsigned int priority) +void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, + unsigned int priority) { int i; unsigned long flags; @@ -688,7 +688,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int 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(v, i, irq, state, priority); + gic_set_lr(v, i, irq, GICH_LR_PENDING, priority); goto out; } } @@ -729,7 +729,7 @@ static void gic_clear_lrs(struct vcpu *v) 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 da15f4d..b003f29 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -388,7 +388,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++; @@ -717,7 +717,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 6fce5c2..4834cd6 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,