From patchwork Mon Mar 5 16:03:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 130696 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2855427lja; Mon, 5 Mar 2018 08:08:31 -0800 (PST) X-Google-Smtp-Source: AG47ELvw3k3ZdKNkU3dHzJeECpZdCnC+WEG0cw/d5sr1ghwe7HiLDlDcG1cXk43djFK28q8CKWfI X-Received: by 10.107.186.135 with SMTP id k129mr17439663iof.200.1520266033132; Mon, 05 Mar 2018 08:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520266033; cv=none; d=google.com; s=arc-20160816; b=HEUQEKsWtyWrXrOxuigyPAApzXVA5Q5XJ+PT61d8RnreLFkRg5m/b3X9gWBYoLdoXh E1mvp3XLJjICe4NnRqflWFXiX/3UNwd1Wa01CCctg8nIa6of1zH7UmNPOK6yyq/0F6Qb psJAgYAWJ9jwTI2yw9r4wrqKkzV5OU5dFwMvniwYywasVr7nZvU7/hVl6+gT60P1CXE4 EAV3rH+iJ0tvskLuimdOyU4cuku65F7kGanLwv/l6D9y9fQntg//mvk5D//uYbcCBlkc DOuOW15do5GoO+Ony4D8BKZAtQF0lTg7Eff4TajQg71Pbpa3PUPsSYK7vsP4RmNEBVVm seog== 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=TEssJ9obaGbGP8NMXfhz/0WPjm4KDAVNVO8imM7dwOY=; b=PSOU7tjkSecSOmGexAwBp7IfVgIvp/S4MXJ7CvaDrhha4RzP0QqVXMOMn/FjTB4GZ/ c8IwOWE+W9481025SAXovjLo3rjOQ7KYHiTwf74Lf5+zNtOdzYIbNePP4JJcBwpzk6rq wFlf9Cua3ppQblVuUfX9z/MGT5+R6tey5rPNz2bQANV7rIVZ9RZUyvre7qVRvpLCxmYZ /JGdbYWgwD7WeMGqbrvoi87hDrXGAS5IlQSld0ka++3A5jypr2QguJst10M9w0BZQLkE VC+FOiSZ9laLaij1a4cn6pgcGLZyw9PdqRAEhLDbeqclFSuEw6ucH52klwg2yh7aL2LB VJlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RKpYKYU0; 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 l11si5879680ith.153.2018.03.05.08.07.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 08:07:13 -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=RKpYKYU0; 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 1essbJ-0007Aw-8A; Mon, 05 Mar 2018 16:04:33 +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 1essbI-00079J-Jf for xen-devel@lists.xenproject.org; Mon, 05 Mar 2018 16:04:32 +0000 X-Inumbo-ID: bc7ca229-208e-11e8-ba59-bc764e045a96 Received: from mail-wr0-x242.google.com (unknown [2a00:1450:400c:c0c::242]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id bc7ca229-208e-11e8-ba59-bc764e045a96; Mon, 05 Mar 2018 17:03:26 +0100 (CET) Received: by mail-wr0-x242.google.com with SMTP id w77so17844368wrc.6 for ; Mon, 05 Mar 2018 08:04:31 -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=CNVkBw0yXuM/snK5dGAvpSa0Dm82ct/hZ5yMhFysk+E=; b=RKpYKYU0M5yIRK1HsmnLMLOuhj1bcE3uoogMQsYoRKo5UnOD0bNsap/dd4TkEsF11c /FMTNLW89kkKWHwTBXOQjrTMfNVMC2T96iQhHFrljwBapx4qOSTvXSdX4QD4dxhgb3Ha rGyYtrSDJGf13lPoQo5GFVpenqENJ4WrbqFb0= 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=CNVkBw0yXuM/snK5dGAvpSa0Dm82ct/hZ5yMhFysk+E=; b=BARqiaQxw+aDS8n9M1p1pK/f4RAgvOeKQSlImt/3IowDpiLwwZ6bzj8eLtDS3fjJJn 3se84NUY0t//f9A/1VmIx9cQbRvttZQECZzX66RoCioDSJ5RIOD5k1uEVyC783ZICa4Z N+roP0PUCiWOc10VgC9H+c7iecsyaSranZZdrf/hiRRC62vspiH0L5kEWMxBJLoCOaVs /+wo+XR2kQhICvpqRSUTgT3YAUrTWS5rkN0UVf4s4x9YXkTpJ3cPXKp7Cqa8ijIiz4nK Bjyo3kCJHsHjzIVo8EL7oZniNOKsyDC75GJ+4HUvt5ZyMc6tCHuMn3cjjQ/9UJf6Az59 p42Q== X-Gm-Message-State: APf1xPBpEOLOe9005/vXyVIhTQnluMCV5QApb1VyAkSiQm+FQkSGQFM7 w7xL6W+DCY98OSJk2EmWdWnlww== X-Received: by 10.223.209.18 with SMTP id a18mr13068355wri.141.1520265870725; Mon, 05 Mar 2018 08:04:30 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id y6sm6574381wmy.14.2018.03.05.08.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Mar 2018 08:04:30 -0800 (PST) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 5 Mar 2018 16:03:26 +0000 Message-Id: <20180305160415.16760-9-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180305160415.16760-1-andre.przywara@linaro.org> References: <20180305160415.16760-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 08/57] 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 --- Changelog RFC ... v1: - Add Julien's Reviewed-by: 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 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);