From patchwork Wed Oct 31 18:13:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 149856 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7126932ljp; Wed, 31 Oct 2018 11:15:54 -0700 (PDT) X-Google-Smtp-Source: AJdET5evUh7arohRYAAhuwuWVhBssuRgG8tqReUgXysZZ/USadVLy2c9RpXyoSlltmFsK6QQSb3a X-Received: by 2002:a25:6fd5:: with SMTP id k204-v6mr4261619ybc.82.1541009754328; Wed, 31 Oct 2018 11:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541009754; cv=none; d=google.com; s=arc-20160816; b=xA6SYdTX/UAFYm9X9F5wOnsVxXdQGegsQMXNYjTopR5If3s+Jy2xTDhKe7FzUHQdoc b1ZfpHblHyophk2RRHMAtVKG6/m6SwOZjxMGELqL9CLjzjhfaD9+IPpsa452JRyCJX0a Fi8xCP5BkXUPM5//ArCqwuTVodWBvdF2xdtOycZl109MFl3tgV0d9NfbRxkeFz2OBpGE tN81GvzuB3LQtLfDRmvrfwyhQjRk3WyI86Ckclh2xuGIiJe7Vc11ZNakKoCqA+jBYW4w /ul+31kz/77p/YOgkFOvw9G9O3IcpCaXFvFRIBFl+q9AU0tqNdjKCkav75Qv8eQL1XIP OQ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=FcQia29Y22lQlOR97FoYZxxHdrmi82UmIcOYLP9p910=; b=uBQKN7tcPDglYbb0/jHD1BlTymbWzpM2sNQnMfpY0646702QDhII4CySw7Sj/wxzzw nbWNGL7XuSMXO12aSnNp503bAjT0bGiSp+yUscarf1IZ567umc2Z4v1xvD9Ho5p9Ggf1 OmrjFL6/5fET0eWRtZCT9lcWBGygFRzRP7MHB5e6sKgSIWsIGzg4X0MZDAGfCrr9cwSZ u+IRH+S4YtXVjRntqFrDS7hBvjbJrZj/cQXn8xDupTw/3Kb4HiuCrV/McpBNRHO/6K0X 0s4JDkydNc08eVKLxdRrZQH+6cn1iqeKn93H98t63CIAC7Ls15/geoaCA74MA8/HZc8c CCCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id k15-v6si17032512ywe.195.2018.10.31.11.15.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 11:15:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gHv00-0004nW-0R; Wed, 31 Oct 2018 18:13:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gHuzy-0004kU-An for xen-devel@lists.xen.org; Wed, 31 Oct 2018 18:13:46 +0000 X-Inumbo-ID: b46ba8fa-dd38-11e8-87f6-12d6303a7972 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id b46ba8fa-dd38-11e8-87f6-12d6303a7972; Wed, 31 Oct 2018 18:13:45 +0000 (UTC) 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 C01D380D; Wed, 31 Oct 2018 11:13:44 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D4D3D3F6A8; Wed, 31 Oct 2018 11:13:43 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 31 Oct 2018 18:13:13 +0000 Message-Id: <20181031181313.8028-22-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181031181313.8028-1-julien.grall@arm.com> References: <20181031181313.8028-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 21/21] xen/arm: Move vgic_* helpers from gic.h to vgic.h X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , sstabellini@kernel.org, andrii_anisov@epam.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Keep vgic_* helpers in a single place. At the same time remove gic.h from event.h since the helpers has now been moved to vgic.h (included by domain.h). Signed-off-by: Julien Grall Reviewed-by: Andrii Anisov --- Changes in v2: - Add Andrii's reviewed-by --- xen/include/asm-arm/event.h | 1 - xen/include/asm-arm/gic.h | 3 --- xen/include/asm-arm/vgic.h | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index 2f51864043..b14c166ad6 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -1,7 +1,6 @@ #ifndef __ASM_EVENT_H__ #define __ASM_EVENT_H__ -#include #include void vcpu_kick(struct vcpu *v); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 22fa122e52..fab02f19f7 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -249,9 +249,7 @@ extern int gic_route_irq_to_guest(struct domain *, unsigned int virq, int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, struct irq_desc *desc); -extern void vgic_sync_to_lrs(void); extern void gic_clear_pending_irqs(struct vcpu *v); -extern int vgic_vcpu_pending_irq(struct vcpu *v); extern void init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, @@ -306,7 +304,6 @@ extern unsigned int gic_number_lines(void); /* IRQ translation function for the device tree */ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type); -void vgic_sync_from_lrs(struct vcpu *v); struct gic_info { /* GIC version */ diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0316d87f66..56ed5fe8fe 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -363,6 +363,11 @@ void vgic_v3_setup_hw(paddr_t dbase, unsigned int intid_bits); #endif +void vgic_sync_to_lrs(void); +void vgic_sync_from_lrs(struct vcpu *v); + +int vgic_vcpu_pending_irq(struct vcpu *v); + #endif /* __ASM_ARM_VGIC_H__ */ /*