From patchwork Thu Oct 18 13:21:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 149127 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1972444lji; Thu, 18 Oct 2018 06:23:14 -0700 (PDT) X-Google-Smtp-Source: ACcGV62FuLEpjF4So8468NJWGne5yTIJ4B63UMnLUtyvJNTmlElpge9w3GUBj3s4m4sAiS63nosA X-Received: by 2002:a25:4c83:: with SMTP id z125-v6mr10186079yba.491.1539868994720; Thu, 18 Oct 2018 06:23:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539868994; cv=none; d=google.com; s=arc-20160816; b=qh+aNLF0txE0X3Ckww6XUYnKkwWasy4bQ4UuZpBO/3bq8NmxD4oNw4R9uWHfU3A385 zmll1RFtZmMjB3856gztiDPEn6V0CpSutsg+WmHVhKvFN+KOHeDd1MHC4kwgQzYIjIws XmFnt8WFJUqYm5zmGb72uMA002qF5hcodxLSKj/iLF999P2Ra6xZO5e5ZHyjRS1Cwhmq 8AAdEltWUCRoO+MxOL0z9ZD8xpV4yJpbqdTqZaIeKT0q0M6mTfY9uank3oalTrJGSaU5 okFEVTTNRVT0rBn4k/QHSZFZ9xaGf4mgcgZEcZUVhkwO/SBgvahDSGzc2NvP6UfcgbG9 d+yA== 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=W+Kx+/SWlp72fXlvHmfY+dIW8sgh8vx3EHnowfaBEHE=; b=z73QMidIkKwW3Xb2Dr/cLc1XXi6FHNycOhQX0cOslcrqlTakyCqGu5++6KbrSL+88N u9Uzglu45kYGm9EuMbnEoZieW0EDIrh4/IwVT/MfUuPGKVbIiQBfh+KsKOs5z8TvfMDR ofyDjqtGs3ZXd1wGo3MkHGJMvjd4Yl5tBj+8L3STol8hs2qYXCzGisfPLFhGpKBIrHNS jKc5x3l+peH4V71kJZbylnF8JW0p+U1BgimxqLwmLn+P5ujhT7uxVfNwoJeh0pWKFEHC 78QpeS8Oy1vPXcF5SSDraVdvBjuXy/Ei17snqdHgAegEhNDbidI4NJJUdHTk/rI1c6oj J9VQ== 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 u11-v6si8411060ywl.64.2018.10.18.06.23.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 06:23:14 -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 1gD8FC-0003PW-Sk; Thu, 18 Oct 2018 13:21:42 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gD8FA-0003LE-SR for xen-devel@lists.xen.org; Thu, 18 Oct 2018 13:21:40 +0000 X-Inumbo-ID: 5c062beb-d2d8-11e8-a8a5-bc764e045a96 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 5c062beb-d2d8-11e8-a8a5-bc764e045a96; Thu, 18 Oct 2018 15:18:53 +0200 (CEST) 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 034BF1596; Thu, 18 Oct 2018 06:21:40 -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 3BB4B3F59C; Thu, 18 Oct 2018 06:21:39 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 18 Oct 2018 14:21:09 +0100 Message-Id: <20181018132109.31192-23-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181018132109.31192-1-julien.grall@arm.com> References: <20181018132109.31192-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 22/22] 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 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 --- 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__ */ /*