From patchwork Wed Mar 19 12:31:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 26574 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7FF5020534 for ; Wed, 19 Mar 2014 12:34:35 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf20801904pdb.0 for ; Wed, 19 Mar 2014 05:34:34 -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=18Pd+jMWf7OJ13NoRr6bCezwsj/FdvEXMEMCq5LWOao=; b=kxI9BUKKpz02/WzllS+BwWy47GVRUlIUkYV7IPnwJHPeYYx/w4PYSVtOd4Wd6bDdvN wpPiKzwrud/u+z54KWedAZOyRvzQzfLk/vjj2Yum/0dnKVFeAK735FZDgv/X5OuL5oxY H+CpB4aNJm/7p3JDJOil/y5mpwMdfi8ReELTLBZRLPqHvlX/Z2aPnh3WwUmcOE9y8Z1F 7T+S0T7WZT9Sv84/121FPuKcSMBzIFQJ9aLh8TXYiG0ukRWZ17Ul7Q3G71D1jhz7CLv4 l5q1NJAqUB8TWYWYm7BHIQ+njDNkMQ4SBnNFXYJ0qgYgPBr0ez70Hmebug4UnCX8BKtq gW3w== X-Gm-Message-State: ALoCoQkS1elZv0a71T/YQQTZnMHMp0iIiqfV0nB75UNcgxESldmyIajglOVipeas0v7MrmBW17Xl X-Received: by 10.66.190.202 with SMTP id gs10mr14623883pac.0.1395232474736; Wed, 19 Mar 2014 05:34:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.117 with SMTP id z108ls2511542qge.51.gmail; Wed, 19 Mar 2014 05:34:34 -0700 (PDT) X-Received: by 10.58.122.164 with SMTP id lt4mr29925715veb.2.1395232474522; Wed, 19 Mar 2014 05:34:34 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ej2si4406652veb.149.2014.03.19.05.34.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 05:34:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.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.220.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so8942643vcb.20 for ; Wed, 19 Mar 2014 05:34:34 -0700 (PDT) X-Received: by 10.52.61.133 with SMTP id p5mr25432740vdr.4.1395232474429; Wed, 19 Mar 2014 05:34:34 -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 i9csp295262vck; Wed, 19 Mar 2014 05:34:34 -0700 (PDT) X-Received: by 10.220.191.134 with SMTP id dm6mr30479365vcb.16.1395232473909; Wed, 19 Mar 2014 05:34:33 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id vd8si3472530vdc.34.2014.03.19.05.34.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 05:34:33 -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 1WQFfn-0007S4-Cr; Wed, 19 Mar 2014 12:32:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQFfk-0007PK-EA for xen-devel@lists.xensource.com; Wed, 19 Mar 2014 12:32:40 +0000 Received: from [85.158.143.35:26879] by server-2.bemta-4.messagelabs.com id 03/21-06539-76E89235; Wed, 19 Mar 2014 12:32:39 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1395232357!3208843!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.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1020 invoked from network); 19 Mar 2014 12:32:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 19 Mar 2014 12:32:39 -0000 X-IronPort-AV: E=Sophos;i="4.97,685,1389744000"; d="scan'208";a="112829419" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 19 Mar 2014 12:32:36 +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, 19 Mar 2014 08:32:35 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WQFfa-0005Tm-HK; Wed, 19 Mar 2014 12:32:30 +0000 From: Stefano Stabellini To: Date: Wed, 19 Mar 2014 12:31:57 +0000 Message-ID: <1395232325-19226-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, jtd@galois.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v4 02/10] xen/arm: remove unused virtual parameter from vgic_vcpu_inject_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.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: Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/gic.c | 2 +- xen/arch/arm/irq.c | 2 +- xen/arch/arm/time.c | 2 +- xen/arch/arm/vgic.c | 4 ++-- xen/arch/arm/vtimer.c | 4 ++-- xen/include/asm-arm/gic.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 82a1e79..e6ddedf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -782,7 +782,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq, 1); + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } /* diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b388ef3..dbba5d3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -735,7 +735,7 @@ int gic_events_need_delivery(void) void gic_inject(void) { if ( vcpu_info(current, evtchn_upcall_pending) ) - vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq, 1); + vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq); gic_restore_pending_irqs(current); } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 3e326b0..5daa269 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -159,7 +159,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) desc->arch.eoi_cpu = smp_processor_id(); /* XXX: inject irq into all guest vcpus */ - vgic_vcpu_inject_irq(d->vcpu[0], irq, 0); + vgic_vcpu_inject_irq(d->vcpu[0], irq); goto out_no_end; } diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index ba281e9..ae09c6b 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -215,7 +215,7 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); - vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq, 1); + vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); } /* Route timer's IRQ on this CPU */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 553411d..aab490c 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -457,7 +457,7 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) sgir, vcpu_mask); continue; } - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq, 1); + vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq); } return 1; } @@ -685,7 +685,7 @@ void vgic_clear_pending_irqs(struct vcpu *v) spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } -void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq, int virtual) +void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) { int idx = irq >> 2, byte = irq & 0x3; uint8_t priority; diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index e325f78..87be11e 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -34,14 +34,14 @@ static void phys_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_PENDING; if ( !(t->ctl & CNTx_CTL_MASK) ) - vgic_vcpu_inject_irq(t->v, t->irq, 1); + vgic_vcpu_inject_irq(t->v, t->irq); } static void virt_timer_expired(void *data) { struct vtimer *t = data; t->ctl |= CNTx_CTL_MASK; - vgic_vcpu_inject_irq(t->v, t->irq, 1); + vgic_vcpu_inject_irq(t->v, t->irq); } int vcpu_domain_init(struct domain *d) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 071280b..6fce5c2 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -162,7 +162,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); -extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); +extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq);