From patchwork Wed Sep 21 17:32:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9344011 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F60A6077A for ; Wed, 21 Sep 2016 17:35:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DDBD2A83D for ; Wed, 21 Sep 2016 17:35:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 529B82A846; Wed, 21 Sep 2016 17:35:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B44B42A83D for ; Wed, 21 Sep 2016 17:35:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmlOM-0003je-P1; Wed, 21 Sep 2016 17:33:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmlOL-0003j5-Ju for xen-devel@lists.xenproject.org; Wed, 21 Sep 2016 17:33:05 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 6A/B0-28813-F44C2E75; Wed, 21 Sep 2016 17:33:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXSO6nOVdfvyKN wg2f/TCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox9d9YyFzTKV0ycwtfAeEWyi5GLQ0igg0ni wN2VjBDOF0aJu0ceQjkbGSV6Zj4HcjiBnFmMEuvm5XQxcnCwCZhIvFnlCFIjItDHKLHx6m82k BpmgV2MEk8ao0BsYQF7iS1LbrGA1LMIqEr0NFaAhHkF3CROP77CBBKWEJCXeHa7HiTMKeAuce fREWaITW4Sd/sfsoLYEgLGEn2z+lgmMPItYGRYxahenFpUllqka6aXVJSZnlGSm5iZo2toYKy Xm1pcnJiempOYVKyXnJ+7iREYIvUMDIw7GK+0OR9ilORgUhLl7d7yKFyILyk/pTIjsTgjvqg0 J7X4EKMMB4eSBO/nw0A5waLU9NSKtMwcYLDCpCU4eJREeGeCpHmLCxJzizPTIVKnGBWlxHk9Q BICIImM0jy4NliEXGKUlRLmZWRgYBDiKUgtys0sQZV/xSjOwagkzPsMZApPZl4J3PRXQIuZgB Zv+fkAZHFJIkJKqoGRyftQrHTzz5lH1X8vL92SvGtNX8/tY50Om3ZtX6PgYvQglV/m/YvUA1q V7Il5LZaqVyJMCsKM25aVail+6Nrv+6Pzu9pMLoXa+1H/+k6osP6L4Xvy5cdeh5KjayyydG4y CniUHaqLi4iWd/7770rxO+dN0jOn/svfEOB/N9H3ybVP09+zeE1XYinOSDTUYi4qTgQAKPbye osCAAA= X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1474479181!54368887!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60986 invoked from network); 21 Sep 2016 17:33:02 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Sep 2016 17:33:02 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8LHWp4W023355 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Sep 2016 17:32:51 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8LHWoQW029942 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Sep 2016 17:32:51 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8LHWnu0004690; Wed, 21 Sep 2016 17:32:49 GMT Received: from localhost.localdomain.localdomain (/172.58.216.202) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 21 Sep 2016 10:32:48 -0700 From: Konrad Rzeszutek Wilk To: konrad@kernel.org, xen-devel@lists.xenproject.org, ross.lagerwall@citrix.com, sstabellini@kernel.org, julien.grall@arm.com Date: Wed, 21 Sep 2016 13:32:19 -0400 Message-Id: <1474479154-20991-2-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1474479154-20991-1-git-send-email-konrad.wilk@oracle.com> References: <1474479154-20991-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Andrew Cooper , Doug Goldstein , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v5 01/16] arm64: s/ALTERNATIVE/HAS_ALTERNATIVE/ 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" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. We resist the temptation to move the entries in the Kconfig file to be more in alphabetical order as the "arm/x86/common: Add HAS_[ALTERNATIVE|EX_TABLE]" will move one of the entries to common file. Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Julien Grall --- Cc: Julien Grall Cc: Stefano Stabellini Cc: Jan Beulich Cc: Andrew Cooper Cc: Doug Goldstein v4: New submission. [Forgot to post as part of the patch series, included as inline reply to one of the patches]. v5: Don't sort the HAS_ALTERNATIVE and HAS_GICV3 in alphabetical order. --- xen/arch/arm/Kconfig | 6 +++--- xen/arch/arm/Makefile | 2 +- xen/arch/arm/xen.lds.S | 2 +- xen/include/asm-arm/alternative.h | 4 ++-- xen/include/asm-arm/cpuerrata.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 797c91f..558d013 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -12,8 +12,8 @@ config ARM_32 config ARM_64 def_bool y depends on 64BIT + select HAS_ALTERNATIVE select HAS_GICV3 - select ALTERNATIVE config ARM def_bool y @@ -45,13 +45,13 @@ config ACPI config HAS_GICV3 bool -config ALTERNATIVE +config HAS_ALTERNATIVE bool endmenu menu "ARM errata workaround via the alternative framework" - depends on ALTERNATIVE + depends on HAS_ALTERNATIVE config ARM64_ERRATUM_827319 bool "Cortex-A53: 827319: Data cache clean instructions might cause overlapping transactions to the interconnect" diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 64fdf41..61e655b 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -4,7 +4,7 @@ subdir-y += platforms subdir-$(CONFIG_ARM_64) += efi subdir-$(CONFIG_ACPI) += acpi -obj-$(CONFIG_ALTERNATIVE) += alternative.o +obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += bootfdt.o obj-y += cpu.o obj-y += cpuerrata.o diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 3c5e7ba..47b910d 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -151,7 +151,7 @@ SECTIONS *(.initcall1.init) __initcall_end = .; -#ifdef CONFIG_ALTERNATIVE +#ifdef CONFIG_HAS_ALTERNATIVE . = ALIGN(4); __alt_instructions = .; *(.altinstructions) diff --git a/xen/include/asm-arm/alternative.h b/xen/include/asm-arm/alternative.h index 9f88fd9..6851217 100644 --- a/xen/include/asm-arm/alternative.h +++ b/xen/include/asm-arm/alternative.h @@ -5,7 +5,7 @@ #include #include -#ifdef CONFIG_ALTERNATIVE +#ifdef CONFIG_HAS_ALTERNATIVE #ifndef __ASSEMBLY__ @@ -154,7 +154,7 @@ int apply_alternatives(const struct alt_instr *start, const struct alt_instr *en #define ALTERNATIVE(oldinstr, newinstr, ...) \ _ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1) -#else /* !CONFIG_ALTERNATIVE */ +#else /* !CONFIG_HAS_ALTERNATIVE */ static inline void apply_alternatives_all(void) { diff --git a/xen/include/asm-arm/cpuerrata.h b/xen/include/asm-arm/cpuerrata.h index 5e35b4f..8c57c6a 100644 --- a/xen/include/asm-arm/cpuerrata.h +++ b/xen/include/asm-arm/cpuerrata.h @@ -7,7 +7,7 @@ void check_local_cpu_errata(void); -#ifdef CONFIG_ALTERNATIVE +#ifdef CONFIG_HAS_ALTERNATIVE #define CHECK_WORKAROUND_HELPER(erratum, feature, arch) \ static inline bool_t check_workaround_##erratum(void) \ @@ -27,7 +27,7 @@ static inline bool_t check_workaround_##erratum(void) \ } \ } -#else /* CONFIG_ALTERNATIVE */ +#else /* CONFIG_HAS_ALTERNATIVE */ #define CHECK_WORKAROUND_HELPER(erratum, feature, arch) \ static inline bool_t check_workaround_##erratum(void) \