From patchwork Mon Mar 24 18:49:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 26952 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3E89E20143 for ; Mon, 24 Mar 2014 18:52:33 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf25161910oag.4 for ; Mon, 24 Mar 2014 11:52:32 -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=uIaLRFoAL80eDA6MO48c4xTAQlU1Ta07IxXQP2KWzec=; b=E+CSrlE52HgLU6wdpDFE/UVu6tclbjCw6XupIOMOOerbSK+EjwOfVgyOfuShaj8mN3 pH4IUdBfrFlJVrsSTG0ozF7l9TOTS+HzbgJrHZCAgfpJsX7aULY/yUqWwbBUY5OHXvZK aTnD3WKh8DSzRvkQg9qhTZMTFiReu+u1wgRAinmefCcrL/M4JfOHMjaJW+Uarq50QOmZ Vi2XskdRwRlTzMLb3a9SK0KK7XCS9n4NuIBYnFT04xAtQKq9sF0kJXU0BsLHcLTnA2l1 8s0eC8wNz43xwpGW16Gysmzc5BuXHmns+vh3Z9MDKxO/uq8lmXJzqgY6HyNqcaZzy4D4 VAzg== X-Gm-Message-State: ALoCoQntgOcoij1sc2QyM1S2Dz9rqWY6wTDKHtW5Ba4jkqEZ9Wo49hRsgkqkT/ZAsqHcwkNUSQkF X-Received: by 10.182.95.68 with SMTP id di4mr13566518obb.4.1395687152833; Mon, 24 Mar 2014 11:52:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.234 with SMTP id 97ls167191qgp.68.gmail; Mon, 24 Mar 2014 11:52:32 -0700 (PDT) X-Received: by 10.52.15.132 with SMTP id x4mr1843976vdc.31.1395687152568; Mon, 24 Mar 2014 11:52:32 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id qr10si3175790vcb.81.2014.03.24.11.52.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Mar 2014 11:52:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so6118967veb.6 for ; Mon, 24 Mar 2014 11:52:32 -0700 (PDT) X-Received: by 10.58.133.15 with SMTP id oy15mr50008093veb.19.1395687152490; Mon, 24 Mar 2014 11:52:32 -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 i9csp246703vck; Mon, 24 Mar 2014 11:52:31 -0700 (PDT) X-Received: by 10.43.156.18 with SMTP id lk18mr2298698icc.77.1395687151188; Mon, 24 Mar 2014 11:52:31 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id pg8si16271673icb.149.2014.03.24.11.52.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Mar 2014 11:52:31 -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 1WS9x4-0007cb-90; Mon, 24 Mar 2014 18:50:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WS9wx-0007TM-6g for xen-devel@lists.xensource.com; Mon, 24 Mar 2014 18:50:19 +0000 Received: from [85.158.137.68:41985] by server-11.bemta-3.messagelabs.com id 0C/C2-19438-A6E70335; Mon, 24 Mar 2014 18:50:18 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1395687012!2659126!4 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 13590 invoked from network); 24 Mar 2014 18:50:17 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 24 Mar 2014 18:50:17 -0000 X-IronPort-AV: E=Sophos;i="4.97,722,1389744000"; d="scan'208";a="113089164" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 24 Mar 2014 18:50:13 +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; Mon, 24 Mar 2014 14:50:11 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WS9wj-0005Cs-Qf; Mon, 24 Mar 2014 18:50:05 +0000 From: Stefano Stabellini To: Date: Mon, 24 Mar 2014 18:49:32 +0000 Message-ID: <1395686975-12649-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 v5 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.175 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 Acked-by: Ian Campbell --- 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 13990db..0ebfbf0 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; } } @@ -728,7 +728,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,