From patchwork Fri Aug 11 18:02:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 109906 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1250066qge; Fri, 11 Aug 2017 11:05:22 -0700 (PDT) X-Received: by 10.36.113.2 with SMTP id n2mr16875347itc.38.1502474722426; Fri, 11 Aug 2017 11:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502474722; cv=none; d=google.com; s=arc-20160816; b=a3+s9MhORzZYw/+M7AL0k6EfPRj4hyYJNctPRQ9VPYUXUWT6RwsBEmgym5PC81ezOD cy2zBQpjYKn5BTf2NMYc55k9x+t4AQy1ox/851E+jiNbv+kVaJACZM6rJSz7ZtQZu2mQ tlbFU3h2bpzPmYtKfE6/Bf+Kp1bdiyEcA930pi2AhkD4Uer704tFNBTXvA0NGyKYhCcM YuVBkI2BLRY3gG4h4nFTkcgRFQxnjeoFTm1kQkP0kfmxF5iTxOGKUNpNfPw6hrQq1v7p 7sOd8P7T6LOGG9VhzyCHNKnCRVqGfQlX9teK5dufSTabnFIvniT7Y5a/jLkDLjYTk3SC 4SYw== 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=7OxuVEQ/TDwnxfTTuTPhqtjqP2ZAKZLjotBQioUDUf0=; b=by8PlZK4HqzoU9bk39aTuxA0a73pJ6QZQakypPOB00BYjPjJoKAvEkC+8bIZgguNgZ +F9vegiudRRFhXzru8EKNxw2OVXl+HjXiFTQuSbpCJ0+R8msTVdQ9b4o2G2mOkjb6tgz Bi9f4U1+HJJRQDyiCjiaBv6ou8w6Fmz41XXXg7jNIe3jMIeDOpbbDgzivysjecRbk2CB d2j/1YsCPLdc4Jseqy5PcrVjSCcr92cxP89QmG9a8SFXWKzAlbOE7JjOs/JxxeVbRciI DAiSwt5pc+xF2It44VuPwxC6G7JDK+ALZSKDEsx3NbsNuD0eD97nTqImSFWf5fT67Jts RwQA== 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 n8si1477149iod.0.2017.08.11.11.05.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2017 11:05:22 -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 1dgEHK-0002dl-45; Fri, 11 Aug 2017 18:03:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgEHJ-0002cI-4W for xen-devel@lists.xen.org; Fri, 11 Aug 2017 18:03:21 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 0E/E3-01862-861FD895; Fri, 11 Aug 2017 18:03:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTTf9Y2+ kwYxP5hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bpw0+YCpqlKpoXT2NpYNwk1sXIxSEksJlR 4siRtUwQzmlGicunZzB3MXJysAloStz5/IkJxBYRkJa49vkyI4jNLBAn8X5RIwuILSxgLfFtz 3l2EJtFQFViV3MfWD2vgKXEo7O/wOolBOQldrVdZO1i5ODgBIrPuSwLEhYSsJDY/m8d2wRG7g WMDKsY1YtTi8pSi3SN9ZKKMtMzSnITM3N0DQ2M9XJTi4sT01NzEpOK9ZLzczcxAr3LAAQ7GJu /OB1ilORgUhLlTfDpjRTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwfvkPVBOsCg1PbUiLTMHGGYw aQkOHiUR3pAPQGne4oLE3OLMdIjUKUZdjlcT/n9jEmLJy89LlRLn5QEpEgApyijNgxsBC/lLj LJSwryMQEcJ8RSkFuVmlqDKv2IU52BUEuaNAZnCk5lXArfpFdARTEBH9PmAHVGSiJCSamC85t RgrO/OtuRCsU9KqfKZ8MdvHgntNK57F7nQ0Xfajy+xF9bYnjoU8jmLs4rzZ8Whl1yBsR6zWt4 ondSUivB+z+lu2nXTsOqs97HEYjXxNedPn/rFsutlw5rUTJesrVc4++rj1v2My37TH6hq37+e U2I9e9mEEnnm01V2pWIt0+0dmNzfNCixFGckGmoxFxUnAgD4LTaedAIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1502474599!105600285!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 20283 invoked from network); 11 Aug 2017 18:03:19 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-15.tower-31.messagelabs.com with SMTP; 11 Aug 2017 18:03:19 -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 1E93C1650; Fri, 11 Aug 2017 11:03:19 -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 2EB9B3F577; Fri, 11 Aug 2017 11:03:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 11 Aug 2017 19:02:57 +0100 Message-Id: <20170811180257.5493-12-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170811180257.5493-1-julien.grall@arm.com> References: <20170811180257.5493-1-julien.grall@arm.com> Cc: bhupinder.thakur@linaro.org, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH 11/11] 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, cpregs.h rely on the presence of processor.h (define *_SYSREG helpers). So move the inclusion in asm-arm/arm32/processor.h. cpregs.h will also be directly included in the co-processors emulation to accomodate arm64. Signed-off-by: Julien Grall --- 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 9eacb1be29..51ce802063 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