From patchwork Fri Mar 9 15:11:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 131150 Delivered-To: patch@linaro.org Received: by 10.80.194.209 with SMTP id u17csp1135574edf; Fri, 9 Mar 2018 07:14:09 -0800 (PST) X-Google-Smtp-Source: AG47ELvrr+USZaDU3P+PHHk37oKwFovm7Q1DjczFjTjLWKni+2B5lAe1ZMuSAFFrtW3OgyGTKKP0 X-Received: by 10.107.134.95 with SMTP id i92mr35607916iod.210.1520608449220; Fri, 09 Mar 2018 07:14:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520608449; cv=none; d=google.com; s=arc-20160816; b=UD9maD90mAg7QXNiaUTzxXdZEvM+7KC5cqDz2hqwikm4u5hr8ObcSbWK+L+1oLH12B yedX4CmYIsk5WEGnAqW9Jvy1tew5tmkjNUA9k+E0htAgNOY/vA82auifZngPyKShIbHs iREW/+We93W6hmnMVAxQ2BaMlAR7+irkprXaZsCkJ7KBBGVCY2uP2DOZ+3W9FbxYvKZs jlUE6zZNZD1Jlb+IZ3QsXqdMELZmkBrE+vRyZFHhzlaGwb2UKCSAezcdK5VGcN8MO1WE jM/Xj/lwInpCHMlxTSxawEcfGjKsDMNIDKJ/AVH/6vU/QX+osadDyJKEACXiPo2llnzW Y0BA== 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:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=sOVUs+TpGJLKOGncDDurC/HGmVYalAmd0N8PnkrxnIQ=; b=COSeuXcUKQVdplXTYKIQPaBCNwQA/YfyKtnY8b45WbyaTjwJRAfd+IBFR9qOAR9+bN 0F5fY4TETeOT5ot9h3WHnQiKEBnl/oOgiqdrFEcUvOII6vERXT2lR2Xb+0z8zcEsgpjd 6JQQ5lyaNAkLqMbI2eVij1m+UH928x1v/Oxw59zhGs/sWH6BIJ0EPw4Lbu++pkBflSvz 1OUCO6RpBXPxr7Cu1myA995RjTN2lLxSUBt0+GQoimWd02upuDR9Dw4QXqCzm4Q0scPU i16UeNDX0ve0n98H75ezMRa/9ZbqHIY0aGfDWuWZmaXTP2pC3jEhV0VPpO1QHS5jrgZX fdGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L7/CAsc6; 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 z29si1011402ioi.297.2018.03.09.07.14.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 07:14:09 -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=L7/CAsc6; 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 1euJgX-0005rY-9l; Fri, 09 Mar 2018 15:11:53 +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 1euJgW-0005r1-Dr for xen-devel@lists.xenproject.org; Fri, 09 Mar 2018 15:11:52 +0000 X-Inumbo-ID: 0622f111-23ac-11e8-ba59-bc764e045a96 Received: from mail-wm0-x243.google.com (unknown [2a00:1450:400c:c09::243]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 0622f111-23ac-11e8-ba59-bc764e045a96; Fri, 09 Mar 2018 16:10:38 +0100 (CET) Received: by mail-wm0-x243.google.com with SMTP id e194so4488993wmd.3 for ; Fri, 09 Mar 2018 07:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=awqotLGyJTKKCPgbF4sdiUFlCo6tBeUwPwTqiyFvQk0=; b=L7/CAsc6/GkeqkrALkxRJcgVAJzuypbv8UQ++S8TaLNvHO8DETHgtTJGL7czs8nL3n Khy0f03lEaAwXaPbGz8yMTzI7THZHpxLBrHVzd3AYGLzv06buL2DuI2Udc+j5ZWb9JQv pFb37KSu+A/wVIEEQ7KN0D25IPyGlymVs3KjE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=awqotLGyJTKKCPgbF4sdiUFlCo6tBeUwPwTqiyFvQk0=; b=fJ2fK4PwXh+oD+NWX2f7IGUbtTZAY1u5plv00s+beIdXeoFTjUVkx+tQztMK6QOiOH 58yiPDZOHJ+YAiEtYP6QE75jbMBXeraBiLgreG1C/4XmokEsTNGCEI1a/E5XmStZo2uf nVfozhpbm2ynq8hYYqUb32a4Oortpt2n1pbsFVIqqk0Z4dcq+g21AjKA1s2PkcUArpva KG6M5Ieh6icDWwgIbQx6miKTAY8IooOQoxgFSjdYqmdCRbhqC9m5ilbKKIGuTEOKvlFs ksQKAVCnxMKZvSCl57ltvZeLjCGMJQaPsmyOmVO47azSPE8rrJN7VwNz4+zDcRfPb/qj j8TA== X-Gm-Message-State: AElRT7EvFRMLxQMxWhH5DUYRzbmCQxgpUOphH+b5hd6DWd+V7cZe+sro UbOy7e2K0Z6eQqPBb70ACTda+A== X-Received: by 10.28.202.26 with SMTP id a26mr2322503wmg.45.1520608309350; Fri, 09 Mar 2018 07:11:49 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id 1sm1721198wmj.35.2018.03.09.07.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:11:48 -0800 (PST) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Fri, 9 Mar 2018 15:11:22 +0000 Message-Id: <20180309151133.31371-7-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180309151133.31371-1-andre.przywara@linaro.org> References: <20180309151133.31371-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 06/17] 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 aee247a037..c6aa5cf389 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 e2ae4254ed..3b2d0217a6 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);