From patchwork Thu Oct 19 12:48:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10016637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D81FE60224 for ; Thu, 19 Oct 2017 12:51:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9AB028D26 for ; Thu, 19 Oct 2017 12:51:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE44C28D43; Thu, 19 Oct 2017 12:51:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 591E928D26 for ; Thu, 19 Oct 2017 12:51:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5AG5-0004Qk-19; Thu, 19 Oct 2017 12:49:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5AG3-0004QS-UJ for xen-devel@lists.xenproject.org; Thu, 19 Oct 2017 12:49:08 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id D4/99-23912-34F98E95; Thu, 19 Oct 2017 12:49:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTddp/ot Ig8/XdCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyvJ5awFVwTqNiw9w5rA+M/3i5GLg4hgc2M EhP2XWWHcJYzSvzct5mpi5GTg01AV2LHzdfMILaIQITE6ceXwOLMAkoS+89eYwSxhQUcJdb/e A/UzMHBIqAqMX+FK0iYV8BKouvRSbASCQF5iXMPboON4RSwlri99wZYXAioZtvDd4wTGLkXMD KsYtQoTi0qSy3SNTbQSyrKTM8oyU3MzNE1NDDVy00tLk5MT81JTCrWS87P3cQI9G89AwPjDsY Jq/wOMUpyMCmJ8n6sehEpxJeUn1KZkVicEV9UmpNafIhRhoNDSYK3fB5QTrAoNT21Ii0zBxho MGkJDh4lEV5vkDRvcUFibnFmOkTqFKMuR8fNu3+YhFjy8vNSpcR5Y0CKBECKMkrz4EbAgv4So 6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWHeOJApPJl5JXCbXgEdwQR0BLs92BEliQgpqQZGqy nhefuURFZV8V2PPv94grGCa0eBWBDfmSbXP980TO+wiNQk8Or9PG82JzvN92qJ/7QDSj2W9kX PuF05DG1l/lp9/OffGiD3aXb8PssDUpWyPieuVE6dIpfQs/7kUd46h76574vlVxhz73im/lKl +d/iE7V7pnyaG3rq4LyWnxqrq2YYC9xUYinOSDTUYi4qTgQApInXw3UCAAA= X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1508417346!87935443!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40532 invoked from network); 19 Oct 2017 12:49:06 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-11.tower-206.messagelabs.com with SMTP; 19 Oct 2017 12:49:06 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EC6481596; Thu, 19 Oct 2017 05:49:05 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0C7FA3F3E1; Thu, 19 Oct 2017 05:49:04 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Thu, 19 Oct 2017 13:48:38 +0100 Message-Id: <20171019124847.5978-4-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171019124847.5978-1-andre.przywara@arm.com> References: <20171019124847.5978-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 03/12] ARM: VGIC: remove gic_clear_pending_irqs() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP gic_clear_pending_irqs() was not only misnamed, but also misplaced, as a function solely dealing with the GIC emulation should not live in gic.c. Move the functionality of this function into its only caller in vgic.c Signed-off-by: Andre Przywara --- xen/arch/arm/gic.c | 11 ----------- xen/arch/arm/vgic.c | 4 +++- xen/include/asm-arm/gic.h | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index ed363f6c37..75b2e0e0ca 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -675,17 +675,6 @@ out: spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } -void gic_clear_pending_irqs(struct vcpu *v) -{ - struct pending_irq *p, *t; - - ASSERT(spin_is_locked(&v->arch.vgic.lock)); - - v->arch.lr_mask = 0; - list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) - gic_remove_from_lr_pending(v, p); -} - int gic_events_need_delivery(void) { struct vcpu *v = current; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d8acbbeaaa..451a306a98 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -504,7 +504,9 @@ void vgic_clear_pending_irqs(struct vcpu *v) spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry_safe ( p, t, &v->arch.vgic.inflight_irqs, inflight ) list_del_init(&p->inflight); - gic_clear_pending_irqs(v); + list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) + gic_remove_from_lr_pending(v, p); + v->arch.lr_mask = 0; spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index d3d7bda50d..2f248301ce 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -236,7 +236,6 @@ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, struct irq_desc *desc); extern void gic_inject(void); -extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); extern void init_maintenance_interrupt(void);