From patchwork Tue Jun 10 14:07:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 31662 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 70E072054B for ; Tue, 10 Jun 2014 14:09:11 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id bj1sf2803234pad.6 for ; Tue, 10 Jun 2014 07:09:10 -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=B/ghwB7sf8vT3GCE0LT04xzLslc+/fbQdw1S/HBoCzU=; b=dT6d45FtXJ519CB6xb7I3oAg0Js9VMaDcLo6PaRvuTTiEME2B/nM4CVPEbJ7trd0Q4 oZDRgOTzZEbDcH1Cf80tdDUS6YgQDH714J/UJIHp5+IQWKXc25GDFIMam9G+mAARU1fR g9kVVRdBMVbLLF9YGaiRrxWfCuP/iVZzyIGkgcKmf1RUHXOav9CsHOxkVQ1VAIJWcp3C uvTFeIBRACuAQCsc3wRX/K40dC24e8PH1maK6CE9Kc0wRRKNLQoNSebvhoeg+o2Fz9kr NjTctqxvDLoWLUnA93BQvnvHmqbOX6ttPpDv0rGufC28zt2MFi273DdOLY/a0XnOaCsA Lx5w== X-Gm-Message-State: ALoCoQnCuXekjB8mub7pGIY+yAZvBdjb176yuo6Pz9vuY6LRIPYqpT7iZCWK5G8SfXqYXSjQiUdd X-Received: by 10.68.197.73 with SMTP id is9mr122546pbc.0.1402409350733; Tue, 10 Jun 2014 07:09:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.195 with SMTP id f61ls2029035qgf.59.gmail; Tue, 10 Jun 2014 07:09:10 -0700 (PDT) X-Received: by 10.221.64.20 with SMTP id xg20mr31982615vcb.3.1402409350550; Tue, 10 Jun 2014 07:09:10 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id bw1si11879807vcb.18.2014.06.10.07.09.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 07:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so6198668vcb.2 for ; Tue, 10 Jun 2014 07:09:10 -0700 (PDT) X-Received: by 10.53.10.234 with SMTP id ed10mr520382vdd.86.1402409350463; Tue, 10 Jun 2014 07:09:10 -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.54.6 with SMTP id vs6csp228288vcb; Tue, 10 Jun 2014 07:09:10 -0700 (PDT) X-Received: by 10.52.6.227 with SMTP id e3mr24692561vda.10.1402409349963; Tue, 10 Jun 2014 07:09:09 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id xn7si11855465vcb.105.2014.06.10.07.09.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Jun 2014 07:09:09 -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 1WuMiR-0000On-2o; Tue, 10 Jun 2014 14:07:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WuMiP-0000NQ-2d for xen-devel@lists.xensource.com; Tue, 10 Jun 2014 14:07:53 +0000 Received: from [85.158.139.211:25222] by server-13.bemta-5.messagelabs.com id 5C/0B-02995-83117935; Tue, 10 Jun 2014 14:07:52 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1402409268!5797672!1 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.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31967 invoked from network); 10 Jun 2014 14:07:51 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 10 Jun 2014 14:07:51 -0000 X-IronPort-AV: E=Sophos; i="4.98,1009,1392163200"; d="scan'208"; a="141612268" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 10 Jun 2014 14:07:47 +0000 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; Tue, 10 Jun 2014 10:07:43 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WuMiA-0006am-P3; Tue, 10 Jun 2014 15:07:38 +0100 From: Stefano Stabellini To: Date: Tue, 10 Jun 2014 15:07:10 +0100 Message-ID: <1402409240-28114-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: MIA2 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v9 02/12] 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 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: 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 40f1c3a..33141e3 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -769,7 +769,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 a449ef3..6d917a0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -652,7 +652,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 44696e7..a33c797 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -176,7 +176,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 d04c97a..6e8d1f3 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); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 4cf6470..9838ce5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -476,7 +476,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; } @@ -704,7 +704,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 b93153e..b751692 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 domain_vtimer_init(struct domain *d) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index b750b17..b1b4fd5 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -163,7 +163,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);