From patchwork Fri Feb 9 14:38:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 127827 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp679685ljc; Fri, 9 Feb 2018 06:42:04 -0800 (PST) X-Google-Smtp-Source: AH8x2240kieYh/yeFB3u5+RZf2UMnu2Wg1PhvFpL8qEoH/ABNCnb2fUgQKmiYWspzlXYyBhv6dE2 X-Received: by 10.107.141.147 with SMTP id p141mr3206746iod.79.1518187324109; Fri, 09 Feb 2018 06:42:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518187324; cv=none; d=google.com; s=arc-20160816; b=DESVRphqCkXU8ZnnThI84RE9RxrlXgNPSxOby8sn43B74dOUcCg85AzSBtmDT3Xp7U pBhuVX8LvgJodLSvXzu3ZwikXkaBjA/rSobGOpzRgTXd0Ls6/59Zb+srX5IPKZXUXzRu xrnRqjPeRgQB7iYXqb0ItmIAb9GvD+MxsJTh26HwVQZw0zBSir90nRIcTD+eHsoS0+ea l97EyA2dn1eoA/dDTjXSZ4jwUQIrDfcMf3pSEb9aoiDoT9Wn6s/TfOipD/27BVJCbh8G Mt5HlOTWpb+YSPcSb12Ych6K0l9pLQMYgxassI0Y2csHn1WOkfiSVZdPiFPYD0p5UMkJ 1pzg== 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 :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=GfHv/4+7ZIsmN4/F4PhtcJcUU/Eejk56NVEOS6egq24=; b=tphBcJ8xxu1znrNudpMvcVXMNwY+tuIbP2bLSpC9gsAYYtOYtMopf6qABpyAxhssCm D0e8oqj2o8z1VhdpDkr9GCLO/pArdbR6wQLe//x1Kr4pe7Uyk4MgNRxZ0h+OrPRqIeaE klro4LfFLHPuXfVetayH067LUCEF+Ech+PSgGBbL9k4sifgsjJ1N6sJ5D6Uoi1RUpbdb +qIyI65EO++94fgmWv9FfDZQJwtbaz7xtgVcfwxzEq887aov1dpRhKZug1hK3t2UHrU+ vHc20qaD3ULBa4x1xPePLcoGicGw4i96TXEAyVqCgaYUw++o4CjZ753bdmWvlPmXC5t+ uFWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iUV5WlTx; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id a188si1778907ite.75.2018.02.09.06.42.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 06:42:04 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iUV5WlTx; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ek9qG-000866-Gl; Fri, 09 Feb 2018 14:39:56 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ek9qF-00084o-76 for xen-devel@lists.xenproject.org; Fri, 09 Feb 2018 14:39:55 +0000 X-Inumbo-ID: 0619e623-0da7-11e8-ba59-bc764e045a96 Received: from mail-wm0-x244.google.com (unknown [2a00:1450:400c:c09::244]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 0619e623-0da7-11e8-ba59-bc764e045a96; Fri, 09 Feb 2018 15:39:25 +0100 (CET) Received: by mail-wm0-x244.google.com with SMTP id v123so16699087wmd.5 for ; Fri, 09 Feb 2018 06:39:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=mh1SPUXUGr3bXSwabQibaRXJSMt3aNUW3ouuy5ThjeA=; b=iUV5WlTxUAR/5xP8pEQ6dPlOCXVz62vz2kBsb+LKOp+QCuR2YsEarU1qK/S8173LRJ /l4EOtaEWn/WIu/Nnxbpd5IUbuVFtFQn8AvbvFZnvnmV5nixSinWeLDilvGG+8G+xH9X 60ucR09MPLFZBtGOAy8GGIHCAzB37KbbUufuw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=mh1SPUXUGr3bXSwabQibaRXJSMt3aNUW3ouuy5ThjeA=; b=rpIUsnnl9GFPvGS8JayheRyqcn3EEGjgTjOmqFJ4UQoKJ7w74DJLdmKoPT7vNQdZbS kJqMw77O6sD5rgI3gSnQgnhsVNFxx2wAQhT8hpLgshtanXiGbyYfnL4BW4ltuTDRVDi6 ZBsbMLT9ER79HXcAsZO861rdFB+VMd6RkEZ8q2dGRTmwixVc6WAnRshMroUmWZIV28VS kgrY2DVE63VdLSUabEcUYbboyzeLonf48cL8ZHhtQqQ2hwEA6rKH3lGVFtVFGuqqe29h lTedYtsQCCEjB2H4V+jOgGA8ez1qrZg/jaa3TdDRT3NTH0rCNT//ui9QUsAjx40WvK7C bIig== X-Gm-Message-State: APf1xPDkMYXub0lRiJLaniFC6kI5inVvhAa232BAvXnKmbS4hnUnwFfr ljFhYXuPyX+dQTYlXpHvH2AHG+uDwh0= X-Received: by 10.28.179.9 with SMTP id c9mr1995856wmf.99.1518187192622; Fri, 09 Feb 2018 06:39:52 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id b35sm2552229wra.13.2018.02.09.06.39.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Feb 2018 06:39:52 -0800 (PST) From: Andre Przywara To: Stefano Stabellini , Julien Grall , xen-devel@lists.xenproject.org Date: Fri, 9 Feb 2018 14:38:55 +0000 Message-Id: <20180209143937.28866-8-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180209143937.28866-1-andre.przywara@linaro.org> References: <20180209143937.28866-1-andre.przywara@linaro.org> Subject: [Xen-devel] [RFC PATCH 07/49] ARM: VGIC: move gic_remove_from_lr_pending() prototype X-BeenThere: xen-devel@lists.xenproject.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.xenproject.org Sender: "Xen-devel" The prototype for gic_remove_from_lr_pending() is the last function in gic.h which references a VGIC data structure. Move it over to vgic.h, so that we can remove the inclusion of vgic.h from gic.h. We add it to asm/domain.h instead, where it is actually needed. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall --- xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/gic.h | 2 -- xen/include/asm-arm/vgic.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 3eda7196ff..1dd9683d25 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 497f195bc1..1d382b0ade 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -156,7 +156,6 @@ #ifndef __ASSEMBLY__ #include #include -#include #define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" @@ -245,7 +244,6 @@ extern void init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, unsigned int priority); extern void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq); -extern void gic_remove_from_lr_pending(struct vcpu *v, struct pending_irq *p); /* Accept an interrupt from the GIC and dispatch its handler */ extern void gic_interrupt(struct cpu_user_regs *regs, int is_fiq); diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index d61b54867b..d03298e12c 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -205,6 +205,7 @@ extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int virq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq); extern void vgic_vcpu_inject_spi(struct domain *d, unsigned int virq); extern void vgic_remove_irq_from_queues(struct vcpu *v, struct pending_irq *p); +extern void gic_remove_from_lr_pending(struct vcpu *v, struct pending_irq *p); extern void vgic_clear_pending_irqs(struct vcpu *v); extern void vgic_init_pending_irq(struct pending_irq *p, unsigned int virq); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq);