From patchwork Tue Sep 12 10:36:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112291 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4986347qgf; Tue, 12 Sep 2017 03:38:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDqTUv3n6a46kWmtaHbshqZl8T+urGDWq8r6CofZvl+dhmCZqfSHveglkdSdqDcKI+ixutB X-Received: by 10.36.81.71 with SMTP id s68mr318919ita.90.1505212725420; Tue, 12 Sep 2017 03:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505212725; cv=none; d=google.com; s=arc-20160816; b=vcq0kSQl5vcRhOD7Ng+kdo38swBIb3+/AOTjvzUB4E0xkDwn4rRMOENDksGtW3hFiN iZtRPKnrr8upmHTRTlxw+zAqzM6WUoQKEfYUOMAtsuZJvTyORyqm13oRHy6fKAlmtnA+ 1EcAQcTPNeXrXaPRyZPcgYezg4Oa8+VuK52+vytreJQEM+yGXfiU617EBR/H17+J/4zv okBfouoNBZytp3MgeDJLM0zinOeL7PK9MptB7v+RVvJnfUSiJ4F+F3GlAPHZJYs2fCXq hNB0CBM5MIhZd/cqJrJULj+yztXxinOLGhWzeUfwVYY5UqMbjZaz8EDTC06S/4wlauke TusA== 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:arc-authentication-results; bh=pJHJ1xiXxeXW9MMVT03lYN7UkZKiZmvCS2/DCaivSdY=; b=Fclt8C9uoe/XtC0HUHTeMwiAPcCtSGHm4lhpkmFfljssvdv4aveWD0tv/CW0fBoKIM /FNflheSi4G38JjkQqcud2zzrdnWSxVkR3h219eEA7syWlsDBVUQ/gjPAJDgGY3tT/Mw leJa05XhCU8nIqXf8m6SteQbcXt04/C9BjjAxPiVLMMKcJUdLUevVStAX8ffqxj3c+39 8oZ+FRP2DAklOc0QcRRip2VsK/5DvYTIsfD60RQCw7iIMfPSjRxH+IFRbVweKwGaqMvI hD8seyyiqB2hOip6TEC+y/6lKsRgEilcSJKHLU/+fhwQDbLvnocyMr/tuEggr+UlMEQE RP8w== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id d190si4232926iof.18.2017.09.12.03.38.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 03:38:45 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.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 1driYb-0001RG-8D; Tue, 12 Sep 2017 10:36:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1driYZ-0001Ph-WC for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:36:40 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id E2/CF-00743-7B8B7B95; Tue, 12 Sep 2017 10:36:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTXfbju2 RBjt+61gs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmvL39hKzgnVXGo5ytrA+MTsS5GLg4hgc2M Ei0n77NAOKcZJTbvbWDsYuTkYBPQlLjz+RMTiC0iIC1x7fNlsDizQJzE+0WNLCC2sICNxIaZS 9lBbBYBVYlpXZPZQGxeAUuJGxNOsILYEgLyErvaLoLZnAJWEoteLQDq5QBaZilxabPkBEbuBY wMqxjVi1OLylKLdI31kooy0zNKchMzc3QNDUz1clOLixPTU3MSk4r1kvNzNzECvcsABDsY9/5 zOsQoycGkJMp7ZP32SCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvGzAYBESLEpNT61Iy8wBhhlM WoKDR0mE99x2oDRvcUFibnFmOkTqFKMuR8fNu3+YhFjy8vNSpcR5b4IUCYAUZZTmwY2AhfwlR lkpYV5GoKOEeApSi3IzS1DlXzGKczAqCfMKg1zCk5lXArfpFdARTEBH8FzaAnJESSJCSqqBcc bZhtr1Z7hXlKpU/FBY9L1r5sS+KMFP1xyU5sU33oua+OzInCofp5bNftPK9lRyn9f0fSN0tk5 LKpWFMbrhdcXOK2FXP4ccVL9V94jD7+mXPw/3zzIwehRz5+2BLLe+p87MX76YT9DbFvNFheXN qnT++7GfVR5tOZSYsc46e4PJ9wuJBeopT5VYijMSDbWYi4oTAUJ0uzl0AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1505212598!74839376!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13646 invoked from network); 12 Sep 2017 10:36:38 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-206.messagelabs.com with SMTP; 12 Sep 2017 10:36:38 -0000 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 E5B921529; Tue, 12 Sep 2017 03:36:37 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0353A3F578; Tue, 12 Sep 2017 03:36:36 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:36:22 +0100 Message-Id: <20170912103622.18562-8-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912103622.18562-1-julien.grall@arm.com> References: <20170912103622.18562-1-julien.grall@arm.com> Cc: bhupinder.thakur@linaro.org, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 7/7] xen/arm: Limit the scope of cpregs.h X-BeenThere: xen-devel@lists.xen.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.xen.org Sender: "Xen-devel" Currently, cpregs.h is included in pretty much every files even for arm64. However, the only use for arm64 is when emulating co-processors. For arm32, all users of processor.h expect cpregs.h to be included in order to access co-processors. So move the inclusion in asm-arm/arm32/processor.h. cpregs.h will also be directly included in the co-processors emulation to accommodate arm64. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- Changes in v2: - Update commit message --- xen/arch/arm/smp.c | 1 - xen/arch/arm/vcpreg.c | 1 + xen/arch/arm/vgic-v3.c | 1 + xen/arch/arm/vtimer.c | 2 ++ xen/include/asm-arm/arm32/processor.h | 2 ++ xen/include/asm-arm/percpu.h | 1 - xen/include/asm-arm/processor.h | 1 - 7 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/smp.c b/xen/arch/arm/smp.c index e7df0874d6..554f4992e6 100644 --- a/xen/arch/arm/smp.c +++ b/xen/arch/arm/smp.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index f3b08403fb..e363183ba8 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index cbeac28b28..a0cf993d13 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 9c7e8f441c..0460962f08 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -29,6 +30,7 @@ #include #include #include +#include /* * Check if regs is allowed access, user_gate is tail end of a diff --git a/xen/include/asm-arm/arm32/processor.h b/xen/include/asm-arm/arm32/processor.h index 68cc82147e..fb330812af 100644 --- a/xen/include/asm-arm/arm32/processor.h +++ b/xen/include/asm-arm/arm32/processor.h @@ -1,6 +1,8 @@ #ifndef __ASM_ARM_ARM32_PROCESSOR_H #define __ASM_ARM_ARM32_PROCESSOR_H +#include + #define ACTLR_CAXX_SMP (1<<6) #ifndef __ASSEMBLY__ diff --git a/xen/include/asm-arm/percpu.h b/xen/include/asm-arm/percpu.h index 7968532462..cdf64e0f77 100644 --- a/xen/include/asm-arm/percpu.h +++ b/xen/include/asm-arm/percpu.h @@ -4,7 +4,6 @@ #ifndef __ASSEMBLY__ #include -#include #if defined(CONFIG_ARM_32) # include #elif defined(CONFIG_ARM_64) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index d791c12c9c..cd45e5f48f 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -1,7 +1,6 @@ #ifndef __ASM_ARM_PROCESSOR_H #define __ASM_ARM_PROCESSOR_H -#include #ifndef __ASSEMBLY__ #include #endif